Merge pull request #306 from virtualidentityag/OB-5616

fix: loading 10k users on every edit and new click
virtualidentityag · Aug 16, 2023 · e376a2d · e376a2d
2 parents d339828 + cefd7d2
commit e376a2d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/src/api/counselor/editCounselorData.ts b/src/api/counselor/editCounselorData.ts
@@ -7,7 +7,7 @@ import { putAgenciesForCounselor } from '../agency/putAgenciesForCounselor';
 
 /**
  * edit counselor
- * @param counselorData - newly fetched consultant data from backend
+ * @param id - id of counselor to save
  * @param formData - input data from form
  * @return data
  */
@@ -20,9 +20,9 @@ export const editCounselorData = async (id: string, formData: CounselorData): Pr
         lastname,
         formalLanguage,
         email,
-        absent,
+        absent: !!absent,
         username: encodeUsername(username),
-        absenceMessage: absent ? absenceMessage : null,
+        ...(absent ? { absenceMessage } : {}),
         twoFactorAuth,
     };
 

diff --git a/src/hooks/useConsultantOrAdminsData.ts → src/hooks/useConsultantsOrAdminsData.ts b/src/hooks/useConsultantOrAdminsData.ts → src/hooks/useConsultantsOrAdminsData.ts
@@ -18,7 +18,7 @@ interface ConsultantsDataProps extends UseQueryOptions<ResponseList<CounselorDat
 const DEFAULT_SORT = 'FIRSTNAME';
 const DEFAULT_ORDER = 'ASC';
 
-export const useConsultantOrAgencyAdminsData = (
+export const useConsultantsOrAdminsData = (
     { search, current, sortBy, order, pageSize, typeOfUser, ...options }: ConsultantsDataProps = {
         typeOfUser: TypeOfUser.Consultants,
     },

diff --git a/src/pages/users/Edit/index.tsx b/src/pages/users/Edit/index.tsx
@@ -15,7 +15,7 @@ import { Resource } from '../../../enums/Resource';
 import { TypeOfUser } from '../../../enums/TypeOfUser';
 import { useAddOrUpdateConsultantOrAdmin } from '../../../hooks/useAddOrUpdateConsultantOrAgencyAdmin';
 import { useAgenciesData } from '../../../hooks/useAgencysData';
-import { useConsultantOrAgencyAdminsData } from '../../../hooks/useConsultantOrAdminsData';
+import { useConsultantsOrAdminsData } from '../../../hooks/useConsultantsOrAdminsData';
 import { useUserPermissions } from '../../../hooks/useUserPermission';
 import { convertToOptions } from '../../../utils/convertToOptions';
 import { decodeUsername } from '../../../utils/encryptionHelpers';
@@ -27,10 +27,10 @@ export const UserEditOrAdd = () => {
     const { can } = useUserPermissions();
     const { t } = useTranslation();
     const { typeOfUsers, id } = useParams<{ id: string; typeOfUsers: TypeOfUser }>();
-    // Todo: Temporary solution(VIC-2135)
-    const { data: consultantsResponse, isLoading: isLoadingConsultants } = useConsultantOrAgencyAdminsData({
-        pageSize: 10000,
+    const { data: consultantsResponse, isLoading: isLoadingConsultants } = useConsultantsOrAdminsData({
+        search: id,
         typeOfUser: typeOfUsers,
+        enabled: !!id,
     });
     const { data: agenciesData, isLoading } = useAgenciesData({ pageSize: 10000 });
     const isEditing = id !== 'add';

diff --git a/src/pages/users/List/components/UsersTableData/index.tsx b/src/pages/users/List/components/UsersTableData/index.tsx
@@ -10,7 +10,7 @@ import CustomChevronUpIcon from '../../../../../components/CustomIcons/ChevronUp
 import EditButtons from '../../../../../components/EditableTable/EditButtons';
 import StatusIcons from '../../../../../components/EditableTable/StatusIcons';
 import SearchInput from '../../../../../components/SearchInput/SearchInput';
-import { useConsultantOrAgencyAdminsData } from '../../../../../hooks/useConsultantOrAdminsData';
+import { useConsultantsOrAdminsData } from '../../../../../hooks/useConsultantsOrAdminsData';
 import { AgencyData } from '../../../../../types/agency';
 import { CounselorData } from '../../../../../types/counselor';
 import { Status } from '../../../../../types/status';
@@ -45,7 +45,7 @@ export const UsersTableData = () => {
         data: responseList,
         isLoading,
         refetch,
-    } = useConsultantOrAgencyAdminsData({
+    } = useConsultantsOrAdminsData({
         search,
         ...tableState,
         typeOfUser: typeOfUsers,

diff --git a/src/pages/users/List/index.tsx b/src/pages/users/List/index.tsx
@@ -4,7 +4,7 @@ import { Page } from '../../../components/Page';
 import { PermissionAction } from '../../../enums/PermissionAction';
 import { Resource } from '../../../enums/Resource';
 import { TypeOfUser } from '../../../enums/TypeOfUser';
-import { useConsultantOrAgencyAdminsData } from '../../../hooks/useConsultantOrAdminsData';
+import { useConsultantsOrAdminsData } from '../../../hooks/useConsultantsOrAdminsData';
 import { useTenantData } from '../../../hooks/useTenantData.hook';
 import { useTenantAdminsData } from '../../../hooks/useTenantUserAdminsData';
 import { useUserPermissions } from '../../../hooks/useUserPermission';
@@ -22,7 +22,7 @@ export const UsersList = () => {
     const isTenantAdmins = typeOfUsers === TypeOfUser.TenantAdmins;
 
     const { data } = useTenantAdminsData({ current: 1, enabled: isTenantAdmins });
-    const { data: responseList } = useConsultantOrAgencyAdminsData({
+    const { data: responseList } = useConsultantsOrAdminsData({
         typeOfUser: typeOfUsers,
         enabled:
             typeOfUsers === TypeOfUser.Consultants