Skip to content

fix: update url for parameters websocket endpoint #17462

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 1 commit into from
Apr 17, 2025
+23 −26
Merged

fix: update url for parameters websocket endpoint #17462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion site/src/api/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,6 +1010,7 @@ class ApiMethods {
};

templateVersionDynamicParameters = (
userId: string,
versionId: string,
{
onMessage,
Expand All @@ -1020,7 +1021,7 @@ class ApiMethods {
},
): WebSocket => {
const socket = createWebSocket(
`/api/v2/templateversions/${versionId}/dynamic-parameters`,
`/api/v2/users/${userId}/templateversions/${versionId}/parameters`,
);

socket.addEventListener("message", (event) =>
Expand Down
22 changes: 15 additions & 7 deletions site/src/pages/CreateWorkspacePage/CreateWorkspacePageExperimental.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ const CreateWorkspacePageExperimental: FC = () => {
const [mode, setMode] = useState(() => getWorkspaceMode(searchParams));
const [autoCreateError, setAutoCreateError] =
useState<ApiErrorResponse | null>(null);
const defaultOwner = me;
const [owner, setOwner] = useState(defaultOwner);

const queryClient = useQueryClient();
const autoCreateWorkspaceMutation = useMutation(
Expand Down Expand Up @@ -96,19 +98,23 @@ const CreateWorkspacePageExperimental: FC = () => {
return;
}

const socket = API.templateVersionDynamicParameters(realizedVersionId, {
onMessage,
onError: (error) => {
setWsError(error);
const socket = API.templateVersionDynamicParameters(
owner.id,
realizedVersionId,
{
onMessage,
onError: (error) => {
setWsError(error);
},
},
});
);

ws.current = socket;

return () => {
socket.close();
};
}, [realizedVersionId, onMessage]);
}, [owner.id, realizedVersionId, onMessage]);

const sendMessage = useCallback((formValues: Record<string, string>) => {
setWSResponseId((prevId) => {
Expand Down Expand Up @@ -237,7 +243,9 @@ const CreateWorkspacePageExperimental: FC = () => {
defaultName={defaultName}
diagnostics={currentResponse?.diagnostics ?? []}
disabledParams={disabledParams}
defaultOwner={me}
defaultOwner={defaultOwner}
owner={owner}
setOwner={setOwner}
autofillParameters={autofillParameters}
error={
wsError ||
Expand Down
24 changes: 6 additions & 18 deletions site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,7 @@ import {
useValidationSchemaForDynamicParameters,
} from "modules/workspaces/DynamicParameter/DynamicParameter";
import { generateWorkspaceName } from "modules/workspaces/generateWorkspaceName";
import {
type FC,
useCallback,
useEffect,
useId,
useMemo,
useState,
} from "react";
import { type FC, useCallback, useEffect, useId, useState } from "react";
import { getFormHelpers, nameValidator } from "utils/formUtils";
import type { AutofillBuildParameter } from "utils/richParameters";
import * as Yup from "yup";
Expand Down Expand Up @@ -65,6 +58,8 @@ export interface CreateWorkspacePageViewExperimentalProps {
resetMutation: () => void;
sendMessage: (message: Record<string, string>) => void;
startPollingExternalAuth: () => void;
owner: TypesGen.User;
setOwner: (user: TypesGen.User) => void;
}

export const CreateWorkspacePageViewExperimental: FC<
Expand All @@ -91,8 +86,9 @@ export const CreateWorkspacePageViewExperimental: FC<
resetMutation,
sendMessage,
startPollingExternalAuth,
owner,
setOwner,
}) => {
const [owner, setOwner] = useState(defaultOwner);
const [suggestedName, setSuggestedName] = useState(() =>
generateWorkspaceName(),
);
Expand Down Expand Up @@ -140,14 +136,6 @@ export const CreateWorkspacePageViewExperimental: FC<
error,
);

const autofillByName = useMemo(
() =>
Object.fromEntries(
autofillParameters.map((param) => [param.name, param]),
),
[autofillParameters],
);

const [presetOptions, setPresetOptions] = useState([
{ label: "None", value: "" },
]);
Expand Down Expand Up @@ -252,7 +240,7 @@ export const CreateWorkspacePageViewExperimental: FC<

return (
<>
<div className="absolute sticky top-5 ml-10">
<div className="sticky top-5 ml-10">
<button
onClick={onCancel}
type="button"
Expand Down
Loading