Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[pull] main from coder:main #268

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 2 commits into from
Jun 24, 2025
Merged

[pull] main from coder:main #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
796dc7a
chore: ignore splunk.com in linkspector (#18502)
dannykopping Jun 24, 2025
4f98fd4
fix: fix validation error during workspace creation without preset (#…
SasSwart Jun 24, 2025
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
1 change: 1 addition & 0 deletions .github/.linkspector.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ ignorePatterns:
- pattern: "mutagen.io"
- pattern: "docs.github.com"
- pattern: "claude.ai"
- pattern: "splunk.com"
aliveStatusCodes:
- 200
40 changes: 40 additions & 0 deletions site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,46 @@ export const PresetReselected: Story = {
},
};

export const PresetNoneSelected: Story = {
args: {
...PresetsButNoneSelected.args,
onSubmit: (request, owner) => {
// Assert that template_version_preset_id is not present in the request
console.assert(
!("template_version_preset_id" in request),
'template_version_preset_id should not be present when "None" is selected',
);
action("onSubmit")(request, owner);
},
},
play: async ({ canvasElement }) => {
const canvas = within(canvasElement);

// First select a preset to set the field value
await userEvent.click(canvas.getByLabelText("Preset"));
await userEvent.click(canvas.getByText("Preset 1"));

// Then select "None" to unset the field value
await userEvent.click(canvas.getByLabelText("Preset"));
await userEvent.click(canvas.getByText("None"));

// Fill in required fields and submit to test the API call
await userEvent.type(
canvas.getByLabelText("Workspace Name"),
"test-workspace",
);
await userEvent.click(canvas.getByText("Create workspace"));
},
parameters: {
docs: {
description: {
story:
"This story tests that when 'None' preset is selected, the template_version_preset_id field is not included in the form submission. The story first selects a preset to set the field value, then selects 'None' to unset it, and finally submits the form to verify the API call behavior.",
},
},
},
};

export const ExternalAuth: Story = {
args: {
externalAuth: [
Expand Down
3 changes: 2 additions & 1 deletion site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,8 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
setSelectedPresetIndex(index);
form.setFieldValue(
"template_version_preset_id",
option?.value,
// Empty string is equivalent to using None
option?.value === "" ? undefined : option?.value,
);
}}
placeholder="Select a preset"
Expand Down
4 changes: 4 additions & 0 deletions site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,10 @@ export const CreateWorkspacePageViewExperimental: FC<
return;
}
setSelectedPresetIndex(index);
form.setFieldValue(
"template_version_preset_id",
index === 0 ? undefined : option,
);
}}
>
<SelectTrigger>
Expand Down
Loading