From 55c9b5566c687ae586cd41906d298a245efa19eb Mon Sep 17 00:00:00 2001 From: "kasia.oczkowska" Date: Wed, 20 Mar 2024 12:48:09 +0000 Subject: [PATCH] feat: rename hooks --- packages/web/src/components/UserList/index.jsx | 4 ++-- packages/web/src/hooks/{useUser.js => useAdminUser.js} | 4 ++-- packages/web/src/hooks/{useUsers.js => useAdminUsers.js} | 5 ++--- packages/web/src/pages/EditUser/index.jsx | 4 ++-- 4 files changed, 8 insertions(+), 9 deletions(-) rename packages/web/src/hooks/{useUser.js => useAdminUser.js} (77%) rename packages/web/src/hooks/{useUsers.js => useAdminUsers.js} (78%) diff --git a/packages/web/src/components/UserList/index.jsx b/packages/web/src/components/UserList/index.jsx index de9eb04a..7c383fae 100644 --- a/packages/web/src/components/UserList/index.jsx +++ b/packages/web/src/components/UserList/index.jsx @@ -14,7 +14,7 @@ import EditIcon from '@mui/icons-material/Edit'; import TableFooter from '@mui/material/TableFooter'; import DeleteUserButton from 'components/DeleteUserButton/index.ee'; import ListLoader from 'components/ListLoader'; -import useUsers from 'hooks/useUsers'; +import useAdminUsers from 'hooks/useAdminUsers'; import useFormatMessage from 'hooks/useFormatMessage'; import * as URLS from 'config/urls'; import TablePaginationActions from './TablePaginationActions'; @@ -23,7 +23,7 @@ import { TablePagination } from './style'; export default function UserList() { const formatMessage = useFormatMessage(); const [page, setPage] = React.useState(0); - const { data: usersData, isLoading } = useUsers(page + 1); + const { data: usersData, isLoading } = useAdminUsers(page + 1); const users = usersData?.data; const { count } = usersData?.meta || {}; diff --git a/packages/web/src/hooks/useUser.js b/packages/web/src/hooks/useAdminUser.js similarity index 77% rename from packages/web/src/hooks/useUser.js rename to packages/web/src/hooks/useAdminUser.js index ec31c0e7..0f8e3ee9 100644 --- a/packages/web/src/hooks/useUser.js +++ b/packages/web/src/hooks/useAdminUser.js @@ -1,9 +1,9 @@ import { useQuery } from '@tanstack/react-query'; import api from 'helpers/api'; -export default function useUser({ userId }) { +export default function useAdminUser({ userId }) { const query = useQuery({ - queryKey: ['user', userId], + queryKey: ['admin', 'user', userId], queryFn: async ({ signal }) => { const { data } = await api.get(`/v1/admin/users/${userId}`, { signal, diff --git a/packages/web/src/hooks/useUsers.js b/packages/web/src/hooks/useAdminUsers.js similarity index 78% rename from packages/web/src/hooks/useUsers.js rename to packages/web/src/hooks/useAdminUsers.js index 443d08c9..2b1ecb17 100644 --- a/packages/web/src/hooks/useUsers.js +++ b/packages/web/src/hooks/useAdminUsers.js @@ -1,10 +1,9 @@ import { useQuery } from '@tanstack/react-query'; import api from 'helpers/api'; -export default function useUsers(page) { - +export default function useAdminUsers(page) { const query = useQuery({ - queryKey: ['users', page], + queryKey: ['admin', 'users', page], queryFn: async ({ signal }) => { const { data } = await api.get(`/v1/admin/users`, { signal, diff --git a/packages/web/src/pages/EditUser/index.jsx b/packages/web/src/pages/EditUser/index.jsx index 255327cb..60470b4b 100644 --- a/packages/web/src/pages/EditUser/index.jsx +++ b/packages/web/src/pages/EditUser/index.jsx @@ -18,7 +18,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,7 +28,7 @@ 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;