Skip to content

refactor: Remove users redirect to active filter #4056

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 15, 2022
Merged

refactor: Remove users redirect to active filter #4056

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2d07d3e
refactor: Remove users redirect to active filter
BrunoQuaresma Sep 14, 2022
3b2bd77
Remove unecessary types
BrunoQuaresma Sep 14, 2022
c1334f2
Use filter value from context
BrunoQuaresma Sep 14, 2022
f8aaabd
Fix tests
BrunoQuaresma Sep 14, 2022
6628475
Update wording
BrunoQuaresma Sep 14, 2022
032a44f
Fix tests
BrunoQuaresma Sep 14, 2022
578b6df
Merge branch 'main' into bq/fix-users-page
kylecarbs Sep 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update wording
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Sep 14, 2022
commit 66284759c3e9511c27001dba16ba119548a17fef
10 changes: 5 additions & 5 deletions site/src/pages/UsersPage/CreateUserPage/CreateUserPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ export const Language = {
export const CreateUserPage: React.FC = () => {
const myOrgId = useOrganizationId()
const navigate = useNavigate()
const [usersState, usersSend] = useMachine(createUserMachine, {
const [createUserState, createUserSend] = useMachine(createUserMachine, {
actions: {
redirectToUsersPage: () => {
navigate("/users")
},
},
})
const { createUserErrorMessage, createUserFormErrors } = usersState.context
const { createUserErrorMessage, createUserFormErrors } = createUserState.context
// There is no field for organization id in Community Edition, so handle its field error like a generic error
const genericError =
createUserErrorMessage ||
Expand All @@ -37,12 +37,12 @@ export const CreateUserPage: React.FC = () => {
</Helmet>
<CreateUserForm
formErrors={createUserFormErrors}
onSubmit={(user: TypesGen.CreateUserRequest) => usersSend({ type: "CREATE", user })}
onSubmit={(user: TypesGen.CreateUserRequest) => createUserSend({ type: "CREATE", user })}
onCancel={() => {
usersSend("CANCEL_CREATE_USER")
createUserSend("CANCEL_CREATE_USER")
navigate("/users")
}}
isLoading={usersState.hasTag("loading")}
isLoading={createUserState.hasTag("loading")}
error={genericError}
myOrgId={myOrgId}
/>
Expand Down