coder · sreya · Oct 5, 2023 · Oct 3, 2023 · Oct 3, 2023 · Oct 3, 2023
diff --git a/cli/templatecreate.go b/cli/templatecreate.go
@@ -47,16 +47,6 @@ func (r *RootCmd) templateCreate() *clibase.Cmd {
 		),
 		Handler: func(inv *clibase.Invocation) error {
 			if failureTTL != 0 || inactivityTTL != 0 || maxTTL != 0 {
-				// This call can be removed when workspace_actions is no longer experimental
-				experiments, exErr := client.Experiments(inv.Context())
-				if exErr != nil {
-					return xerrors.Errorf("get experiments: %w", exErr)
-				}
-
-				if !experiments.Enabled(codersdk.ExperimentWorkspaceActions) {
-					return xerrors.Errorf("--failure-ttl and --inactivityTTL are experimental features. Use the workspace_actions CODER_EXPERIMENTS flag to set these configuration values.")
-				}
-
 				entitlements, err := client.Entitlements(inv.Context())
 				var sdkErr *codersdk.Error
 				if xerrors.As(err, &sdkErr) && sdkErr.StatusCode() == http.StatusNotFound {

diff --git a/cli/templateedit.go b/cli/templateedit.go
@@ -41,18 +41,6 @@ func (r *RootCmd) templateEdit() *clibase.Cmd {
 		),
 		Short: "Edit the metadata of a template by name.",
 		Handler: func(inv *clibase.Invocation) error {
-			// This clause can be removed when workspace_actions is no longer experimental
-			if failureTTL != 0 || inactivityTTL != 0 {
-				experiments, exErr := client.Experiments(inv.Context())
-				if exErr != nil {
-					return xerrors.Errorf("get experiments: %w", exErr)
-				}
-
-				if !experiments.Enabled(codersdk.ExperimentWorkspaceActions) {
-					return xerrors.Errorf("--failure-ttl and --inactivityTTL are experimental features. Use the workspace_actions CODER_EXPERIMENTS flag to set these configuration values.")
-				}
-			}
-
 			unsetAutostopRequirementDaysOfWeek := len(autostopRequirementDaysOfWeek) == 1 && autostopRequirementDaysOfWeek[0] == "none"
 			requiresEntitlement := (len(autostopRequirementDaysOfWeek) > 0 && !unsetAutostopRequirementDaysOfWeek) ||
 				autostopRequirementWeeks > 0 ||

diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
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/docs/api/schemas.md b/docs/api/schemas.md
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
diff --git a/site/src/components/Dashboard/DashboardProvider.tsx b/site/src/components/Dashboard/DashboardProvider.tsx
@@ -110,13 +110,3 @@ export const useDashboard = (): DashboardProviderValue => {
 
   return context;
 };
-
-export const useIsWorkspaceActionsEnabled = (): boolean => {
-  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");
-  return allowWorkspaceActions && allowAdvancedScheduling;
-};
diff --git a/site/src/components/WorkspaceDeletion/DormantDeletionStat.tsx b/site/src/components/WorkspaceDeletion/DormantDeletionStat.tsx
@@ -14,20 +14,11 @@ interface DormantDeletionStatProps {
 export const DormantDeletionStat: FC<DormantDeletionStatProps> = ({
   workspace,
 }) => {
-  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;
   }
 

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/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/components/WorkspaceDeletion/utils.test.ts b/site/src/components/WorkspaceDeletion/utils.test.ts
@@ -4,53 +4,39 @@ import { displayDormantDeletion } from "./utils";
 
 describe("displayDormantDeletion", () => {
   const today = new Date();
-  it.each<[string, boolean, boolean, boolean]>([
+  it.each<[string, boolean, boolean]>([
     [
       new Date(new Date().setDate(today.getDate() + 15)).toISOString(),
       true,
-      true,
       false,
     ], // today + 15 days out
     [
       new Date(new Date().setDate(today.getDate() + 14)).toISOString(),
       true,
       true,
-      true,
     ], // today + 14
     [
       new Date(new Date().setDate(today.getDate() + 13)).toISOString(),
       true,
       true,
-      true,
     ], // today + 13
     [
       new Date(new Date().setDate(today.getDate() + 1)).toISOString(),
       true,
       true,
-      true,
     ], // today + 1
-    [new Date().toISOString(), true, true, true], // today + 0
-    [new Date().toISOString(), false, true, false], // Advanced Scheduling off
-    [new Date().toISOString(), true, false, false], // Workspace Actions off
+    [new Date().toISOString(), true, true], // today + 0
+    [new Date().toISOString(), false, false], // Advanced Scheduling off
   ])(
-    `deleting_at=%p, allowAdvancedScheduling=%p, AllowWorkspaceActions=%p, shouldDisplay=%p`,
-    (
-      deleting_at,
-      allowAdvancedScheduling,
-      allowWorkspaceActions,
-      shouldDisplay,
-    ) => {
+    `deleting_at=%p, allowAdvancedScheduling=%p, shouldDisplay=%p`,
+    (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/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/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/.../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/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}