NotificationsYou must be signed in to change notification settings
Fork928
Star10.1k

Commitb4645b2

authored

Clear error on cancel (#2107)

1 parentcc30d42 commitb4645b2Copy full SHA for b4645b2

File tree

2 files changed

+10

-3

lines changed

site/src
- pages/UsersPage/CreateUserPage
  - CreateUserPage.tsx
- xServices/users
  - usersXService.ts

2 files changed

+10

-3

lines changed

`‎site/src/pages/UsersPage/CreateUserPage/CreateUserPage.tsx`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,10 @@ export const CreateUserPage: React.FC = () => {`
`31`	`31`	`<CreateUserForm`
`32`	`32`	`formErrors={createUserFormErrors}`
`33`	`33`	`onSubmit={(user:TypesGen.CreateUserRequest)=>usersSend({type:"CREATE", user})}`
`34`		`-onCancel={()=>navigate("/users")}`
	`34`	`+onCancel={()=>{`
	`35`	`+usersSend("CANCEL_CREATE_USER")`
	`36`	`+navigate("/users")`
	`37`	`+}}`
`35`	`38`	`isLoading={usersState.hasTag("loading")}`
`36`	`39`	`error={genericError}`
`37`	`40`	`myOrgId={myOrgId??""}`

`‎site/src/xServices/users/usersXService.ts`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ export interface UsersContext {`
`44`	`44`	`exporttypeUsersEvent=`
`45`	`45`	`\|{type:"GET_USERS"}`
`46`	`46`	`\|{type:"CREATE";user:TypesGen.CreateUserRequest}`
	`47`	`+\|{type:"CANCEL_CREATE_USER"}`
`47`	`48`	`// Suspend events`
`48`	`49`	`\|{type:"SUSPEND_USER";userId:TypesGen.User["id"]}`
`49`	`50`	`\|{type:"CONFIRM_USER_SUSPENSION"}`
`@@ -86,6 +87,7 @@ export const usersMachine = createMachine(`
`86`	`87`	`on:{`
`87`	`88`	`GET_USERS:"gettingUsers",`
`88`	`89`	`CREATE:"creatingUser",`
	`90`	`+CANCEL_CREATE_USER:{actions:["clearCreateUserError"]},`
`89`	`91`	`SUSPEND_USER:{`
`90`	`92`	`target:"confirmUserSuspension",`
`91`	`93`	`actions:["assignUserIdToSuspend"],`
`@@ -120,12 +122,13 @@ export const usersMachine = createMachine(`
`120`	`122`	`tags:"loading",`
`121`	`123`	`},`
`122`	`124`	`creatingUser:{`
	`125`	`+entry:"clearCreateUserError",`
`123`	`126`	`invoke:{`
`124`	`127`	`src:"createUser",`
`125`	`128`	`id:"createUser",`
`126`	`129`	`onDone:{`
`127`	`130`	`target:"idle",`
`128`		`-actions:["displayCreateUserSuccess","redirectToUsersPage","clearCreateUserError"],`
	`131`	`+actions:["displayCreateUserSuccess","redirectToUsersPage"],`
`129`	`132`	`},`
`130`	`133`	`onError:[`
`131`	`134`	`{`
`@@ -283,7 +286,8 @@ export const usersMachine = createMachine(`
`283`	`286`	`}),`
`284`	`287`	`clearCreateUserError:assign((context:UsersContext)=>({`
`285`	`288`	`...context,`
`286`		`-createUserError:undefined,`
	`289`	`+createUserErrorMessage:undefined,`
	`290`	`+createUserFormErrors:undefined,`
`287`	`291`	`})),`
`288`	`292`	`clearSuspendUserError:assign({`
`289`	`293`	`suspendUserError:(_)=>undefined,`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitb4645b2

File tree

2 files changed

2 files changed

`‎site/src/pages/UsersPage/CreateUserPage/CreateUserPage.tsx`

`‎site/src/xServices/users/usersXService.ts`

0 commit comments