Skip to content

Commit 99a7a8d

Browse files
authored
chore: Turn predictable action arguments on (#3964)
* Turn predictable action arguments on * Remove layout strings
1 parent f16dd5a commit 99a7a8d

File tree

17 files changed

+291
-214
lines changed

17 files changed

+291
-214
lines changed

site/src/xServices/audit/auditXService.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import { assign, createMachine } from "xstate"
77
export const auditMachine = createMachine(
88
{
99
id: "auditMachine",
10+
predictableActionArguments: true,
11+
tsTypes: {} as import("./auditXService.typegen").Typegen0,
1012
schema: {
1113
context: {} as { auditLogs?: AuditLog[]; count?: number; page: number; limit: number },
1214
services: {} as {
@@ -29,7 +31,6 @@ export const auditMachine = createMachine(
2931
page: number
3032
},
3133
},
32-
tsTypes: {} as import("./auditXService.typegen").Typegen0,
3334
initial: "loading",
3435
states: {
3536
loading: {

site/src/xServices/auth/authXService.ts

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,8 @@ export const authMachine =
9191
/** @xstate-layout N4IgpgJg5mDOIC5QEMCuAXAFgZXc9YAdLAJZQB2kA8hgMTYCSA4gHID6DLioADgPal0JPuW4gAHogBsATimEAzDIAcAFgUB2VTJ26ANCACeiAIwaADKsLKFtu-dsBfRwbRZc+IqQolyUBuS0ECJEvgBufADWXmTkAWL8gsKiSBKICubKhKpSyhoArAbGCGaqGoRSlVXVlfnOrhg4eATEsb7+gWAATl18XYQ8ADb4AGZ9ALatFPGpiSRCImKSCLLySmqa2ro6RaYFAEzWDscK9SBuTZ6EMOhCfgCqsN1BIYThUUQ3ALJgCQLzySW6Uy2VyBV2JXyUhMFRqcLqLnOjQ8LRudygj2e3V6-SGowm1zA6B+fySi1Sy32MnyhHyyksYK2ug0EJM1IURxO9jOFxRnyJ6IACt1xiRYKQRLAXpQ3uQItFCABjTBgRWRYVdUXi5LwWb-BYpUDLZRScygvKFIyIGQaQ4FHnI5r827tDVaiXkKXYvoDYboMaapUqtVusUe3W8fWAimIE1mnIW1l0rImOE1BENdxOwkuvw-LB8CBS4Iy94K75EzCFiMgOYGoEIZRUwgyVT5BQmfaW4omGxZGxcuwOrNXNHtfNVou0b24v0ByYVgtF0kA8lG2PN1vtzvd0zszmD06I3nZ7yUCABAa9EYkQahCB32j3QUAEQAggAVACibEFACUqAAMQYAAZL8V3rGMSjbGQKihLsISkOlaWHS4WjPSBLx4a9byIVAeAgfBXRwx8S1COUPkIE8rgwi9yCvPgbzvQh8MIoUSLABB3kVIiRAAbXMABdCDo3XaD8lgpCpAQq0EA0eTUL5KZzywjiWIIoi-EFDjpx6H08X9AlqPQ2JMPo7DGNw9S2OIyy7y4iieINAThL1MlDTScTJPg3dGxkfZFNPUy6OIWBMDeB8wFoJgvw-NhsGwAAJNgAGkvwATREtdPM7VQrE0XyTF7coB0PQKaOCy9xXCsc-ASxKUrAQxpXI+UiGMmIKDM0KaoFdp6sawwHIiJzkhcrKPOWIqkOscFZNTfYOXtY9HQqrqQuqnN0QGprdJxX18UDDrlO6zbaqgHahu43jyHGtzV0m0x9jyxQ5p7ExzBhUrB3Kkz1qqsLCEGPhkAgSAIsfP8vxilgvz-T8f3q1KMomht9g+8ocnMGQCtZDRZAPLkMyREc-pU+jNuB0HwcVEQb01S6-zAGBKC6TxaAAYTfFgOa-EC2ChmG4YR+KkuRzL7sgsT0bMQhzCUcxpMK20vsPBRieO2iAfCqmwYgJU6ZIBmksGpmWe6dmOaoFhgL-L4Behr9Yfh79ReStKJcjdy0Yx0Fsdx+b23MX7OvJnqgZBvXCC6ZmwFZzSLpN3ayNlNqqNWsnTsB3XwZj822e2pOrscm67q9h6GzMBQrDy7cZJ7DR1ZQlbSdDrOdcj3PY-jwuGt2mcDsMo6M7bjbs87-W87ji3e8G4a+FG-ihNRqCq5rtsO3r0wpG0ZvMzQ0eqtVVAunmQwIai5931d7Avw5+4-wYD9PdrKNsqmsoOQyBM3sQZ6pBDidDax9T7oHPqxBO2AQFnxaqnSimtKoU2gWA6ykDkHFxGqXZektRI5U-ooBkiZZIKFyHvEmB8gFH0VCfM+qDtroL2vpOcRkR6UKQdQ0B4CNL0I4Wfeei9brYPLlLPBjcCE-18m2KwGtWFa0CIwVgbAqD3A-CvaWWgYSEN-iUDIZpUxpiqBoQBZ52g0HQLAssoczFqM8k2WCW5N6+X2OYeShMTgyNbspUxdAB4GXnMpaxOD35-w0XLCRrJ0ZWH0QYqQRiW4UOVKqSI7RAJG1gOgTEXQLEUQVMdRJaoUlpIyU8Lo-CsGuWEbg5YmhCD7B3nU-YA5lA6HVhCZxYjoRshyDvJQ+NVCAIAO7IABH4QCfQPwqlSV0dJmT6DMHYJwGx1Sm7Yx0I3SwziTBOLqWaLQdIpC2HyKoLZ5gESInIIWOAYgEHrUCZU4JJRsY0iIT2akZoPEUJMX4GY9zHoIDbIcdGLzt4qFhDEpCgDzqZKWYgVQ+xWSyCyOC2okK+paRFGGHUML-mmnNNorZbIwUxI+Upc6E5qzYq2LUuQwKSitnymrI8+8lJyIYkxe8zELlfj0l0bFVcaRlCklvRspzjGILZVZEgkVCAzj5Y3AV+MfIQjyEy8hLLxUWXZRfOVRVsiKqVhCRuhxtgaBVY3A5MgxX-XMmpCB7E7K-CCX8oq+RnnaIKJa+J6rrUSrvHykwHZZq+X2bScwYbzUSTUBCr1QUfWbSlX6p1lctlusKp2Q4JLY1hzOmixOfdii-MrlIiotKPpyCtdm8e1N9YJsdYWqCmyshyH9vigoVhkWxIre3CO1aDbkHpuMRm3cZ51tft7BtqhzAZoVga+aGhexuOOJmtalaO69qnj3fqRc+UKHpIQIq87S25GXZnMea69Y7qhPuswxVCptnKNsOQ7Z2xUhPYfCmYV-WBtLVOjkJqzUkP6TGldp10EX0IFynlcroRywsI4iEu6ArAdPVQmhKDa0yqg0m1e+NNFwZ3BCNswdkPvuIGB2tcqakuPlgR4h2MWzMgAxartwDeEoLtf1dB-rXVBoQyQljqHOFfq+q2v9jHG7mqUKqm55N-UuN4-NT6DGdD5C0Gp-Ypq31eL8HcsdFcG0yA+rB5QtHijOKOYoNWgD8nJNGUU6F2GxK9LlvSTIcLGn5C2ZUNpLj5CxIUFSD6XmuyDOGeiMZXQJlgCmTMkp2LGm1OUFCHQORGkyEVqoZQbTNly2-poaERy6kh0pYl5LrZpLNIy1l2Sm5dAkPRs4wz+NlDOGcEAA */
9292
createMachine(
9393
{
94-
context: {
95-
me: undefined,
96-
getUserError: undefined,
97-
authError: undefined,
98-
updateProfileError: undefined,
99-
methods: undefined,
100-
getMethodsError: undefined,
101-
},
94+
id: "authState",
95+
predictableActionArguments: true,
10296
tsTypes: {} as import("./authXService.typegen").Typegen0,
10397
schema: {
10498
context: {} as AuthContext,
@@ -133,7 +127,14 @@ export const authMachine =
133127
}
134128
},
135129
},
136-
id: "authState",
130+
context: {
131+
me: undefined,
132+
getUserError: undefined,
133+
authError: undefined,
134+
updateProfileError: undefined,
135+
methods: undefined,
136+
getMethodsError: undefined,
137+
},
137138
initial: "gettingUser",
138139
states: {
139140
signedOut: {

site/src/xServices/buildInfo/buildInfoXService.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ export interface BuildInfoContext {
99

1010
export const buildInfoMachine = createMachine(
1111
{
12+
id: "buildInfoState",
13+
predictableActionArguments: true,
1214
tsTypes: {} as import("./buildInfoXService.typegen").Typegen0,
1315
schema: {
1416
context: {} as BuildInfoContext,
@@ -21,7 +23,6 @@ export const buildInfoMachine = createMachine(
2123
context: {
2224
buildInfo: undefined,
2325
},
24-
id: "buildInfoState",
2526
initial: "gettingBuildInfo",
2627
states: {
2728
gettingBuildInfo: {

site/src/xServices/createWorkspace/createWorkspaceXService.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ type CreateWorkspaceEvent = {
2828
export const createWorkspaceMachine = createMachine(
2929
{
3030
id: "createWorkspaceState",
31-
initial: "gettingTemplates",
31+
predictableActionArguments: true,
32+
tsTypes: {} as import("./createWorkspaceXService.typegen").Typegen0,
3233
schema: {
3334
context: {} as CreateWorkspaceContext,
3435
events: {} as CreateWorkspaceEvent,
@@ -44,7 +45,7 @@ export const createWorkspaceMachine = createMachine(
4445
}
4546
},
4647
},
47-
tsTypes: {} as import("./createWorkspaceXService.typegen").Typegen0,
48+
initial: "gettingTemplates",
4849
states: {
4950
gettingTemplates: {
5051
entry: "clearGetTemplatesError",

site/src/xServices/entitlements/entitlementsXService.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ const emptyEntitlements = {
2828
export const entitlementsMachine = createMachine(
2929
{
3030
id: "entitlementsMachine",
31-
initial: "idle",
31+
predictableActionArguments: true,
32+
tsTypes: {} as import("./entitlementsXService.typegen").Typegen0,
3233
schema: {
3334
context: {} as EntitlementsContext,
3435
events: {} as EntitlementsEvent,
@@ -38,10 +39,10 @@ export const entitlementsMachine = createMachine(
3839
},
3940
},
4041
},
41-
tsTypes: {} as import("./entitlementsXService.typegen").Typegen0,
4242
context: {
4343
entitlements: emptyEntitlements,
4444
},
45+
initial: "idle",
4546
states: {
4647
idle: {
4748
on: {

site/src/xServices/roles/siteRolesXService.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ type SiteRolesEvent = {
1919
export const siteRolesMachine = createMachine(
2020
{
2121
id: "siteRolesState",
22-
initial: "idle",
22+
predictableActionArguments: true,
23+
tsTypes: {} as import("./siteRolesXService.typegen").Typegen0,
2324
schema: {
2425
context: {} as SiteRolesContext,
2526
events: {} as SiteRolesEvent,
@@ -29,7 +30,7 @@ export const siteRolesMachine = createMachine(
2930
},
3031
},
3132
},
32-
tsTypes: {} as import("./siteRolesXService.typegen").Typegen0,
33+
initial: "idle",
3334
states: {
3435
idle: {
3536
on: {

site/src/xServices/setup/setupXService.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ export const setupMachine =
2626
/** @xstate-layout N4IgpgJg5mDOIC5QGUwBcCuAHZaCGaYAdAJYQA2YAxAMIBKAogIIAqDA+gGICSdyL7AKrIGdRKCwB7WCTQlJAO3EgAHogDMAViKaAnPoDsABgBMRgCy6jpkwBoQAT0QBGI+qIA2N0ePOAHJqa-qYAviH2qJg4+IREAMYATmAEJApQnCQJsGiCsGAJVBCKxKkAbpIA1sSJyYQZWTl5CcpSMnKKymoI6ibuzmZGuiYG6kYemn4eHvZOCObOzjom-X7qHsZGmuq6mmER6Ni4BNVJKWn12bn5VPkJkglEWOQEAGb3ALbxp3WZl00t0lk8iUSFUGl07g8-XMxlWmmsWnUMxcUyIzg86hhPgWvg8JjC4RACkkEDgykihxiJQoYABbWBnUQflcRAMZlc6jWwwMfmRCDM2ksfgMzl0Bisbj85j8exAFOixy+tVS6V+jXydKBHVBXQAtDsiOyeVp-OoFrpnHyzboiKZ1CMDCNzEY-H4xbL5UdYi81VcEjRvpBNe0QaAuoEbZzpfaRh4rFM+eYTOZbcsTBD0b0bB6DgrCMGGTrELrzYajM5jUFVubLY4NIsvKM2eMtKZNOMCSEgA */
2727
createMachine(
2828
{
29+
id: "SetupState",
30+
predictableActionArguments: true,
2931
tsTypes: {} as import("./setupXService.typegen").Typegen0,
3032
schema: {
3133
context: {} as SetupContext,
@@ -36,7 +38,6 @@ export const setupMachine =
3638
}
3739
},
3840
},
39-
id: "SetupState",
4041
initial: "idle",
4142
states: {
4243
idle: {

site/src/xServices/template/templateXService.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ export const templateMachine =
3333
/** @xstate-layout N4IgpgJg5mDOIC5QAoC2BDAxgCwJYDswBKAOhgBdyCoAVMVABwBt1ywBiCAe0JIIDcuAazAk0WPIVIUq+WvWaswCAV0ytcPANoAGALqJQDLrFxUehkAA9EAJgDsOkgGZbO2wE5bANg8BGABZnHR0AgBoQAE9EPx0-Eg9EpIAOe28-D28ggF9siPEcAmI+fDNcdCYASXwAMy4SLCp+MDpGFjYANTAAJ1MeMjBKagBBTCaWhXawLt7NfE4eUVURMQxCqRKyiuq6hrHcZtbFTp6+-AGhuVHxo6mZs5V8QXVzfF0DJBBjU1fLGwQAgF4t4AKzeWzOTIhEEhZIRaIIZI6EEkEIhZyg2xuEF+XL5NaSYoELZVWr1NhtJQAJTgXAArt1MHALrJ5JS2DTYPTGXAFrxlqICoTSMSqNsySQKccwJzuUzYCzqLdqbSGfLHs8NNp9JZvmULJ9-kDkiRks4QR50SDkh5nH5nPCYjpXKi0SDnObbeaAniQEKiiLSmLSbspXdTnMFTIlZMlPdI3ylk9hIKCQHNsGduTYydZjwo4NWcrc2dYBq1Fq3jrPnrfobEAFQqbQt5kiCcf4go6ECD7Ca0XFMskAmksr7-RtReUQ1xEyRYOQlKsJOmp+K6rqTPr8H9ELaTclkg5wQEzRidB5u-Y0q6QgFbAEsuCMuO0xsmFx0BBIOwACIAUQAGX-Gh-03H45ksBFrycGE7zcW1bD8e0In+Pw3G8EggT8M0-Fbc8PGSV8Vw2TAeBqXBulQahfzAJhBg4ABhAB5AA5AAxSoqQAWQAfQA4DQPA7ddwQZCMVRUF7Bw3svXsEFuz8MFMNtC8bRtHQzWHYj1mKMjako6i5Fo+i2HYRjhlYxigP4oCQLAmstzrUA0OcaSSHsZwbSUjwAl83zwiiGJGw8LCwTtU8vGQnI8j9N9im-UzqDnAUSEShjizAYTnOsRB7BHEglLwoqskCWxFJ8ewPJ0bx8tsC1IQhZwdOFNK6MGZKem6LhuhIY46iotrTImdkssciCDRcvcbVRJrwr8fLXHsRTYRIOCau8WqYRxIjfXwLhv3gT4J2KaM5Ey7LIPrAFyqChBLVvEJPGk2w21PFrVyDacsz2G4c2mCN+jOqBrgOEbpXjSavicq6prEhar1tR7IXSaSfVik7AxJH7GjBzLIfOWA6UweUjqMGGof+TzbEKsEMiRdwYUhbtkhw5HnHvXx0g8D7Jy+9d6lxw5-oJy7Kb3B07vsJDkekjwcSyWxeaJfmZ0lf7ZTVZlgcyzWeTJ6GJp3a7kOWu7YjcR6wQCEFAQfbxlaxzMJTDFUuS1hUiZJuADdrWHcoQVtMJxdtWfvaL0hWm2rfcRXHxBR2M2+l2NdVfWxeNuHbW7Xz+xCWJkm8ZE3LbRO1zV12S0jRVzpFwH8F9inM4D03u2Ux6sWvQj2wTjH4qd5PQzrvMG-nYnSYz0TQRNG3gnUyE+zNNv-EevDrUya9mr7kiVexlPRoJxujdE7O7r8gIO+dXtUkyMvVazSfrt8bt7xpgcFttC1nXsROPy-SBH5w1iO6MKwRghAkbH2BSUtHBrTRPeC8rhxKJ30hRKiNF2psEAS3ZCNMkR4R8MOWqfloEIntCvDmnoRzyUIvLRO6VWTYP+F4TCNt0g22REhV6pCYgEJIPVDENsPBpA9GkehmCAHjREtdVmmFPCKy2u6RwcJzaQicMOb0wQ3ALVxNvXSRAmExBUWQvOA5baqXlrbXIuQgA */
3434
createMachine(
3535
{
36+
id: "templateMachine",
37+
predictableActionArguments: true,
3638
tsTypes: {} as import("./templateXService.typegen").Typegen0,
3739
schema: {
3840
context: {} as TemplateContext,
@@ -58,7 +60,6 @@ export const templateMachine =
5860
}
5961
},
6062
},
61-
id: "(machine)",
6263
initial: "gettingTemplate",
6364
states: {
6465
gettingTemplate: {

site/src/xServices/templateSettings/templateSettingsXService.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ export const templateSettingsMachine =
77
/** @xstate-layout N4IgpgJg5mDOIC5QBcwFsAOAbAhqgymMsgJYB2UsAdFgPY4TlQDEEtZYV5AbrQNadUmXASKkK1OgyYIetAMZ4S7ANoAGALqJQGWrBKl22kAA9EANgCMVAKwB2AByWATJbWWAnABYv55w-MAGhAAT0RnAGZnKgibGw9nD3M1JJsHNQiAX0zgoWw8MEJiJmpIAyZmfABBADUAUWNdfUMyYzMESx9bSK8IhwdncwcbF2dgsIRejypzX2dXf09zCLUbbNz0fNFiiSpYHG4Ktg4uMl4BKjyRQrESvYOZOUUW9S0kECbyo3f25KoHOxeDwODx9EYeNTzcYWGxqKgeGw+SJ2cx+VZebI5EBkWgQODGK4FIriSg0eiMCiNPRfVo-RBeMahRAQqhqNnuWERFFeOyedYgQnbEmlRgkqnNZS00DtSwRcz-EY2PzeeYOLk2aEIWJ2WwOIEBNIeBG8-mCm47Un7Q6U96fFptenWRJDIZy+y9AFBJkIEbRbxeWUBRwIyx2U2ba7Eu5WyDimkOhAI2yxSx+foMpWWTV2RLJgIrPoA4bh4RE24SOP2ukdHXOgJq8zuvoozWWBys9nzSydNt2NQYzFAA */
88
createMachine(
99
{
10-
initial: "loading",
10+
id: "templateSettings",
11+
predictableActionArguments: true,
12+
tsTypes: {} as import("./templateSettingsXService.typegen").Typegen0,
1113
schema: {} as {
1214
context: {
1315
organizationId: string
@@ -26,7 +28,7 @@ export const templateSettingsMachine =
2628
}
2729
events: { type: "SAVE"; templateSettings: UpdateTemplateMeta }
2830
},
29-
tsTypes: {} as import("./templateSettingsXService.typegen").Typegen0,
31+
initial: "loading",
3032
states: {
3133
loading: {
3234
invoke: {
@@ -71,7 +73,6 @@ export const templateSettingsMachine =
7173
type: "final",
7274
},
7375
},
74-
id: "templateSettings",
7576
},
7677
{
7778
services: {

site/src/xServices/templates/templatesXService.ts

Lines changed: 76 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -10,97 +10,88 @@ interface TemplatesContext {
1010
getTemplatesError?: Error | unknown
1111
}
1212

13-
export const templatesMachine =
14-
/** @xstate-layout N4IgpgJg5mDOIC5QBcwFsAOAbAhq2AysnmAHQzLICWAdlAPIBOUONVAXnlQPY2wDEEXmVoA3bgGsyFJizadqveEhAZusKopqJQAD0QAWAMwHSATgDsANgCsAJgt2rRuwAYAHBYsAaEAE9EAEZAu1IDMwiIm3dXG0DjdwBfRN9UTFx8IhJyMEpaBmZWDi4lfjBGRm5GUmw8ADMqtBzkWSKFHj4dVXVNDq79BGNTS1sHJxcPL18AhBMjUhtXJaWrOzM7O3cDG2TU9FrM4lRm6joAFX2MuEFhUjFJaVyL9JJlUDUNLX6gpeH1wJcIQs7giVmmiBB5kilgM7iMHmcOxSIDSBzgWWOFFOUGeaIE5Uq1QODUYTQouKub26nz6KgGgV+ULsAOZDhBZjB-kQbhspGWSxC0W2VncSORNG4EDgXVRlIxjzydFa8hKnRUH16vG+gzs4IQwTMYWhjgsRjm9l2KMur3lJ3yFNeXQ1XzpiCsVlcpFW4QMFnisJZeo5UMicQsNjMgRsSL2L0O2SENDATp6Lr0QTcFjCa2cfqsgRNeuC7j5-Ncq3WmwMgUtsptRzIBKqKZpWtd+sz2Y5RjzBYceo2WbNw9hrijZtr1vjqBbmu07cC7iLSWSiSAA */
15-
createMachine(
16-
{
17-
tsTypes: {} as import("./templatesXService.typegen").Typegen0,
18-
schema: {
19-
context: {} as TemplatesContext,
20-
services: {} as {
21-
getOrganizations: {
22-
data: TypesGen.Organization[]
23-
}
24-
getTemplates: {
25-
data: TypesGen.Template[]
26-
}
27-
},
13+
export const templatesMachine = createMachine(
14+
{
15+
id: "templatesState",
16+
predictableActionArguments: true,
17+
tsTypes: {} as import("./templatesXService.typegen").Typegen0,
18+
schema: {
19+
context: {} as TemplatesContext,
20+
services: {} as {
21+
getOrganizations: {
22+
data: TypesGen.Organization[]
23+
}
24+
getTemplates: {
25+
data: TypesGen.Template[]
26+
}
2827
},
29-
id: "templatesState",
30-
initial: "gettingOrganizations",
31-
states: {
32-
gettingOrganizations: {
33-
entry: "clearGetOrganizationsError",
34-
invoke: {
35-
src: "getOrganizations",
36-
id: "getOrganizations",
37-
onDone: [
38-
{
39-
actions: ["assignOrganizations"],
40-
target: "gettingTemplates",
41-
},
42-
],
43-
onError: [
44-
{
45-
actions: "assignGetOrganizationsError",
46-
target: "error",
47-
},
48-
],
28+
},
29+
initial: "gettingOrganizations",
30+
states: {
31+
gettingOrganizations: {
32+
entry: "clearGetOrganizationsError",
33+
invoke: {
34+
src: "getOrganizations",
35+
id: "getOrganizations",
36+
onDone: {
37+
actions: ["assignOrganizations"],
38+
target: "gettingTemplates",
39+
},
40+
onError: {
41+
actions: "assignGetOrganizationsError",
42+
target: "error",
4943
},
50-
tags: "loading",
5144
},
52-
gettingTemplates: {
53-
entry: "clearGetTemplatesError",
54-
invoke: {
55-
src: "getTemplates",
56-
id: "getTemplates",
57-
onDone: [
58-
{
59-
actions: ["assignTemplates"],
60-
target: "done",
61-
},
62-
],
63-
onError: [
64-
{
65-
actions: "assignGetTemplatesError",
66-
target: "error",
67-
},
68-
],
45+
tags: "loading",
46+
},
47+
gettingTemplates: {
48+
entry: "clearGetTemplatesError",
49+
invoke: {
50+
src: "getTemplates",
51+
id: "getTemplates",
52+
onDone: {
53+
actions: "assignTemplates",
54+
target: "done",
55+
},
56+
onError: {
57+
actions: "assignGetTemplatesError",
58+
target: "error",
6959
},
70-
tags: "loading",
7160
},
72-
done: {},
73-
error: {},
61+
tags: "loading",
7462
},
63+
done: {},
64+
error: {},
7565
},
76-
{
77-
actions: {
78-
assignOrganizations: assign({
79-
organizations: (_, event) => event.data,
80-
}),
81-
assignGetOrganizationsError: assign({
82-
getOrganizationsError: (_, event) => event.data,
83-
}),
84-
clearGetOrganizationsError: assign((context) => ({
85-
...context,
86-
getOrganizationsError: undefined,
87-
})),
88-
assignTemplates: assign({
89-
templates: (_, event) => event.data,
90-
}),
91-
assignGetTemplatesError: assign({
92-
getTemplatesError: (_, event) => event.data,
93-
}),
94-
clearGetTemplatesError: (context) => assign({ ...context, getTemplatesError: undefined }),
95-
},
96-
services: {
97-
getOrganizations: API.getOrganizations,
98-
getTemplates: async (context) => {
99-
if (!context.organizations || context.organizations.length === 0) {
100-
throw new Error("no organizations")
101-
}
102-
return API.getTemplates(context.organizations[0].id)
103-
},
66+
},
67+
{
68+
actions: {
69+
assignOrganizations: assign({
70+
organizations: (_, event) => event.data,
71+
}),
72+
assignGetOrganizationsError: assign({
73+
getOrganizationsError: (_, event) => event.data,
74+
}),
75+
clearGetOrganizationsError: assign((context) => ({
76+
...context,
77+
getOrganizationsError: undefined,
78+
})),
79+
assignTemplates: assign({
80+
templates: (_, event) => event.data,
81+
}),
82+
assignGetTemplatesError: assign({
83+
getTemplatesError: (_, event) => event.data,
84+
}),
85+
clearGetTemplatesError: (context) => assign({ ...context, getTemplatesError: undefined }),
86+
},
87+
services: {
88+
getOrganizations: API.getOrganizations,
89+
getTemplates: async (context) => {
90+
if (!context.organizations || context.organizations.length === 0) {
91+
throw new Error("no organizations")
92+
}
93+
return API.getTemplates(context.organizations[0].id)
10494
},
10595
},
106-
)
96+
},
97+
)

site/src/xServices/terminal/terminalXService.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ export const terminalMachine =
3737
/** @xstate-layout N4IgpgJg5mDOIC5QBcwCcC2BLAdgQwBsBlZPVAOhmWVygHk0o8csAvMrAex1gGIJuYcrgBunANZCqDJi3Y1u8JCAAOnWFgU5EoAB6IA7AE4AzOSMBGAEwBWCyYAsANgs2bVgDQgAnohNGbcgsnEIcHCwAOBwAGCKMHAF8Er1RMXEISMikwaloZZjYORV50NE40chUCMgAzcoxKHPy5Ip4dVXVNLm1lfQQIiLMIpxMbQYjYo2jXL18EawtyAwGwk1HTMdGklPRsfGJSCioaHCgAdXLxWBU8AGMwfkFhHDFJRuQLtCub+-a1DS07T69icVnILisDhspiccQ2sz8y3INmiqNGsMcBmiNm2IFSewyh2yuVOn2+dwepXKlWqyDqmHeZOuFL+nUBvUQILBEKhMLhowRCAMTkCIzWDkcEyMBhsBlx+PSByy7xO50uzPuAEEYDhkI8cEJRBJiUyfmBtWBdayAd0gZyjCFyFZbKjnC4jKYLIK7GYYqirCYBk5olYDIlknjdorMkccqrTRSLbqSmgyhUqrV6oz1Wak8hrV1uHb5g6nE6XdE3RYPSYvT5EWCA2s7E4sbZhfKo-sY0JbtwDbdVfrDS9jeQ+zgB-nlP9Cz09IhIcLyCZIUYotEDCZNxEDN7peY1ms4gYrNNBp20t2ieP+2BB7QU2maZmGROpwX2QuEEuy6uHOuMRbjue71ggdiLPY4phiYMoWNYl4EkqFDvveqAQLwZwAEoAJIACoAKKfraHI-gYkTkCGAFYmG0TbnWcw2A4YKmGskJno44RWIh0Y3qhg6QLwWEEZqAAixFFqRobViusKngYMpWEGgpQmWUFsSEcSOHRPHXsq-Hobwok4UQADCdAAHIWQRpl4RJ84gH0SmtuQDgTNWMJTDKJgqUEq4RNCljTOs3ERgqekUBAWCwAZgnmVZNl2TObIkd+zplrEYanvY0SwrCESCs6BiuaidGrgGTgekYSQRjgnAQHA7ThYSyrHHkjAFPI3RKKAs5fo5iAxIEXHMSMErWNiTiFa4K6ldi1ayu4FjhjsV4tbGJJql8GpgPZxYWNMDiubBdh2Ju7pGIK-jFW6rYiq4bZOLp63EvGOaJjq069Slknfq4jrOii51udiMpXbC5ATKi1ghNEljNs9yG9neD6nHtUlnhErmgqeIyosKazejNZ7+qMi3BiYiM9rek5oZA6NpeR0ROmGpgnhT0qCmNSxHhKW4BiGERUzeUUxSj6EMwN4HM5ukLLXBViRKGNhXVj64etM0JOG5YTC1kktORlp7hA4CtK2DYEALQQ8M5FKQd27OJTNVAA */
3838
createMachine(
3939
{
40+
id: "terminalState",
41+
predictableActionArguments: true,
4042
tsTypes: {} as import("./terminalXService.typegen").Typegen0,
4143
schema: {
4244
context: {} as TerminalContext,
@@ -53,7 +55,6 @@ export const terminalMachine =
5355
}
5456
},
5557
},
56-
id: "terminalState",
5758
initial: "gettingWorkspace",
5859
states: {
5960
gettingWorkspace: {

site/src/xServices/users/usersXService.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ export type UsersEvent =
7979

8080
export const usersMachine = createMachine(
8181
{
82+
id: "usersState",
83+
predictableActionArguments: true,
8284
tsTypes: {} as import("./usersXService.typegen").Typegen0,
8385
schema: {
8486
context: {} as UsersContext,
@@ -107,7 +109,6 @@ export const usersMachine = createMachine(
107109
}
108110
},
109111
},
110-
id: "usersState",
111112
initial: "idle",
112113
states: {
113114
idle: {

0 commit comments

Comments
 (0)