Skip to content

Commit 1ce5e7b

Browse files
EmyrkEmyrk
committed
Merge remote-tracking branch 'origin/main' into stevenmasley/deleting_workspace_params
2 parents 8100193 + dc21016 commit 1ce5e7b

File tree

12 files changed

+92
-14
lines changed

12 files changed

+92
-14
lines changed

‎cli/testdata/coder_list_--output_json.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"template_allow_user_cancel_workspace_jobs": false,
1616
"template_active_version_id": "============[version ID]============",
1717
"template_require_active_version": false,
18+
"template_use_classic_parameter_flow": false,
1819
"latest_build": {
1920
"id": "========[workspace build ID]========",
2021
"created_at": "====[timestamp]=====",

‎coderd/apidoc/docs.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/workspaces.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2261,6 +2261,7 @@ func convertWorkspace(
22612261
TemplateAllowUserCancelWorkspaceJobs: template.AllowUserCancelWorkspaceJobs,
22622262
TemplateActiveVersionID: template.ActiveVersionID,
22632263
TemplateRequireActiveVersion: template.RequireActiveVersion,
2264+
TemplateUseClassicParameterFlow: template.UseClassicParameterFlow,
22642265
Outdated: workspaceBuild.TemplateVersionID.String() != template.ActiveVersionID.String(),
22652266
Name: workspace.Name,
22662267
AutostartSchedule: autostartSchedule,

‎codersdk/workspaces.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ type Workspace struct {
4141
TemplateAllowUserCancelWorkspaceJobs bool `json:"template_allow_user_cancel_workspace_jobs"`
4242
TemplateActiveVersionID uuid.UUID `json:"template_active_version_id" format:"uuid"`
4343
TemplateRequireActiveVersion bool `json:"template_require_active_version"`
44+
TemplateUseClassicParameterFlow bool `json:"template_use_classic_parameter_flow"`
4445
LatestBuild WorkspaceBuild `json:"latest_build"`
4546
LatestAppStatus *WorkspaceAppStatus `json:"latest_app_status"`
4647
Outdated bool `json:"outdated"`

‎docs/reference/api/schemas.md

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/reference/api/workspaces.md

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎site/src/api/typesGenerated.ts

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎site/src/modules/workspaces/DynamicParameter/DynamicParameter.tsx

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,15 @@ const DebouncedParameterField: FC<DebouncedParameterFieldProps> = ({
222222
const onChangeEvent = useEffectEvent(onChange);
223223
// prevDebouncedValueRef is to prevent calling the onChangeEvent on the initial render
224224
const prevDebouncedValueRef = useRef<string | undefined>();
225+
const prevValueRef = useRef(value);
226+
227+
// This is necessary in the case of fields being set by preset parameters
228+
useEffect(() => {
229+
if (value !== undefined && value !== prevValueRef.current) {
230+
setLocalValue(value);
231+
prevValueRef.current = value;
232+
}
233+
}, [value]);
225234

226235
useEffect(() => {
227236
if (prevDebouncedValueRef.current !== undefined) {
@@ -458,7 +467,7 @@ const ParameterField: FC<ParameterFieldProps> = ({
458467
<Slider
459468
id={id}
460469
className="mt-2"
461-
value={[Number(value)]}
470+
value={[Number.isFinite(Number(value)) ? Number(value) : 0]}
462471
onValueChange={([value]) => {
463472
onChange(value.toString());
464473
}}

‎site/src/pages/CreateWorkspacePage/CreateWorkspacePageExperimental.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ const CreateWorkspacePageExperimental: FC = () => {
101101
}
102102
}, []);
103103

104-
// On sends all initial parameter values to the websocket
104+
// On page load, sends all initial parameter values to the websocket
105105
// (including defaults and autofilled from the url)
106106
// This ensures the backend has the complete initial state of the form,
107107
// which is vital for correctly rendering dynamic UI elements where parameter visibility

0 commit comments

Comments
 (0)