Skip to content

Commit 03dde8a

Browse files
committed
chore: updates for PR review comments
1 parent 04c7f83 commit 03dde8a

File tree

3 files changed

+23
-25
lines changed

3 files changed

+23
-25
lines changed

site/src/components/Select/Select.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ export const SelectValue = SelectPrimitive.Value;
1515

1616
export const SelectTrigger = React.forwardRef<
1717
React.ElementRef<typeof SelectPrimitive.Trigger>,
18-
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Trigger> & { id?: string }
18+
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Trigger> & {
19+
id?: string;
20+
}
1921
>(({ className, children, id, ...props }, ref) => (
2022
<SelectPrimitive.Trigger
2123
ref={ref}

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

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ import {
3232
TooltipProvider,
3333
TooltipTrigger,
3434
} from "components/Tooltip/Tooltip";
35-
import { Info, Link, Settings, TriangleAlert } from "lucide-react";
36-
import { type FC, useEffect, useId, useState } from "react";
35+
import { Info, LinkIcon, Settings, TriangleAlert } from "lucide-react";
36+
import { type FC, useId, useState } from "react";
3737
import type { AutofillBuildParameter } from "utils/richParameters";
3838
import * as Yup from "yup";
3939

@@ -96,7 +96,6 @@ const ParameterLabel: FC<ParameterLabelProps> = ({
9696
autofill,
9797
id,
9898
}) => {
99-
const hasDescription = parameter.description && parameter.description !== "";
10099
const displayName = parameter.display_name
101100
? parameter.display_name
102101
: parameter.name;
@@ -163,7 +162,7 @@ const ParameterLabel: FC<ParameterLabelProps> = ({
163162
<TooltipTrigger asChild>
164163
<span className="flex items-center">
165164
<Badge size="sm">
166-
<Link />
165+
<LinkIcon />
167166
URL Autofill
168167
</Badge>
169168
</span>
@@ -176,7 +175,7 @@ const ParameterLabel: FC<ParameterLabelProps> = ({
176175
)}
177176
</Label>
178177

179-
{hasDescription && (
178+
{Boolean(parameter.description) && (
180179
<div className="text-content-secondary">
181180
<MemoizedMarkdown className="text-xs">
182181
{parameter.description}
@@ -204,7 +203,7 @@ const ParameterField: FC<ParameterFieldProps> = ({
204203
id,
205204
}) => {
206205
const [localValue, setLocalValue] = useState(
207-
value !== undefined ? value : validValue(parameter.value)
206+
value !== undefined ? value : validValue(parameter.value),
208207
);
209208
if (value !== undefined && value !== localValue) {
210209
setLocalValue(value);
@@ -215,7 +214,7 @@ const ParameterField: FC<ParameterFieldProps> = ({
215214
return (
216215
<Select
217216
onValueChange={onChange}
218-
value={value}
217+
value={localValue}
219218
disabled={disabled}
220219
required={parameter.required}
221220
>
@@ -235,7 +234,7 @@ const ParameterField: FC<ParameterFieldProps> = ({
235234
);
236235

237236
case "multi-select": {
238-
const values = parseStringArrayValue(value ?? "");
237+
const values = parseStringArrayValue(localValue ?? "");
239238

240239
// Map parameter options to MultiSelectCombobox options format
241240
const options: Option[] = parameter.options.map((opt) => ({
@@ -280,7 +279,7 @@ const ParameterField: FC<ParameterFieldProps> = ({
280279
}
281280

282281
case "tag-select": {
283-
const values = parseStringArrayValue(value ?? "");
282+
const values = parseStringArrayValue(localValue ?? "");
284283

285284
return (
286285
<TagInput
@@ -298,7 +297,7 @@ const ParameterField: FC<ParameterFieldProps> = ({
298297
return (
299298
<Switch
300299
id={id}
301-
checked={value === "true"}
300+
checked={localValue === "true"}
302301
onCheckedChange={(checked) => {
303302
onChange(checked ? "true" : "false");
304303
}}
@@ -308,7 +307,11 @@ const ParameterField: FC<ParameterFieldProps> = ({
308307

309308
case "radio":
310309
return (
311-
<RadioGroup onValueChange={onChange} disabled={disabled} value={value}>
310+
<RadioGroup
311+
onValueChange={onChange}
312+
disabled={disabled}
313+
value={localValue}
314+
>
312315
{parameter.options.map((option) => (
313316
<div
314317
key={option.value.value}
@@ -334,7 +337,7 @@ const ParameterField: FC<ParameterFieldProps> = ({
334337
<div className="flex items-center space-x-2">
335338
<Checkbox
336339
id={id}
337-
checked={value === "true"}
340+
checked={localValue === "true"}
338341
onCheckedChange={(checked) => {
339342
onChange(checked ? "true" : "false");
340343
}}
@@ -513,9 +516,7 @@ export const getInitialParameterValues = (
513516
);
514517

515518
const useAutofill =
516-
autofillParam &&
517-
isValidParameterOption(parameter, autofillParam) &&
518-
autofillParam.value;
519+
autofillParam?.value && isValidParameterOption(parameter, autofillParam);
519520

520521
return {
521522
name: parameter.name,

site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import {
3333
useContext,
3434
useEffect,
3535
useId,
36-
useMemo,
3736
useRef,
3837
useState,
3938
} from "react";
@@ -153,7 +152,7 @@ export const CreateWorkspacePageViewExperimental: FC<
153152

154153
const formValues = form.values.rich_parameter_values;
155154
if (parameters.length > 0 && formValues && formValues.length > 0) {
156-
const initialParams: { [k: string]: string } = {};
155+
const initialParams: Record<string, string> = {};
157156
for (const param of formValues) {
158157
if (param.name && param.value) {
159158
initialParams[param.name] = param.value;
@@ -166,12 +165,8 @@ export const CreateWorkspacePageViewExperimental: FC<
166165
}
167166
}, [parameters, form.values.rich_parameter_values, sendMessage]);
168167

169-
const autofillByName = useMemo(
170-
() =>
171-
Object.fromEntries(
172-
autofillParameters.map((param) => [param.name, param]),
173-
),
174-
[autofillParameters],
168+
const autofillByName = Object.fromEntries(
169+
autofillParameters.map((param) => [param.name, param]),
175170
);
176171

177172
useEffect(() => {
@@ -251,7 +246,7 @@ export const CreateWorkspacePageViewExperimental: FC<
251246
parameter: PreviewParameter,
252247
value: string,
253248
) => {
254-
const formInputs: { [k: string]: string } = {};
249+
const formInputs: Record<string, string> = {};
255250
formInputs[parameter.name] = value;
256251
const parameters = form.values.rich_parameter_values ?? [];
257252

0 commit comments

Comments
 (0)