Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

feat: setup connection to dynamic parameters websocket#17393

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.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
jaaydenh merged 20 commits intomainfromjaaydenh/dynamic-params-websocket
Apr 16, 2025
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
Show all changes
20 commits
Select commitHold shift + click to select a range
7b61485
feat: create dynamic parameter component
jaaydenhApr 10, 2025
f5d4a1c
fix: format
jaaydenhApr 11, 2025
0fc4289
chore: cleanup, update validation
jaaydenhApr 11, 2025
d109874
chore: update for types from typesGenerated
jaaydenhApr 11, 2025
7c13eb7
fix: remove filters
jaaydenhApr 11, 2025
4290284
chore: remove unused typesParameter.ts
jaaydenhApr 11, 2025
74084fb
fix: updates for PR review
jaaydenhApr 15, 2025
05adc15
fix: format
jaaydenhApr 15, 2025
b2c662a
fix: remove websocket code
jaaydenhApr 15, 2025
2da7d99
feat: connect to dynamic parameters websocket
jaaydenhApr 14, 2025
98dfee2
chore: cleanup
jaaydenhApr 14, 2025
d1ada89
fix: set initial values
jaaydenhApr 14, 2025
e04ce2f
fix: fix commit
jaaydenhApr 16, 2025
a6f480d
fix: fix rebase issues
jaaydenhApr 16, 2025
2613100
chore: update valid value methods
jaaydenhApr 16, 2025
1e66a71
chore: onError is required
jaaydenhApr 16, 2025
9a9201e
chore: display websocket error in UI
jaaydenhApr 16, 2025
1777ca9
fix: format
jaaydenhApr 16, 2025
440fedc
fix: updates for PR review
jaaydenhApr 16, 2025
4f056af
chore: add useCallback
jaaydenhApr 16, 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
26 changes: 26 additions & 0 deletionssite/src/api/api.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1009,6 +1009,32 @@ class ApiMethods {
return response.data;
};

templateVersionDynamicParameters = (
versionId: string,
{
onMessage,
onError,
}: {
onMessage: (response: TypesGen.DynamicParametersResponse) => void;
onError: (error: Error) => void;
},
): WebSocket => {
const socket = createWebSocket(
`/api/v2/templateversions/${versionId}/dynamic-parameters`,
);

socket.addEventListener("message", (event) =>
onMessage(JSON.parse(event.data) as TypesGen.DynamicParametersResponse),
);

socket.addEventListener("error", () => {
onError(new Error("Connection for dynamic parameters failed."));
socket.close();
});

return socket;
};

/**
* @param organization Can be the organization's ID or name
*/
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import type {
NullHCLString,
PreviewParameter,
PreviewParameterOption,
WorkspaceBuildParameter,
Expand DownExpand Up@@ -156,10 +157,8 @@ const ParameterField: FC<ParameterFieldProps> = ({
disabled,
id,
}) => {
const value = parameter.value.valid ? parameter.value.value : "";
const defaultValue = parameter.default_value.valid
? parameter.default_value.value
: "";
const value = validValue(parameter.value);
const defaultValue = validValue(parameter.default_value);

switch (parameter.form_type) {
case "dropdown":
Expand DownExpand Up@@ -376,9 +375,7 @@ export const getInitialParameterValues = (
if (parameter.ephemeral) {
return {
name: parameter.name,
value: parameter.default_value.valid
? parameter.default_value.value
: "",
value: validValue(parameter.default_value),
};
}

Expand All@@ -390,15 +387,19 @@ export const getInitialParameterValues = (
name: parameter.name,
value:
autofillParam &&
isValidValue(parameter, autofillParam) &&
isValidParameterOption(parameter, autofillParam) &&
autofillParam.value
? autofillParam.value
:"",
:validValue(parameter.default_value),
};
});
};

const isValidValue = (
const validValue = (value: NullHCLString) => {
return value.valid ? value.value : "";
};

const isValidParameterOption = (
previewParam: PreviewParameter,
buildParam: WorkspaceBuildParameter,
) => {
Expand All@@ -409,7 +410,7 @@ const isValidValue = (
return validValues.includes(buildParam.value);
}

returntrue;
returnfalse;
};

export const useValidationSchemaForDynamicParameters = (
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ import { autoCreateWorkspace, createWorkspace } from "api/queries/workspaces";
import type {
DynamicParametersRequest,
DynamicParametersResponse,
Template,
Workspace,
} from "api/typesGenerated";
import { Loader } from "components/Loader/Loader";
Expand All@@ -32,6 +31,7 @@ import type { AutofillBuildParameter } from "utils/richParameters";
import { CreateWorkspacePageViewExperimental } from "./CreateWorkspacePageViewExperimental";
export const createWorkspaceModes = ["form", "auto", "duplicate"] as const;
export type CreateWorkspaceMode = (typeof createWorkspaceModes)[number];
import { API } from "api/api";
import {
type CreateWorkspacePermissions,
createWorkspaceChecks,
Expand All@@ -47,8 +47,9 @@ const CreateWorkspacePageExperimental: FC = () => {

const [currentResponse, setCurrentResponse] =
useState<DynamicParametersResponse | null>(null);
const [wsResponseId, setWSResponseId] = useState<number>(0);
const sendMessage = (message: DynamicParametersRequest) => {};
const [wsResponseId, setWSResponseId] = useState<number>(-1);
const ws = useRef<WebSocket | null>(null);
const [wsError, setWsError] = useState<Error | null>(null);

const customVersionId = searchParams.get("version") ?? undefined;
const defaultName = searchParams.get("name");
Expand DownExpand Up@@ -80,6 +81,49 @@ const CreateWorkspacePageExperimental: FC = () => {
const realizedVersionId =
customVersionId ?? templateQuery.data?.active_version_id;

const onMessage = useCallback((response: DynamicParametersResponse) => {
setCurrentResponse((prev) => {
if (prev?.id === response.id) {
return prev;
}
return response;
});
}, []);

// Initialize the WebSocket connection when there is a valid template version ID
useEffect(() => {
if (!realizedVersionId) {
return;
}

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

ws.current = socket;

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

const sendMessage = useCallback((formValues: Record<string, string>) => {
setWSResponseId((prevId) => {
const request: DynamicParametersRequest = {
id: prevId + 1,
inputs: formValues,
};
if (ws.current && ws.current.readyState === WebSocket.OPEN) {
ws.current.send(JSON.stringify(request));
return prevId + 1;
}
return prevId;
});
}, []);

const organizationId = templateQuery.data?.organization_id;

const {
Expand All@@ -90,7 +134,9 @@ const CreateWorkspacePageExperimental: FC = () => {
} = useExternalAuth(realizedVersionId);

const isLoadingFormData =
templateQuery.isLoading || permissionsQuery.isLoading;
ws.current?.readyState !== WebSocket.OPEN ||
templateQuery.isLoading ||
permissionsQuery.isLoading;
const loadFormDataError = templateQuery.error ?? permissionsQuery.error;

const title = autoCreateWorkspaceMutation.isLoading
Expand DownExpand Up@@ -189,11 +235,12 @@ const CreateWorkspacePageExperimental: FC = () => {
<CreateWorkspacePageViewExperimental
mode={mode}
defaultName={defaultName}
diagnostics={currentResponse.diagnostics}
diagnostics={currentResponse?.diagnostics ?? []}
disabledParams={disabledParams}
defaultOwner={me}
autofillParameters={autofillParameters}
error={
wsError ||
createWorkspaceMutation.error ||
autoCreateError ||
loadFormDataError ||
Expand All@@ -210,7 +257,6 @@ const CreateWorkspacePageExperimental: FC = () => {
parameters={sortedParams}
presets={templateVersionPresetsQuery.data ?? []}
creatingWorkspace={createWorkspaceMutation.isLoading}
setWSResponseId={setWSResponseId}
sendMessage={sendMessage}
onCancel={() => {
navigate(-1);
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,8 +67,7 @@ export interface CreateWorkspacePageViewExperimentalProps {
owner: TypesGen.User,
) => void;
resetMutation: () => void;
sendMessage: (message: DynamicParametersRequest) => void;
setWSResponseId: (value: React.SetStateAction<number>) => void;
sendMessage: (message: Record<string, string>) => void;
startPollingExternalAuth: () => void;
}

Expand All@@ -95,7 +94,6 @@ export const CreateWorkspacePageViewExperimental: FC<
onCancel,
resetMutation,
sendMessage,
setWSResponseId,
startPollingExternalAuth,
}) => {
const [owner, setOwner] = useState(defaultOwner);
Expand DownExpand Up@@ -222,15 +220,7 @@ export const CreateWorkspacePageViewExperimental: FC<
// Update the input for the changed parameter
formInputs[parameter.name] = value;

setWSResponseId((prevId) => {
const newId = prevId + 1;
const request: DynamicParametersRequest = {
id: newId,
inputs: formInputs,
};
sendMessage(request);
return newId;
});
sendMessage(formInputs);
};

const { debounced: handleChangeDebounced } = useDebouncedFunction(
Expand All@@ -240,7 +230,7 @@ export const CreateWorkspacePageViewExperimental: FC<
value: string,
) => {
await form.setFieldValue(parameterField, {
name: parameter.form_type,
name: parameter.name,
value,
});
sendDynamicParamsRequest(parameter, value);
Expand All@@ -257,7 +247,7 @@ export const CreateWorkspacePageViewExperimental: FC<
handleChangeDebounced(parameter, parameterField, value);
} else {
await form.setFieldValue(parameterField, {
name: parameter.form_type,
name: parameter.name,
value,
});
sendDynamicParamsRequest(parameter, value);
Expand Down
Loading

[8]ページ先頭

©2009-2025 Movatter.jp