Skip to content

Commit b1ab93f

Browse files
presleyppresleyp
committed
Format
1 parent eae13a2 commit b1ab93f

File tree

3 files changed

+137
-135
lines changed

3 files changed

+137
-135
lines changed

‎site/src/api/api.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,9 @@ export const getWorkspaces = async (
292292
searchParams.set("q", options.q)
293293
}
294294

295-
const response = await axios.get<TypesGen.Workspace[]>(`/api/v2/workspaces?${searchParams.toString()}`)
295+
const response = await axios.get<TypesGen.Workspace[]>(
296+
`/api/v2/workspaces?${searchParams.toString()}`,
297+
)
296298
return response.data
297299
}
298300

‎site/src/pages/WorkspacesPage/WorkspacesPageView.tsx

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -86,26 +86,26 @@ export const WorkspacesPageView: FC<
8686
</PageHeader>
8787

8888
<Stack>
89-
<Maybe condition={getWorkspacesError !== undefined}>
90-
<AlertBanner
91-
error={getWorkspacesError}
92-
severity={
93-
workspaceRefs !== undefined && workspaceRefs.length > 0
94-
? "warning"
95-
: "error"
96-
}
97-
/>
98-
</Maybe>
89+
<Maybe condition={getWorkspacesError !== undefined}>
90+
<AlertBanner
91+
error={getWorkspacesError}
92+
severity={
93+
workspaceRefs !== undefined && workspaceRefs.length > 0
94+
? "warning"
95+
: "error"
96+
}
97+
/>
98+
</Maybe>
9999

100-
<Maybe condition={getCountError !== undefined}>
101-
<AlertBanner error={getCountError} severity="warning" />
102-
</Maybe>
100+
<Maybe condition={getCountError !== undefined}>
101+
<AlertBanner error={getCountError} severity="warning" />
102+
</Maybe>
103103

104-
<SearchBarWithFilter
105-
filter={filter}
106-
onFilter={onFilter}
107-
presetFilters={presetFilters}
108-
/>
104+
<SearchBarWithFilter
105+
filter={filter}
106+
onFilter={onFilter}
107+
presetFilters={presetFilters}
108+
/>
109109
</Stack>
110110

111111
<WorkspacesTable

‎site/src/xServices/workspaces/workspacesXService.ts

Lines changed: 116 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -223,139 +223,139 @@ export const workspacesMachine =
223223
/** @xstate-layout N4IgpgJg5mDOIC5QHcD2AnA1rADgQwGM4BlAFz1LADpk8BLUgFVQCUwAzdOACwHUNs+IrADEAD1jlKVPO0roAFAFYADGoCUItFlyESU6rQbM2nHvx1C4AbRUBdRKBypYDOqgB2jkGMQBGAGYANgCqFQAmAE4-cIAOOPDwoIB2ZIAaEABPRHCVKljAv2S-EMiClSUAFliAXxqM7UE9WDIKanYwUgJuOg8oKgJUAFcPUioYUlJeqABhYdGRCE9qXoA3VExqCYsm4TmR0lsHJBBnVynPb18ESsq8uOLk2KCVSqVY4qUM7IQAyqoApElOFKskgpEUn5avUQI1dMJWtIOl0en0BvMxhMpn19gswOh0BgqDgADYUdgYAC2406O3hcFxh3s3jObkuJ2ufyUVEiAXi4QCySUAWBARF3xyaiowuqZShQSCiUidQaAnpLQMVGR3WmNDVVlgVCGOAgFGmdKsplESw8Kw8602RpNbQteitRxZLjZXg5iFitwByTKARUQVulQCiQlCBeeX9sWifihhXBKth+uaiPanR1aLhBppk3NGeEi2WVDWGy2tJLNmZJ1ZFx9oGub25f0jyQqSiUQvi0aUiqoiXCfnecT8kRUwTT+czmu1qP6c+EhexUFdpZtdod1dIm5sfmOTi9TauiFukWlCb5097-tD0cqQ57dw+8cCz9ntY1bS1OaXPVLGaNdi2A0t8UJdBiTJUgKXQalth-D0G1Pdxmx8fximHF5O1uVJKgFAJoxCZIqChPlIhBUMngib9wP0P9F2mMtbSoSQ-xXRikQA6YUJPc50PPBBAhSYcQWBJJcmBfsshyIpxNHLsCiUIFIyCejdm4sARAAcQAUUYAB9XgAHkWAAaWIAAFABBGZ9OIfjTjQ9kW0QABaQiwmKadkhDQjgmSSpow8gIx3Ivkg17KIwSUPxNPVLMRAAVWsgARWzGH0oyADEAEkABlspYZzGyE30ECePwAVicLkiiJNKjHcJQvC-5Xg+Io+XHYFEoNZK0sy7KjIANX0lhiHy0yADkytcjDrj8NQyNHBUilUYplsiNrvJFJJVEHZqew0mEuN-SgRBm-SAA1GHmwS3MwkSgm5XsFQO4E-FBQI2u+sJqgaiFAeKV7+vnNoRGslh9NG6aUqc+sBO9YTBX+cFR1HQdIgjI6-o6wGojDD5QaUcGEQMPTTKMxhqbsgyHpRyr3iCKhgtE0E7gFZ58YBj4iZBkoybTDxUAgOBvHOrMaHoJhWA4LhYD4H9PUexb-DFdHe26p44hFPxo1EnkgihfzBV5QI+rOn9peYtFBgOUCcQxVWmfc35-nCVTYh9iFwpBEFo0BAEp3iCJRzUEVKnJ7T-xRXUHdGKht1ds9KpCVnXj+V5ihBD7ozWtnEnlPluZ7AIY4u7N4-tl3ULV4SPMCNm7iTZbgg+d7QqqKgXlBYIIxUSIcd5Svbd4vMfydU11wPK1U4q926vCHkdeFKiXjHJ9qjZwcffUwEVGW4XVQYqu49zZcp6xMCtPgeu3eev5pVSSdEjFRUShKbfuSFIJ339hCL2p1T533HjXK+Z9k7LAXk9a4xRPZ3F8tzMUEJoz+TeikXkipQx7wrtbM+4DL5ATvrA9WCAm6hEInEFQqQFSCjqv6IOg5d7-zeIEP4pQx4LgnlAMhjcTYtyPkmac-8hRglCt9UIfcGrdg+LQj43C2j8Mqk3IeQi26iM7hIuSFC7j-ECD7LOdVBRDzqHUIAA */
224224
createMachine(
225225
{
226-
tsTypes: {} as import("./workspacesXService.typegen").Typegen1,
227-
schema: {
228-
context: {} as WorkspacesContext,
229-
events: {} as WorkspacesEvent,
230-
services: {} as {
231-
getWorkspaces: {
232-
data: TypesGen.Workspace[]
233-
}
234-
getWorkspacesCount: {
235-
data: { count: number }
236-
}
237-
updateWorkspaceRefs: {
238-
data: {
239-
refsToKeep: WorkspaceItemMachineRef[]
240-
newWorkspaces: TypesGen.Workspace[]
241-
}
242-
}
243-
},
244-
},
245-
predictableActionArguments: true,
246-
id: "workspacesState",
247-
on: {
248-
UPDATE_FILTER: {
249-
target: ".fetching",
250-
actions: ["assignFilter", "resetPage"],
251-
},
252-
UPDATE_VERSION: {
253-
actions: "triggerUpdateVersion",
254-
},
255-
NEXT: {
256-
target: ".fetching",
257-
actions: ["assignNextPage", "onPageChange"],
258-
},
259-
PREVIOUS: {
260-
target: ".fetching",
261-
actions: ["assignPreviousPage", "onPageChange"],
262-
},
263-
GO_TO_PAGE: {
264-
target: ".fetching",
265-
actions: ["assignPage", "onPageChange"],
266-
},
267-
},
268-
initial: "fetching",
269-
states: {
270-
waitToRefreshWorkspaces: {
271-
after: {
272-
"5000": {
273-
target: "#workspacesState.fetching",
274-
actions: [],
275-
internal: false,
226+
tsTypes: {} as import("./workspacesXService.typegen").Typegen1,
227+
schema: {
228+
context: {} as WorkspacesContext,
229+
events: {} as WorkspacesEvent,
230+
services: {} as {
231+
getWorkspaces: {
232+
data: TypesGen.Workspace[]
233+
}
234+
getWorkspacesCount: {
235+
data: { count: number }
236+
}
237+
updateWorkspaceRefs: {
238+
data: {
239+
refsToKeep: WorkspaceItemMachineRef[]
240+
newWorkspaces: TypesGen.Workspace[]
241+
}
242+
}
276243
},
277244
},
278-
},
279-
fetching: {
280-
type: "parallel",
245+
predictableActionArguments: true,
246+
id: "workspacesState",
247+
on: {
248+
UPDATE_FILTER: {
249+
target: ".fetching",
250+
actions: ["assignFilter", "resetPage"],
251+
},
252+
UPDATE_VERSION: {
253+
actions: "triggerUpdateVersion",
254+
},
255+
NEXT: {
256+
target: ".fetching",
257+
actions: ["assignNextPage", "onPageChange"],
258+
},
259+
PREVIOUS: {
260+
target: ".fetching",
261+
actions: ["assignPreviousPage", "onPageChange"],
262+
},
263+
GO_TO_PAGE: {
264+
target: ".fetching",
265+
actions: ["assignPage", "onPageChange"],
266+
},
267+
},
268+
initial: "fetching",
281269
states: {
282-
count: {
283-
initial: "gettingCount",
284-
states: {
285-
gettingCount: {
286-
entry: "clearGetCountError",
287-
invoke: {
288-
src: "getWorkspacesCount",
289-
id: "getWorkspacesCount",
290-
onDone: [
291-
{
292-
target: "done",
293-
actions: "assignCount",
294-
},
295-
],
296-
onError: [
297-
{
298-
target: "done",
299-
actions: "assignGetCountError",
300-
},
301-
],
302-
},
303-
},
304-
done: {
305-
type: "final",
270+
waitToRefreshWorkspaces: {
271+
after: {
272+
"5000": {
273+
target: "#workspacesState.fetching",
274+
actions: [],
275+
internal: false,
306276
},
307277
},
308278
},
309-
workspaces: {
310-
initial: "gettingWorkspaces",
279+
fetching: {
280+
type: "parallel",
311281
states: {
312-
updatingWorkspaceRefs: {
313-
invoke: {
314-
src: "updateWorkspaceRefs",
315-
id: "updateWorkspaceRefs",
316-
onDone: [
317-
{
318-
target: "done",
319-
actions: "assignUpdatedWorkspaceRefs",
282+
count: {
283+
initial: "gettingCount",
284+
states: {
285+
gettingCount: {
286+
entry: "clearGetCountError",
287+
invoke: {
288+
src: "getWorkspacesCount",
289+
id: "getWorkspacesCount",
290+
onDone: [
291+
{
292+
target: "done",
293+
actions: "assignCount",
294+
},
295+
],
296+
onError: [
297+
{
298+
target: "done",
299+
actions: "assignGetCountError",
300+
},
301+
],
320302
},
321-
],
303+
},
304+
done: {
305+
type: "final",
306+
},
322307
},
323308
},
324-
gettingWorkspaces: {
325-
entry: "clearGetWorkspacesError",
326-
invoke: {
327-
src: "getWorkspaces",
328-
id: "getWorkspaces",
329-
onDone: [
330-
{
331-
target: "done",
332-
cond: "isEmpty",
333-
actions: "assignWorkspaceRefs",
309+
workspaces: {
310+
initial: "gettingWorkspaces",
311+
states: {
312+
updatingWorkspaceRefs: {
313+
invoke: {
314+
src: "updateWorkspaceRefs",
315+
id: "updateWorkspaceRefs",
316+
onDone: [
317+
{
318+
target: "done",
319+
actions: "assignUpdatedWorkspaceRefs",
320+
},
321+
],
334322
},
335-
{
336-
target: "updatingWorkspaceRefs",
337-
},
338-
],
339-
onError: [
340-
{
341-
target: "done",
342-
actions: "assignGetWorkspacesError",
323+
},
324+
gettingWorkspaces: {
325+
entry: "clearGetWorkspacesError",
326+
invoke: {
327+
src: "getWorkspaces",
328+
id: "getWorkspaces",
329+
onDone: [
330+
{
331+
target: "done",
332+
cond: "isEmpty",
333+
actions: "assignWorkspaceRefs",
334+
},
335+
{
336+
target: "updatingWorkspaceRefs",
337+
},
338+
],
339+
onError: [
340+
{
341+
target: "done",
342+
actions: "assignGetWorkspacesError",
343+
},
344+
],
343345
},
344-
],
346+
},
347+
done: {
348+
type: "final",
349+
},
345350
},
346351
},
347-
done: {
348-
type: "final",
349-
},
352+
},
353+
onDone: {
354+
target: "waitToRefreshWorkspaces",
350355
},
351356
},
352357
},
353-
onDone: {
354-
target: "waitToRefreshWorkspaces",
355-
},
356358
},
357-
},
358-
},
359359
{
360360
guards: {
361361
isEmpty: (context) => !context.workspaceRefs,
@@ -407,7 +407,7 @@ export const workspacesMachine =
407407
page: (_, event) => event.page,
408408
}),
409409
resetPage: assign({
410-
page: (_) => 1
410+
page: (_) => 1,
411411
}),
412412
assignCount: assign({
413413
count: (_, event) => event.data.count,

0 commit comments

Comments
 (0)