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

Commit6838727

Browse files
BrunoQuaresmaericpaulsen
authored andcommitted
chore(site): remove workspace schedule machine (#10583)
Related to#9943
1 parent9e57830 commit6838727

File tree

2 files changed

+115
-303
lines changed

2 files changed

+115
-303
lines changed
Lines changed: 115 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import{useMachine}from"@xstate/react";
21
import{Alert}from"components/Alert/Alert";
32
import{ConfirmDialog}from"components/Dialogs/ConfirmDialog/ConfirmDialog";
43
import{Loader}from"components/Loader/Loader";
@@ -10,25 +9,38 @@ import {
109
}from"pages/WorkspaceSettingsPage/WorkspaceSchedulePage/schedule";
1110
import{ttlMsToAutostop}from"pages/WorkspaceSettingsPage/WorkspaceSchedulePage/ttl";
1211
import{useWorkspaceSettings}from"pages/WorkspaceSettingsPage/WorkspaceSettingsLayout";
13-
import{FC}from"react";
12+
import{FC,useState}from"react";
1413
import{Helmet}from"react-helmet-async";
15-
import{Navigate,useNavigate,useParams}from"react-router-dom";
14+
import{useNavigate,useParams}from"react-router-dom";
1615
import{pageTitle}from"utils/page";
1716
import*asTypesGenfrom"api/typesGenerated";
1817
import{workspaceByOwnerAndNameKey}from"api/queries/workspaces";
1918
import{WorkspaceScheduleForm}from"./WorkspaceScheduleForm";
20-
import{workspaceSchedule}from"xServices/workspaceSchedule/workspaceScheduleXService";
2119
import{
2220
formValuesToAutostartRequest,
2321
formValuesToTTLRequest,
2422
}from"./formToRequest";
2523
import{ErrorAlert}from"components/Alert/ErrorAlert";
26-
import{useQueryClient}from"react-query";
24+
import{useMutation,useQuery,useQueryClient}from"react-query";
25+
import{checkAuthorization}from"api/queries/authCheck";
26+
import{templateByName}from"api/queries/templates";
27+
import{
28+
putWorkspaceAutostart,
29+
putWorkspaceAutostop,
30+
startWorkspace,
31+
}from"api/api";
2732

28-
constgetAutostart=(workspace:TypesGen.Workspace)=>
29-
scheduleToAutostart(workspace.autostart_schedule);
30-
constgetAutostop=(workspace:TypesGen.Workspace)=>
31-
ttlMsToAutostop(workspace.ttl_ms);
33+
constpermissionsToCheck=(workspace:TypesGen.Workspace)=>
34+
({
35+
updateWorkspace:{
36+
object:{
37+
resource_type:"workspace",
38+
resource_id:workspace.id,
39+
owner_id:workspace.owner_id,
40+
},
41+
action:"update",
42+
},
43+
})asconst;
3244

3345
exportconstWorkspaceSchedulePage:FC=()=>{
3446
constparams=useParams()as{username:string;workspace:string};
@@ -37,24 +49,28 @@ export const WorkspaceSchedulePage: FC = () => {
3749
constworkspaceName=params.workspace;
3850
constqueryClient=useQueryClient();
3951
constworkspace=useWorkspaceSettings();
40-
const[scheduleState,scheduleSend]=useMachine(workspaceSchedule,{
41-
context:{ workspace},
52+
const{data:permissions,error:checkPermissionsError}=useQuery(
53+
checkAuthorization({checks:permissionsToCheck(workspace)}),
54+
);
55+
const{data:template,error:getTemplateError}=useQuery(
56+
templateByName(workspace.organization_id,workspace.template_name),
57+
);
58+
constsubmitScheduleMutation=useMutation({
59+
mutationFn:submitSchedule,
60+
onSuccess:async()=>{
61+
awaitqueryClient.invalidateQueries(
62+
workspaceByOwnerAndNameKey(params.username,params.workspace),
63+
);
64+
},
4265
});
43-
const{
44-
checkPermissionsError,
45-
submitScheduleError,
46-
getTemplateError,
47-
permissions,
48-
template,
49-
}=scheduleState.context;
50-
51-
if(!username||!workspaceName){
52-
return<Navigateto="/workspaces"/>;
53-
}
66+
consterror=checkPermissionsError||getTemplateError;
67+
constisLoading=!template||!permissions;
5468

55-
if(scheduleState.matches("done")){
56-
return<Navigateto={`/@${username}/${workspaceName}`}/>;
57-
}
69+
const[isConfirmingApply,setIsConfirmingApply]=useState(false);
70+
const{mutate:updateWorkspace}=useMutation({
71+
mutationFn:()=>
72+
startWorkspace(workspace.id,workspace.template_active_version_id),
73+
});
5874

5975
return(
6076
<>
@@ -68,70 +84,99 @@ export const WorkspaceSchedulePage: FC = () => {
6884
>
6985
<PageHeaderTitle>Workspace Schedule</PageHeaderTitle>
7086
</PageHeader>
71-
{(scheduleState.hasTag("loading")||!template)&&<Loader/>}
72-
{scheduleState.matches("error")&&(
73-
<ErrorAlerterror={checkPermissionsError||getTemplateError}/>
74-
)}
87+
88+
{error&&<ErrorAlerterror={error}/>}
89+
90+
{isLoading&&<Loader/>}
91+
7592
{permissions&&!permissions.updateWorkspace&&(
7693
<Alertseverity="error">
7794
You don&apos;t have permissions to update the schedule for this
7895
workspace.
7996
</Alert>
8097
)}
81-
{template&&
82-
workspace&&
83-
(scheduleState.matches("presentForm")||
84-
scheduleState.matches("submittingSchedule"))&&(
85-
<WorkspaceScheduleForm
86-
enableAutoStart={template.allow_user_autostart}
87-
enableAutoStop={template.allow_user_autostop}
88-
submitScheduleError={submitScheduleError}
89-
initialValues={{
90-
...getAutostart(workspace),
91-
...getAutostop(workspace),
92-
}}
93-
isLoading={scheduleState.tags.has("loading")}
94-
defaultTTL={dayjs.duration(template.default_ttl_ms,"ms").asHours()}
95-
onCancel={()=>{
96-
navigate(`/@${username}/${workspaceName}`);
97-
}}
98-
onSubmit={async(values)=>{
99-
scheduleSend({
100-
type:"SUBMIT_SCHEDULE",
101-
autostart:formValuesToAutostartRequest(values),
102-
ttl:formValuesToTTLRequest(values),
103-
autostartChanged:scheduleChanged(
104-
getAutostart(workspace),
105-
values,
106-
),
107-
autostopChanged:scheduleChanged(
108-
getAutostop(workspace),
109-
values,
110-
),
111-
});
112-
113-
awaitqueryClient.invalidateQueries(
114-
workspaceByOwnerAndNameKey(params.username,params.workspace),
115-
);
116-
}}
117-
/>
118-
)}
98+
99+
{template&&(
100+
<WorkspaceScheduleForm
101+
enableAutoStart={template.allow_user_autostart}
102+
enableAutoStop={template.allow_user_autostop}
103+
submitScheduleError={submitScheduleMutation.error}
104+
initialValues={{
105+
...getAutostart(workspace),
106+
...getAutostop(workspace),
107+
}}
108+
isLoading={submitScheduleMutation.isLoading}
109+
defaultTTL={dayjs.duration(template.default_ttl_ms,"ms").asHours()}
110+
onCancel={()=>{
111+
navigate(`/@${username}/${workspaceName}`);
112+
}}
113+
onSubmit={async(values)=>{
114+
constdata={
115+
workspace,
116+
autostart:formValuesToAutostartRequest(values),
117+
ttl:formValuesToTTLRequest(values),
118+
autostartChanged:scheduleChanged(
119+
getAutostart(workspace),
120+
values,
121+
),
122+
autostopChanged:scheduleChanged(getAutostop(workspace),values),
123+
};
124+
125+
awaitsubmitScheduleMutation.mutateAsync(data);
126+
127+
if(data.autostopChanged){
128+
setIsConfirmingApply(true);
129+
}
130+
}}
131+
/>
132+
)}
133+
119134
<ConfirmDialog
120-
open={scheduleState.matches("showingRestartDialog")}
135+
open={isConfirmingApply}
121136
title="Restart workspace?"
122137
description="Would you like to restart your workspace now to apply your new autostop setting, or let it apply after your next workspace start?"
123138
confirmText="Restart"
124139
cancelText="Apply later"
125140
hideCancel={false}
126141
onConfirm={()=>{
127-
scheduleSend("RESTART_WORKSPACE");
142+
updateWorkspace();
143+
navigate(`/@${username}/${workspaceName}`);
128144
}}
129145
onClose={()=>{
130-
scheduleSend("APPLY_LATER");
146+
navigate(`/@${username}/${workspaceName}`);
131147
}}
132148
/>
133149
</>
134150
);
135151
};
136152

153+
constgetAutostart=(workspace:TypesGen.Workspace)=>
154+
scheduleToAutostart(workspace.autostart_schedule);
155+
156+
constgetAutostop=(workspace:TypesGen.Workspace)=>
157+
ttlMsToAutostop(workspace.ttl_ms);
158+
159+
typeSubmitScheduleData={
160+
workspace:TypesGen.Workspace;
161+
autostart:TypesGen.UpdateWorkspaceAutostartRequest;
162+
autostartChanged:boolean;
163+
ttl:TypesGen.UpdateWorkspaceTTLRequest;
164+
autostopChanged:boolean;
165+
};
166+
167+
constsubmitSchedule=async(data:SubmitScheduleData)=>{
168+
const{ autostartChanged, workspace, autostart, autostopChanged, ttl}=data;
169+
constactions:Promise<void>[]=[];
170+
171+
if(autostartChanged){
172+
actions.push(putWorkspaceAutostart(workspace.id,autostart));
173+
}
174+
175+
if(autostopChanged){
176+
actions.push(putWorkspaceAutostop(workspace.id,ttl));
177+
}
178+
179+
returnPromise.all(actions);
180+
};
181+
137182
exportdefaultWorkspaceSchedulePage;

0 commit comments

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