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

Commit5f0ce7f

Browse files
authored
fix: update url for parameters websocket endpoint (#17462)
1 parent2cc56ab commit5f0ce7f

File tree

3 files changed

+23
-26
lines changed

3 files changed

+23
-26
lines changed

‎site/src/api/api.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1010,6 +1010,7 @@ class ApiMethods {
10101010
};
10111011

10121012
templateVersionDynamicParameters=(
1013+
userId:string,
10131014
versionId:string,
10141015
{
10151016
onMessage,
@@ -1020,7 +1021,7 @@ class ApiMethods {
10201021
},
10211022
):WebSocket=>{
10221023
constsocket=createWebSocket(
1023-
`/api/v2/templateversions/${versionId}/dynamic-parameters`,
1024+
`/api/v2/users/${userId}/templateversions/${versionId}/parameters`,
10241025
);
10251026

10261027
socket.addEventListener("message",(event)=>

‎site/src/pages/CreateWorkspacePage/CreateWorkspacePageExperimental.tsx‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ const CreateWorkspacePageExperimental: FC = () => {
5757
const[mode,setMode]=useState(()=>getWorkspaceMode(searchParams));
5858
const[autoCreateError,setAutoCreateError]=
5959
useState<ApiErrorResponse|null>(null);
60+
constdefaultOwner=me;
61+
const[owner,setOwner]=useState(defaultOwner);
6062

6163
constqueryClient=useQueryClient();
6264
constautoCreateWorkspaceMutation=useMutation(
@@ -96,19 +98,23 @@ const CreateWorkspacePageExperimental: FC = () => {
9698
return;
9799
}
98100

99-
constsocket=API.templateVersionDynamicParameters(realizedVersionId,{
100-
onMessage,
101-
onError:(error)=>{
102-
setWsError(error);
101+
constsocket=API.templateVersionDynamicParameters(
102+
owner.id,
103+
realizedVersionId,
104+
{
105+
onMessage,
106+
onError:(error)=>{
107+
setWsError(error);
108+
},
103109
},
104-
});
110+
);
105111

106112
ws.current=socket;
107113

108114
return()=>{
109115
socket.close();
110116
};
111-
},[realizedVersionId,onMessage]);
117+
},[owner.id,realizedVersionId,onMessage]);
112118

113119
constsendMessage=useCallback((formValues:Record<string,string>)=>{
114120
setWSResponseId((prevId)=>{
@@ -237,7 +243,9 @@ const CreateWorkspacePageExperimental: FC = () => {
237243
defaultName={defaultName}
238244
diagnostics={currentResponse?.diagnostics??[]}
239245
disabledParams={disabledParams}
240-
defaultOwner={me}
246+
defaultOwner={defaultOwner}
247+
owner={owner}
248+
setOwner={setOwner}
241249
autofillParameters={autofillParameters}
242250
error={
243251
wsError||

‎site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,7 @@ import {
2222
useValidationSchemaForDynamicParameters,
2323
}from"modules/workspaces/DynamicParameter/DynamicParameter";
2424
import{generateWorkspaceName}from"modules/workspaces/generateWorkspaceName";
25-
import{
26-
typeFC,
27-
useCallback,
28-
useEffect,
29-
useId,
30-
useMemo,
31-
useState,
32-
}from"react";
25+
import{typeFC,useCallback,useEffect,useId,useState}from"react";
3326
import{getFormHelpers,nameValidator}from"utils/formUtils";
3427
importtype{AutofillBuildParameter}from"utils/richParameters";
3528
import*asYupfrom"yup";
@@ -65,6 +58,8 @@ export interface CreateWorkspacePageViewExperimentalProps {
6558
resetMutation:()=>void;
6659
sendMessage:(message:Record<string,string>)=>void;
6760
startPollingExternalAuth:()=>void;
61+
owner:TypesGen.User;
62+
setOwner:(user:TypesGen.User)=>void;
6863
}
6964

7065
exportconstCreateWorkspacePageViewExperimental:FC<
@@ -91,8 +86,9 @@ export const CreateWorkspacePageViewExperimental: FC<
9186
resetMutation,
9287
sendMessage,
9388
startPollingExternalAuth,
89+
owner,
90+
setOwner,
9491
})=>{
95-
const[owner,setOwner]=useState(defaultOwner);
9692
const[suggestedName,setSuggestedName]=useState(()=>
9793
generateWorkspaceName(),
9894
);
@@ -140,14 +136,6 @@ export const CreateWorkspacePageViewExperimental: FC<
140136
error,
141137
);
142138

143-
constautofillByName=useMemo(
144-
()=>
145-
Object.fromEntries(
146-
autofillParameters.map((param)=>[param.name,param]),
147-
),
148-
[autofillParameters],
149-
);
150-
151139
const[presetOptions,setPresetOptions]=useState([
152140
{label:"None",value:""},
153141
]);
@@ -252,7 +240,7 @@ export const CreateWorkspacePageViewExperimental: FC<
252240

253241
return(
254242
<>
255-
<divclassName="absolutesticky top-5 ml-10">
243+
<divclassName="sticky top-5 ml-10">
256244
<button
257245
onClick={onCancel}
258246
type="button"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp