Skip to content

feat: add the ability to hide preset parameters #17168

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 9 commits into from
Apr 1, 2025
+152 −43
Merged

feat: add the ability to hide preset parameters #17168

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c4f47b6
add a switch to toggle whether or not to show preset parameters
SasSwart Mar 31, 2025
1894f3c
fix bug where changing preset overwrote which parameters were being h…
SasSwart Mar 31, 2025
f1a5839
Label preset parameters as such
SasSwart Mar 31, 2025
f6d7a8e
text sizing
SasSwart Mar 31, 2025
464e2e7
make lint
SasSwart Mar 31, 2025
5df4ad6
add id for storybook testing
SasSwart Mar 31, 2025
d6000e4
Move presets to the parameter section
SasSwart Mar 31, 2025
633e7f8
hide preset parameters by default
SasSwart Mar 31, 2025
dd5f042
update preset stories based on new default
SasSwart Mar 31, 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
Prev Previous commit
Next Next commit
make lint
  • Loading branch information
@SasSwart
SasSwart committed Mar 31, 2025
commit 464e2e705cf54efe8c9679d7f662d7a42a288424
9 changes: 6 additions & 3 deletions site/src/components/RichParameterInput/RichParameterInput.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,8 @@ export const WithPreset: Story = {
id: "project_name",
parameter: createTemplateVersionParameter({
name: "project_name",
description: "Customize the name of a Google Cloud project that will be created!",
description:
"Customize the name of a Google Cloud project that will be created!",
}),
isPreset: true,
},
Expand All @@ -393,7 +394,8 @@ export const WithPresetAndImmutable: Story = {
id: "project_name",
parameter: createTemplateVersionParameter({
name: "project_name",
description: "Customize the name of a Google Cloud project that will be created!",
description:
"Customize the name of a Google Cloud project that will be created!",
mutable: false,
}),
isPreset: true,
Expand All @@ -406,7 +408,8 @@ export const WithPresetAndOptional: Story = {
id: "project_name",
parameter: createTemplateVersionParameter({
name: "project_name",
description: "Customize the name of a Google Cloud project that will be created!",
description:
"Customize the name of a Google Cloud project that will be created!",
required: false,
}),
isPreset: true,
Expand Down
2 changes: 1 addition & 1 deletion site/src/components/RichParameterInput/RichParameterInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { Interpolation, Theme } from "@emotion/react";
import ErrorOutline from "@mui/icons-material/ErrorOutline";
import SettingsIcon from "@mui/icons-material/Settings";
import Button from "@mui/material/Button";
import FormControlLabel from "@mui/material/FormControlLabel";
import FormHelperText from "@mui/material/FormHelperText";
Expand All @@ -19,7 +20,6 @@ import type {
AutofillSource,
} from "utils/richParameters";
import { MultiTextField } from "./MultiTextField";
import SettingsIcon from "@mui/icons-material/Settings";

const isBoolean = (parameter: TemplateVersionParameter) => {
return parameter.type === "bool";
Expand Down
20 changes: 15 additions & 5 deletions site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { Interpolation, Theme } from "@emotion/react";
import FormControlLabel from "@mui/material/FormControlLabel";
import FormHelperText from "@mui/material/FormHelperText";
import TextField from "@mui/material/TextField";
import FormControlLabel from "@mui/material/FormControlLabel";
import type * as TypesGen from "api/typesGenerated";
import { Alert } from "components/Alert/Alert";
import { ErrorAlert } from "components/Alert/ErrorAlert";
Expand All @@ -25,6 +25,7 @@ import { Pill } from "components/Pill/Pill";
import { RichParameterInput } from "components/RichParameterInput/RichParameterInput";
import { Spinner } from "components/Spinner/Spinner";
import { Stack } from "components/Stack/Stack";
import { Switch } from "components/Switch/Switch";
import { UserAutocomplete } from "components/UserAutocomplete/UserAutocomplete";
import { type FormikContextType, useFormik } from "formik";
import { generateWorkspaceName } from "modules/workspaces/generateWorkspaceName";
Expand All @@ -46,7 +47,6 @@ import type {
} from "./CreateWorkspacePage";
import { ExternalAuthButton } from "./ExternalAuthButton";
import type { CreateWSPermissions } from "./permissions";
import { Switch } from "components/Switch/Switch";

export const Language = {
duplicationWarning:
Expand Down Expand Up @@ -200,7 +200,13 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
value: presetParameter.Value,
});
}
}, [presetOptions, selectedPresetIndex, presets, parameters, form.setFieldValue]);
}, [
presetOptions,
selectedPresetIndex,
presets,
parameters,
form.setFieldValue,
]);

return (
<Margins size="medium">
Expand Down Expand Up @@ -296,7 +302,9 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
selectedOption={presetOptions[selectedPresetIndex]}
/>
</Stack>
<div css={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
<div
css={{ display: "flex", alignItems: "center", gap: "8px" }}
>
<Switch
checked={showPresetParameters}
onCheckedChange={setShowPresetParameters}
Expand Down Expand Up @@ -382,7 +390,9 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
{parameters.map((parameter, index) => {
const parameterField = `rich_parameter_values.${index}`;
const parameterInputName = `${parameterField}.value`;
const isPresetParameter = presetParameterNames.includes(parameter.name);
const isPresetParameter = presetParameterNames.includes(
parameter.name,
);
const isDisabled =
disabledParams?.includes(
parameter.name.toLowerCase().replace(/ /g, "_"),
Expand Down
Loading