feature flagged new fields

coder · Kira-Pilot · May 5, 2023 · May 1, 2023 · May 1, 2023 · May 3, 2023
commit e56522584a60d81ce82ef9adc0c68bcd8a34ab53
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
@@ -1668,6 +1668,9 @@ const (
 	// feature is not yet complete in functionality.
 	ExperimentMoons Experiment = "moons"
 
+	// https://github.com/coder/coder/milestone/19
+	ExperimentWorkspaceActions Experiment = "workspace_actions"
+
 	// Add new experiments here!
 	// ExperimentExample Experiment = "example"
 )

diff --git a/docs/api/schemas.md b/docs/api/schemas.md
@@ -2502,9 +2502,10 @@ CreateParameterRequest is a structure used to create a new parameter value for a
 
 #### Enumerated Values
 
-| Value   |
-| ------- |
-| `moons` |
+| Value               |
+| ------------------- |
+| `moons`             |
+| `workspace_actions` |
 
 ## codersdk.Feature
 

diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -1365,8 +1365,8 @@ export const Entitlements: Entitlement[] = [
 ]
 
 // From codersdk/deployment.go
-export type Experiment = "moons"
-export const Experiments: Experiment[] = ["moons"]
+export type Experiment = "moons" | "workspace_actions"
+export const Experiments: Experiment[] = ["moons", "workspace_actions"]
 
 // From codersdk/deployment.go
 export type FeatureName =

diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm.tsx
@@ -103,6 +103,7 @@ export interface TemplateScheduleForm {
   isSubmitting: boolean
   error?: unknown
   allowAdvancedScheduling: boolean
+  allowWorkspaceActions: boolean
   // Helpful to show field errors on Storybook
   initialTouched?: FormikTouched<UpdateTemplateMeta>
 }
@@ -113,6 +114,7 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
   onCancel,
   error,
   allowAdvancedScheduling,
+  allowWorkspaceActions,
   isSubmitting,
   initialTouched,
 }) => {
@@ -317,72 +319,78 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
           </Stack>
         </Stack>
       </FormSection>
-      <FormSection
-        title="Failure Cleanup"
-        description="When enabled, Coder will automatically stop workspaces that are in a failed state after a specified number of days."
-      >
-        <FormFields>
-          <FormControlLabel
-            control={
-              <Switch
-                name="failureCleanupEnabled"
-                checked={form.values.failure_cleanup_enabled}
-                onChange={handleToggleFailureCleanup}
-                color="primary"
+      {allowAdvancedScheduling && allowWorkspaceActions && (
+        <>
+          <FormSection
+            title="Failure Cleanup"
+            description="When enabled, Coder will automatically stop workspaces that are in a failed state after a specified number of days."
+          >
+            <FormFields>
+              <FormControlLabel
+                control={
+                  <Switch
+                    name="failureCleanupEnabled"
+                    checked={form.values.failure_cleanup_enabled}
+                    onChange={handleToggleFailureCleanup}
+                    color="primary"
+                  />
+                }
+                label="Enable Failure Cleanup"
               />
-            }
-            label="Enable Failure Cleanup"
-          />
-          <TextField
-            {...getFieldHelpers(
-              "failure_ttl_ms",
-              <TTLHelperText
-                translationName="failureTTLHelperText"
-                ttl={form.values.failure_ttl_ms}
-              />,
-            )}
-            disabled={isSubmitting || !form.values.failure_cleanup_enabled}
-            fullWidth
-            inputProps={{ min: 0, step: 1 }}
-            label="Time until cleanup (days)"
-            variant="outlined"
-            type="number"
-          />
-        </FormFields>
-      </FormSection>
-      <FormSection
-        title="Inactivity Cleanup"
-        description="When enabled, Coder will automatically delete workspaces that are in an inactive state after a specified number of days."
-      >
-        <FormFields>
-          <FormControlLabel
-            control={
-              <Switch
-                name="inactivityCleanupEnabled"
-                checked={form.values.inactivity_cleanup_enabled}
-                onChange={handleToggleInactivityCleanup}
-                color="primary"
+              <TextField
+                {...getFieldHelpers(
+                  "failure_ttl_ms",
+                  <TTLHelperText
+                    translationName="failureTTLHelperText"
+                    ttl={form.values.failure_ttl_ms}
+                  />,
+                )}
+                disabled={isSubmitting || !form.values.failure_cleanup_enabled}
+                fullWidth
+                inputProps={{ min: 0, step: 1 }}
+                label="Time until cleanup (days)"
+                variant="outlined"
+                type="number"
               />
-            }
-            label="Enable Inactivity Cleanup"
-          />
-          <TextField
-            {...getFieldHelpers(
-              "inactivity_ttl_ms",
-              <TTLHelperText
-                translationName="inactivityTTLHelperText"
-                ttl={form.values.inactivity_ttl_ms}
-              />,
-            )}
-            disabled={isSubmitting}
-            fullWidth
-            inputProps={{ min: 0, step: 1 }}
-            label="Time until cleanup (days)"
-            variant="outlined"
-            type="number"
-          />
-        </FormFields>
-      </FormSection>
+            </FormFields>
+          </FormSection>
+          <FormSection
+            title="Inactivity Cleanup"
+            description="When enabled, Coder will automatically delete workspaces that are in an inactive state after a specified number of days."
+          >
+            <FormFields>
+              <FormControlLabel
+                control={
+                  <Switch
+                    name="inactivityCleanupEnabled"
+                    checked={form.values.inactivity_cleanup_enabled}
+                    onChange={handleToggleInactivityCleanup}
+                    color="primary"
+                  />
+                }
+                label="Enable Inactivity Cleanup"
+              />
+              <TextField
+                {...getFieldHelpers(
+                  "inactivity_ttl_ms",
+                  <TTLHelperText
+                    translationName="inactivityTTLHelperText"
+                    ttl={form.values.inactivity_ttl_ms}
+                  />,
+                )}
+                disabled={
+                  isSubmitting || !form.values.inactivity_cleanup_enabled
+                }
+                fullWidth
+                inputProps={{ min: 0, step: 1 }}
+                label="Time until cleanup (days)"
+                variant="outlined"
+                type="number"
+              />
+            </FormFields>
+          </FormSection>
+        </>
+      )}
       <FormFooter onCancel={onCancel} isLoading={isSubmitting} />
     </HorizontalForm>
   )

diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePage.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePage.tsx
@@ -14,9 +14,13 @@ const TemplateSchedulePage: FC = () => {
   const { template: templateName } = useParams() as { template: string }
   const navigate = useNavigate()
   const { template } = useTemplateSettingsContext()
-  const { entitlements } = useDashboard()
+  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")
+
   const {
     mutate: updateTemplate,
     isLoading: isSubmitting,
@@ -37,6 +41,7 @@ const TemplateSchedulePage: FC = () => {
       </Helmet>
       <TemplateSchedulePageView
         allowAdvancedScheduling={allowAdvancedScheduling}
+        allowWorkspaceActions={allowWorkspaceActions}
         isSubmitting={isSubmitting}
         template={template}
         submitError={submitError}

diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePageView.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePageView.tsx
@@ -12,6 +12,7 @@ export interface TemplateSchedulePageViewProps {
   submitError?: unknown
   initialTouched?: ComponentProps<typeof TemplateScheduleForm>["initialTouched"]
   allowAdvancedScheduling: boolean
+  allowWorkspaceActions: boolean
 }
 
 export const TemplateSchedulePageView: FC<TemplateSchedulePageViewProps> = ({
@@ -20,6 +21,7 @@ export const TemplateSchedulePageView: FC<TemplateSchedulePageViewProps> = ({
   onSubmit,
   isSubmitting,
   allowAdvancedScheduling,
+  allowWorkspaceActions,
   submitError,
   initialTouched,
 }) => {
@@ -33,6 +35,7 @@ export const TemplateSchedulePageView: FC<TemplateSchedulePageViewProps> = ({
 
       <TemplateScheduleForm
         allowAdvancedScheduling={allowAdvancedScheduling}
+        allowWorkspaceActions={allowWorkspaceActions}
         initialTouched={initialTouched}
         isSubmitting={isSubmitting}
         template={template}