Skip to content

fix: show template autostop setting when it overrides the workspace setting #12910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 11, 2024
Merged

fix: show template autostop setting when it overrides the workspace setting #12910

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f991d2c
fix: show template autostop setting in settings when user customizati…
aslilac Apr 8, 2024
9b1672f
Merge branch 'main' into k11471
aslilac Apr 10, 2024
66cc750
fix it on the backend instead
aslilac Apr 10, 2024
4d69e0a
⚗️
aslilac Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix it on the backend instead
  • Loading branch information
@aslilac
aslilac committed Apr 10, 2024
commit 66cc750df389fbc69d236475e1a700de3eecad90
5 changes: 5 additions & 0 deletions coderd/workspaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1649,6 +1649,11 @@ func convertWorkspace(
}

ttlMillis := convertWorkspaceTTLMillis(workspace.Ttl)
// If the template doesn't allow a workspace-configured value, then report the
// template value instead.
if !template.AllowUserAutostop {
ttlMillis = convertWorkspaceTTLMillis(sql.NullInt64{Valid: true, Int64: template.DefaultTTL})
}

// Only show favorite status if you own the workspace.
requesterFavorite := workspace.OwnerID == requesterID && workspace.Favorite
Expand Down
16 changes: 4 additions & 12 deletions site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export const WorkspaceSchedulePage: FC = () => {
error={submitScheduleMutation.error}
initialValues={{
...getAutostart(workspace),
...getAutostop(workspace, template),
...getAutostop(workspace),
}}
isLoading={submitScheduleMutation.isLoading}
defaultTTL={dayjs.duration(template.default_ttl_ms, "ms").asHours()}
Expand All @@ -117,10 +117,7 @@ export const WorkspaceSchedulePage: FC = () => {
getAutostart(workspace),
values,
),
autostopChanged: scheduleChanged(
getAutostop(workspace, template),
values,
),
autostopChanged: scheduleChanged(getAutostop(workspace), values),
};

await submitScheduleMutation.mutateAsync(data);
Expand Down Expand Up @@ -154,13 +151,8 @@ export const WorkspaceSchedulePage: FC = () => {
const getAutostart = (workspace: TypesGen.Workspace) =>
scheduleToAutostart(workspace.autostart_schedule);

const getAutostop = (
workspace: TypesGen.Workspace,
template: TypesGen.Template,
) =>
template.allow_user_autostop
? ttlMsToAutostop(workspace.ttl_ms)
: ttlMsToAutostop(template.default_ttl_ms);
const getAutostop = (workspace: TypesGen.Workspace) =>
ttlMsToAutostop(workspace.ttl_ms);

type SubmitScheduleData = {
workspace: TypesGen.Workspace;
Expand Down