Skip to content

Commit 6711e28

Browse files
committed
fix: updates for PR review
1 parent a76159f commit 6711e28

File tree

3 files changed

+11
-18
lines changed

3 files changed

+11
-18
lines changed

site/src/components/MultiSelectCombobox/MultiSelectCombobox.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,6 @@ export const MultiSelectCombobox = forwardRef<
514514
})}
515515
{/* Avoid having the "Search" Icon */}
516516
<CommandPrimitive.Input
517-
id={inputProps?.id}
518517
{...inputProps}
519518
ref={inputRef}
520519
value={inputValue}

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import * as Yup from "yup";
4242
export interface DynamicParameterProps {
4343
parameter: PreviewParameter;
4444
value?: string;
45-
onChange: (value: string) => Promise<void>;
45+
onChange: (value: string) => void;
4646
disabled?: boolean;
4747
isPreset?: boolean;
4848
autofill: boolean;
@@ -203,7 +203,7 @@ const ParameterLabel: FC<ParameterLabelProps> = ({
203203
interface DebouncedParameterFieldProps {
204204
parameter: PreviewParameter;
205205
value?: string;
206-
onChange: (value: string) => Promise<void>;
206+
onChange: (value: string) => void;
207207
disabled?: boolean;
208208
id: string;
209209
}
@@ -239,12 +239,12 @@ const DebouncedParameterField: FC<DebouncedParameterFieldProps> = ({
239239
className="max-w-2xl"
240240
value={localValue}
241241
onChange={(e) => {
242-
setLocalValue(e.target.value);
243-
}}
244-
onInput={(e) => {
245242
const target = e.currentTarget;
243+
target.style.height = "auto";
246244
target.style.maxHeight = "700px";
247245
target.style.height = `${target.scrollHeight}px`;
246+
247+
setLocalValue(e.target.value);
248248
}}
249249
disabled={disabled}
250250
placeholder={parameter.styling?.placeholder}
@@ -290,7 +290,7 @@ const DebouncedParameterField: FC<DebouncedParameterFieldProps> = ({
290290
interface ParameterFieldProps {
291291
parameter: PreviewParameter;
292292
value?: string;
293-
onChange: (value: string) => Promise<void>;
293+
onChange: (value: string) => void;
294294
disabled?: boolean;
295295
id: string;
296296
}

site/src/pages/CreateWorkspacePage/CreateWorkspacePageExperimental.tsx

+5-11
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ const CreateWorkspacePageExperimental: FC = () => {
5050

5151
const [currentResponse, setCurrentResponse] =
5252
useState<DynamicParametersResponse | null>(null);
53-
const [wsResponseId, setWSResponseId] = useState<number>(-1);
53+
const wsResponseId = useRef<number>(-1);
5454
const ws = useRef<WebSocket | null>(null);
5555
const [wsError, setWsError] = useState<Error | null>(null);
5656
const initialParamsSentRef = useRef(false);
@@ -88,23 +88,17 @@ const CreateWorkspacePageExperimental: FC = () => {
8888
const realizedVersionId =
8989
customVersionId ?? templateQuery.data?.active_version_id;
9090

91-
const autofillParameters = useMemo(
92-
() => getAutofillParameters(searchParams),
93-
[searchParams],
94-
);
91+
const autofillParameters = getAutofillParameters(searchParams);
9592

9693
const sendMessage = useCallback((formValues: Record<string, string>) => {
97-
setWSResponseId((prevId) => {
9894
const request: DynamicParametersRequest = {
99-
id: prevId + 1,
95+
id: wsResponseId.current + 1,
10096
inputs: formValues,
10197
};
10298
if (ws.current && ws.current.readyState === WebSocket.OPEN) {
10399
ws.current.send(JSON.stringify(request));
104-
return prevId + 1;
100+
wsResponseId.current = wsResponseId.current + 1;
105101
}
106-
return prevId;
107-
});
108102
}, []);
109103

110104
// On sends all initial parameter values to the websocket
@@ -140,7 +134,7 @@ const CreateWorkspacePageExperimental: FC = () => {
140134
const onMessage = useCallback(
141135
(response: DynamicParametersResponse) => {
142136
setCurrentResponse((prev) => {
143-
if (prev?.id === response.id) {
137+
if (prev && prev?.id >= response.id) {
144138
return prev;
145139
}
146140

0 commit comments

Comments
 (0)