diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go index bb1160eaf60df..0ec0116f9d86d 100644 --- a/coderd/apidoc/docs.go +++ b/coderd/apidoc/docs.go @@ -6331,7 +6331,7 @@ const docTemplate = `{ "parameters": [ { "type": "string", - "description": "Search query in the format ` + "`" + `key:value` + "`" + `. Available keys are: owner, template, name, status, has-agent, is-dormant, last_used_after, last_used_before.", + "description": "Search query in the format ` + "`" + `key:value` + "`" + `. Available keys are: owner, template, name, status, has-agent, dormant, last_used_after, last_used_before.", "name": "q", "in": "query" }, diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json index 6caa66188f710..03010d3f01037 100644 --- a/coderd/apidoc/swagger.json +++ b/coderd/apidoc/swagger.json @@ -5577,7 +5577,7 @@ "parameters": [ { "type": "string", - "description": "Search query in the format `key:value`. Available keys are: owner, template, name, status, has-agent, is-dormant, last_used_after, last_used_before.", + "description": "Search query in the format `key:value`. Available keys are: owner, template, name, status, has-agent, dormant, last_used_after, last_used_before.", "name": "q", "in": "query" }, diff --git a/coderd/workspaces.go b/coderd/workspaces.go index 8d4cba7a40087..0bcd8bb6dd9e8 100644 --- a/coderd/workspaces.go +++ b/coderd/workspaces.go @@ -118,7 +118,7 @@ func (api *API) workspace(rw http.ResponseWriter, r *http.Request) { // @Security CoderSessionToken // @Produce json // @Tags Workspaces -// @Param q query string false "Search query in the format `key:value`. Available keys are: owner, template, name, status, has-agent, is-dormant, last_used_after, last_used_before." +// @Param q query string false "Search query in the format `key:value`. Available keys are: owner, template, name, status, has-agent, dormant, last_used_after, last_used_before." // @Param limit query int false "Page limit" // @Param offset query int false "Page offset" // @Success 200 {object} codersdk.WorkspacesResponse diff --git a/docs/api/workspaces.md b/docs/api/workspaces.md index f825ba5f7c679..da06dc4874e90 100644 --- a/docs/api/workspaces.md +++ b/docs/api/workspaces.md @@ -457,11 +457,11 @@ curl -X GET http://coder-server:8080/api/v2/workspaces \ ### Parameters -| Name | In | Type | Required | Description | -| -------- | ----- | ------- | -------- | ---------------------------------------------------------------------------------------------------------------------------------------------------- | -| `q` | query | string | false | Search query in the format `key:value`. Available keys are: owner, template, name, status, has-agent, is-dormant, last_used_after, last_used_before. | -| `limit` | query | integer | false | Page limit | -| `offset` | query | integer | false | Page offset | +| Name | In | Type | Required | Description | +| -------- | ----- | ------- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------- | +| `q` | query | string | false | Search query in the format `key:value`. Available keys are: owner, template, name, status, has-agent, dormant, last_used_after, last_used_before. | +| `limit` | query | integer | false | Page limit | +| `offset` | query | integer | false | Page offset | ### Example responses diff --git a/site/src/components/Form/Form.tsx b/site/src/components/Form/Form.tsx index e8e2160054bcb..a7e902a3deb59 100644 --- a/site/src/components/Form/Form.tsx +++ b/site/src/components/Form/Form.tsx @@ -120,13 +120,7 @@ export const FormSection: FC< }} className={classes.sectionInfo} > -

+

{title} {alpha && } {deprecated && } @@ -154,14 +148,11 @@ const styles = { fontWeight: 400, margin: 0, marginBottom: 8, - }), - - formSectionInfoTitleAlpha: { display: "flex", flexDirection: "row", alignItems: "center", gap: 12, - }, + }), formSectionInfoDescription: (theme) => ({ fontSize: 14, diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.tsx index 40224a7e8b60b..756fd97703309 100644 --- a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.tsx +++ b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.tsx @@ -67,27 +67,25 @@ export const ScheduleDialog: FC> = ({ {showDormancyWarning && ( <>

Dormancy Threshold

- -
- This change will result in {inactiveWorkspacesToGoDormant}{" "} - workspaces being immediately transitioned to the dormant state - and {inactiveWorkspacesToGoDormantInWeek} over the next seven - days. To prevent this, do you want to reset the inactivity - period for all template workspaces? -
- { - updateInactiveWorkspaces(e.target.checked); - }} - /> - } - label="Reset" - /> -
+

+ This change will result in {inactiveWorkspacesToGoDormant}{" "} + workspaces being immediately transitioned to the dormant state + and {inactiveWorkspacesToGoDormantInWeek} over the next seven + days. To prevent this, do you want to reset the inactivity + period for all template workspaces? +

+ { + updateInactiveWorkspaces(e.target.checked); + }} + /> + } + label="Reset" + /> )} @@ -140,8 +138,6 @@ const styles = { "& .MuiPaper-root": { background: theme.palette.background.paper, border: `1px solid ${theme.palette.divider}`, - width: "100%", - maxWidth: 1000, }, "& .MuiDialogActions-spacing": { padding: "0 40px 40px", diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm.tsx index 457e4501711f8..f1f0af511ec9b 100644 --- a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm.tsx +++ b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm.tsx @@ -427,7 +427,7 @@ export const TemplateScheduleForm: FC = ({ description="Define the maximum lifetime for workspaces created from this template." deprecated > - + { if (!workspace.dormant_at || !formValues.time_til_dormant_autodelete_ms) {