groot/automatisch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1734 from automatisch/AUT-845

Browse Source 
refactor: rewrite useUsers with RQ
This commit is contained in:
Ali BARIN
2024-03-20 16:08:07 +01:00
committed by GitHub
parent 7189b629c0 d8d7d86359
commit 359a90245d
12 changed files with 49 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/web/src/pages/CreateUser/index.jsx
View File

@@ -6,6 +6,7 @@ import MuiTextField from '@mui/material/TextField';
import useEnqueueSnackbar from 'hooks/useEnqueueSnackbar';
import * as React from 'react';
import { useNavigate } from 'react-router-dom';
import { useQueryClient } from '@tanstack/react-query';
import Can from 'components/Can';
import Container from 'components/Container';
@@ -29,6 +30,7 @@ export default function CreateUser() {
const { data, loading: isRolesLoading } = useRoles();
const roles = data?.data;
const enqueueSnackbar = useEnqueueSnackbar();
const queryClient = useQueryClient();
const handleUserCreation = async (userData) => {
try {
@@ -44,7 +46,7 @@ export default function CreateUser() {
},
},
});
queryClient.invalidateQueries({ queryKey: ['admin', 'users'] });
enqueueSnackbar(formatMessage('createUser.successfullyCreated'), {
variant: 'success',
persist: true,

8
packages/web/src/pages/EditUser/index.jsx
View File

@@ -7,6 +7,7 @@ import MuiTextField from '@mui/material/TextField';
import useEnqueueSnackbar from 'hooks/useEnqueueSnackbar';
import * as React from 'react';
import { useNavigate, useParams } from 'react-router-dom';
import { useQueryClient } from '@tanstack/react-query';
import Can from 'components/Can';
import Container from 'components/Container';
@@ -18,7 +19,7 @@ import * as URLS from 'config/urls';
import { UPDATE_USER } from 'graphql/mutations/update-user.ee';
import useFormatMessage from 'hooks/useFormatMessage';
import useRoles from 'hooks/useRoles.ee';
import useUser from 'hooks/useUser';
import useAdminUser from 'hooks/useAdminUser';
function generateRoleOptions(roles) {
return roles?.map(({ name: label, id: value }) => ({ label, value }));
@@ -28,12 +29,13 @@ export default function EditUser() {
const formatMessage = useFormatMessage();
const [updateUser, { loading }] = useMutation(UPDATE_USER);
const { userId } = useParams();
const { data: userData, isLoading: isUserLoading } = useUser({ userId });
const { data: userData, isLoading: isUserLoading } = useAdminUser({ userId });
const user = userData?.data;
const { data, isLoading: isRolesLoading } = useRoles();
const roles = data?.data;
const enqueueSnackbar = useEnqueueSnackbar();
const navigate = useNavigate();
const queryClient = useQueryClient();
const handleUserUpdate = async (userDataToUpdate) => {
try {
@@ -49,6 +51,8 @@ export default function EditUser() {
},
},
});
queryClient.invalidateQueries({ queryKey: ['admin', 'users'] });
queryClient.invalidateQueries({ queryKey: ['admin', 'user', userId] });
enqueueSnackbar(formatMessage('editUser.successfullyUpdated'), {
variant: 'success',