remove experiment enabled helper fn

coder · sreya · Oct 5, 2023 · Oct 3, 2023 · Oct 3, 2023 · Oct 3, 2023
commit a949d39ba871fc35effd6666b7582ea6bd4b448e
diff --git a/site/src/components/Dashboard/DashboardProvider.tsx b/site/src/components/Dashboard/DashboardProvider.tsx
@@ -110,12 +110,3 @@ export const useDashboard = (): DashboardProviderValue => {
 
   return context;
 };
-
-export const useIsWorkspaceActionsEnabled = (): boolean => {
-  const { entitlements } = useDashboard();
-  const allowAdvancedScheduling =
-    entitlements.features["advanced_template_scheduling"].enabled;
-  // This check can be removed when https://github.com/coder/coder/milestone/19
-  // is merged up
-  return allowAdvancedScheduling;
-};
diff --git a/site/src/components/WorkspaceDeletion/DormantWorkspaceBanner.tsx b/site/src/components/WorkspaceDeletion/DormantWorkspaceBanner.tsx
@@ -1,5 +1,5 @@
 import { Workspace } from "api/typesGenerated";
-import { useIsWorkspaceActionsEnabled } from "components/Dashboard/DashboardProvider";
+import { useDashboard } from "components/Dashboard/DashboardProvider";
 import { Alert } from "components/Alert/Alert";
 import { formatDistanceToNow } from "date-fns";
 import Link from "@mui/material/Link";
@@ -21,7 +21,9 @@ export const DormantWorkspaceBanner = ({
   shouldRedisplayBanner: boolean;
   count?: Count;
 }): JSX.Element | null => {
-  const experimentEnabled = useIsWorkspaceActionsEnabled();
+  const { entitlements } = useDashboard();
+  const schedulingEnabled =
+    entitlements.features["advanced_template_scheduling"].enabled;
 
   if (!workspaces) {
     return null;
@@ -37,7 +39,7 @@ export const DormantWorkspaceBanner = ({
 
   if (
     // Only show this if the experiment is included.
-    !experimentEnabled ||
+    !schedulingEnabled ||
     !hasDormantWorkspaces ||
     // Banners should be redisplayed after dismissal when additional workspaces are newly scheduled for deletion
     !shouldRedisplayBanner

diff --git a/site/src/pages/DeploySettingsPage/GeneralSettingsPage/GeneralSettingsPageView.stories.tsx b/site/src/pages/DeploySettingsPage/GeneralSettingsPage/GeneralSettingsPageView.stories.tsx
@@ -30,13 +30,7 @@ const meta: Meta<typeof GeneralSettingsPageView> = {
         description:
           "Enable one or more experiments. These are not ready for production. Separate multiple experiments with commas, or enter '*' to opt-in to all available experiments.",
         flag: "experiments",
-        value: [
-          "*",
-          "moons",
-          "workspace_actions",
-          "single_tailnet",
-          "deployment_health_page",
-        ],
+        value: ["*", "moons", "single_tailnet", "deployment_health_page"],
         flag_shorthand: "",
         hidden: false,
       },

diff --git a/.../src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePageView.stories.tsx b/.../src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePageView.stories.tsx
@@ -31,7 +31,6 @@ type Story = StoryObj<typeof TemplateSchedulePageView>;
 
 const defaultArgs = {
   allowAdvancedScheduling: true,
-  allowWorkspaceActions: true,
   template: MockTemplate,
   onSubmit: action("onSubmit"),
   onCancel: action("cancel"),

diff --git a/site/src/pages/WorkspacesPage/WorkspacesPage.tsx b/site/src/pages/WorkspacesPage/WorkspacesPage.tsx
@@ -1,9 +1,6 @@
 import { usePagination } from "hooks/usePagination";
 import { Workspace } from "api/typesGenerated";
-import {
-  useDashboard,
-  useIsWorkspaceActionsEnabled,
-} from "components/Dashboard/DashboardProvider";
+import { useDashboard } from "components/Dashboard/DashboardProvider";
 import { type FC, useEffect, useState } from "react";
 import { Helmet } from "react-helmet-async";
 import { pageTitle } from "utils/page";
@@ -54,13 +51,16 @@ const WorkspacesPage: FC = () => {
     query: filterProps.filter.query,
   });
 
-  const experimentEnabled = useIsWorkspaceActionsEnabled();
+  const { entitlements } = useDashboard();
+  const schedulingEnabled =
+    entitlements.features["advanced_template_scheduling"].enabled;
+
   // If workspace actions are enabled we need to fetch the dormant
   // workspaces as well. This lets us determine whether we should
   // show a banner to the user indicating that some of their workspaces
   // are at risk of being deleted.
   useEffect(() => {
-    if (experimentEnabled) {
+    if (schedulingEnabled) {
       const includesDormant = filterProps.filter.query.includes("dormant_at");
       const dormantQuery = includesDormant
         ? filterProps.filter.query
@@ -82,12 +82,11 @@ const WorkspacesPage: FC = () => {
       // like dormant workspaces don't exist.
       setDormantWorkspaces([]);
     }
-  }, [experimentEnabled, data, filterProps.filter.query]);
+  }, [schedulingEnabled, data, filterProps.filter.query]);
   const updateWorkspace = useWorkspaceUpdate(queryKey);
   const [checkedWorkspaces, setCheckedWorkspaces] = useState<Workspace[]>([]);
   const [isDeletingAll, setIsDeletingAll] = useState(false);
   const [urlSearchParams] = searchParamsResult;
-  const { entitlements } = useDashboard();
   const canCheckWorkspaces =
     entitlements.features["workspace_batch_actions"].enabled;
 

diff --git a/site/src/pages/WorkspacesPage/filter/filter.tsx b/site/src/pages/WorkspacesPage/filter/filter.tsx
@@ -1,6 +1,7 @@
 import { FC } from "react";
 import Box from "@mui/material/Box";
-import { useIsWorkspaceActionsEnabled } from "components/Dashboard/DashboardProvider";
+import { useDashboard } from "components/Dashboard/DashboardProvider";
+
 import { Avatar, AvatarProps } from "components/Avatar/Avatar";
 import { Palette, PaletteColor } from "@mui/material/styles";
 import { TemplateFilterMenu, StatusFilterMenu } from "./menus";
@@ -68,7 +69,9 @@ export const WorkspacesFilter = ({
   error,
   menus,
 }: WorkspaceFilterProps) => {
-  const actionsEnabled = useIsWorkspaceActionsEnabled();
+  const { entitlements } = useDashboard();
+  const actionsEnabled =
+    entitlements.features["advanced_template_scheduling"].enabled;
   const presets = actionsEnabled ? PRESET_FILTERS : PRESETS_WITH_DORMANT;
 
   return (