chore: remove workspace_actions experiment

sreya · sreya · commit afcde6a4a56a · 2023-10-03T23:23:33.000Z
diff --git a/codersdk/deployment.go b/codersdk/deployment.go
@@ -1958,9 +1958,6 @@ const (
 	// feature is not yet complete in functionality.
 	ExperimentMoons Experiment = "moons"
 
-	// https://github.com/coder/coder/milestone/19
-	ExperimentWorkspaceActions Experiment = "workspace_actions"
-
 	// ExperimentTailnetPGCoordinator enables the PGCoord in favor of the pubsub-
 	// only Coordinator
 	ExperimentTailnetPGCoordinator Experiment = "tailnet_pg_coordinator"
diff --git a/site/src/components/Dashboard/DashboardProvider.tsx b/site/src/components/Dashboard/DashboardProvider.tsx
@@ -112,11 +112,10 @@ export const useDashboard = (): DashboardProviderValue => {
 };
 
 export const useIsWorkspaceActionsEnabled = (): boolean => {
-  const { entitlements, experiments } = useDashboard();
+  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
-  const allowWorkspaceActions = experiments.includes("workspace_actions");
-  return allowWorkspaceActions && allowAdvancedScheduling;
+  return allowAdvancedScheduling;
 };
diff --git a/site/src/components/WorkspaceDeletion/DormantDeletionStat.tsx b/site/src/components/WorkspaceDeletion/DormantDeletionStat.tsx
@@ -17,17 +17,8 @@ export const DormantDeletionStat: FC<DormantDeletionStatProps> = ({
   const { entitlements, experiments } = 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
-  const allowWorkspaceActions = experiments.includes("workspace_actions");
 
-  if (
-    !displayDormantDeletion(
-      workspace,
-      allowAdvancedScheduling,
-      allowWorkspaceActions,
-    )
-  ) {
+  if (!displayDormantDeletion(workspace, allowAdvancedScheduling)) {
     return null;
   }
 
diff --git a/site/src/components/WorkspaceDeletion/DormantDeletionText.tsx b/site/src/components/WorkspaceDeletion/DormantDeletionText.tsx
@@ -9,20 +9,11 @@ export const DormantDeletionText = ({
 }: {
   workspace: Workspace;
 }): JSX.Element | null => {
-  const { entitlements, experiments } = useDashboard();
+  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
-  const allowWorkspaceActions = experiments.includes("workspace_actions");
 
-  if (
-    !displayDormantDeletion(
-      workspace,
-      allowAdvancedScheduling,
-      allowWorkspaceActions,
-    )
-  ) {
+  if (!displayDormantDeletion(workspace, allowAdvancedScheduling)) {
     return null;
   }
   return <StyledSpan role="status">Impending deletion</StyledSpan>;
diff --git a/site/src/components/WorkspaceDeletion/utils.test.ts b/site/src/components/WorkspaceDeletion/utils.test.ts
@@ -34,23 +34,14 @@ describe("displayDormantDeletion", () => {
     [new Date().toISOString(), true, false, false], // Workspace Actions off
   ])(
     `deleting_at=%p, allowAdvancedScheduling=%p, AllowWorkspaceActions=%p, shouldDisplay=%p`,
-    (
-      deleting_at,
-      allowAdvancedScheduling,
-      allowWorkspaceActions,
-      shouldDisplay,
-    ) => {
+    (deleting_at, allowAdvancedScheduling, shouldDisplay) => {
       const workspace: TypesGen.Workspace = {
         ...Mocks.MockWorkspace,
         deleting_at,
       };
-      expect(
-        displayDormantDeletion(
-          workspace,
-          allowAdvancedScheduling,
-          allowWorkspaceActions,
-        ),
-      ).toBe(shouldDisplay);
+      expect(displayDormantDeletion(workspace, allowAdvancedScheduling)).toBe(
+        shouldDisplay,
+      );
     },
   );
 });
diff --git a/site/src/components/WorkspaceDeletion/utils.ts b/site/src/components/WorkspaceDeletion/utils.ts
@@ -14,14 +14,9 @@ const IMPENDING_DELETION_DISPLAY_THRESHOLD = 14; // 14 days
 export const displayDormantDeletion = (
   workspace: Workspace,
   allowAdvancedScheduling: boolean,
-  allowWorkspaceActions: boolean,
 ) => {
   const today = new Date();
-  if (
-    !workspace.deleting_at ||
-    !allowAdvancedScheduling ||
-    !allowWorkspaceActions
-  ) {
+  if (!workspace.deleting_at || !allowAdvancedScheduling) {
     return false;
   }
   return (
diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm.tsx
@@ -50,7 +50,6 @@ export interface TemplateScheduleForm {
   isSubmitting: boolean;
   error?: unknown;
   allowAdvancedScheduling: boolean;
-  allowWorkspaceActions: boolean;
   allowAutostopRequirement: boolean;
   // Helpful to show field errors on Storybook
   initialTouched?: FormikTouched<UpdateTemplateMeta>;
@@ -62,7 +61,6 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
   onCancel,
   error,
   allowAdvancedScheduling,
-  allowWorkspaceActions,
   allowAutostopRequirement,
   isSubmitting,
   initialTouched,
@@ -459,7 +457,7 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
           </Stack>
         </Stack>
       </FormSection>
-      {allowAdvancedScheduling && allowWorkspaceActions && (
+      {allowAdvancedScheduling && (
         <>
           <FormSection
             title="Failure Cleanup"
diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePage.test.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePage.test.tsx
@@ -123,9 +123,6 @@ describe("TemplateSchedulePage", () => {
     jest
       .spyOn(API, "getEntitlements")
       .mockResolvedValue(MockEntitlementsWithScheduling);
-
-    // remove when https://github.com/coder/coder/milestone/19 is completed.
-    jest.spyOn(API, "getExperiments").mockResolvedValue(["workspace_actions"]);
   });
 
   it("Calls the API when user fills in and submits a form", async () => {
diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePage.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePage.tsx
@@ -18,12 +18,11 @@ const TemplateSchedulePage: FC = () => {
   const queryClient = useQueryClient();
   const orgId = useOrganizationId();
   const { template } = useTemplateSettings();
-  const { entitlements, experiments } = useDashboard();
+  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
-  const allowWorkspaceActions = experiments.includes("workspace_actions");
   const allowAutostopRequirement =
     entitlements.features["template_autostop_requirement"].enabled;
   const { clearLocal } = useLocalStorage();
@@ -54,7 +53,6 @@ const TemplateSchedulePage: FC = () => {
       </Helmet>
       <TemplateSchedulePageView
         allowAdvancedScheduling={allowAdvancedScheduling}
-        allowWorkspaceActions={allowWorkspaceActions}
         allowAutostopRequirement={allowAutostopRequirement}
         isSubmitting={isSubmitting}
         template={template}
diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePageView.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePageView.tsx
@@ -14,7 +14,6 @@ export interface TemplateSchedulePageViewProps {
     typeof TemplateScheduleForm
   >["initialTouched"];
   allowAdvancedScheduling: boolean;
-  allowWorkspaceActions: boolean;
   allowAutostopRequirement: boolean;
 }
 
@@ -24,7 +23,6 @@ export const TemplateSchedulePageView: FC<TemplateSchedulePageViewProps> = ({
   onSubmit,
   isSubmitting,
   allowAdvancedScheduling,
-  allowWorkspaceActions,
   allowAutostopRequirement,
   submitError,
   initialTouched,
@@ -39,7 +37,6 @@ export const TemplateSchedulePageView: FC<TemplateSchedulePageViewProps> = ({
 
       <TemplateScheduleForm
         allowAdvancedScheduling={allowAdvancedScheduling}
-        allowWorkspaceActions={allowWorkspaceActions}
         allowAutostopRequirement={allowAutostopRequirement}
         initialTouched={initialTouched}
         isSubmitting={isSubmitting}
diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
@@ -1924,10 +1924,7 @@ export const MockEntitlementsWithScheduling: TypesGen.Entitlements = {
   }),
 };
 
-export const MockExperiments: TypesGen.Experiment[] = [
-  "workspace_actions",
-  "moons",
-];
+export const MockExperiments: TypesGen.Experiment[] = ["moons"];
 
 export const MockAuditLog: TypesGen.AuditLog = {
   id: "fbd2116a-8961-4954-87ae-e4575bd29ce0",
