From f2e5ef8afc94fb28fee481ef87714a4b8b681adc Mon Sep 17 00:00:00 2001
From: Alisher Musurmonov <alisher_musurmonov1@epam.com>
Date: Thu, 21 Sep 2023 18:50:20 +0500
Subject: [PATCH] display missing affiliations

---
 .../AffiliationsManagerModal.js               | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/components/AffiliationsManager/AffiliationsManagerModal/AffiliationsManagerModal.js b/src/components/AffiliationsManager/AffiliationsManagerModal/AffiliationsManagerModal.js
index c402d4473..247845725 100644
--- a/src/components/AffiliationsManager/AffiliationsManagerModal/AffiliationsManagerModal.js
+++ b/src/components/AffiliationsManager/AffiliationsManagerModal/AffiliationsManagerModal.js
@@ -60,7 +60,7 @@ const AffiliationManagerModal = ({ onClose, onSubmit, userId }) => {
     isLoading: isConsortiumTenantsLoading,
   } = useConsortiumTenants();
 
-  const visibleAffiliations = useMemo(() => affiliations.filter(({ isPrimary }) => !isPrimary), [affiliations]);
+  const primaryAffiliation = useMemo(() => affiliations.find(({ isPrimary }) => isPrimary), [affiliations]);
 
   const {
     assignment,
@@ -69,15 +69,15 @@ const AffiliationManagerModal = ({ onClose, onSubmit, userId }) => {
     toggleAll,
     totalAssigned,
   } = useAffiliationsAssignment({
-    affiliations: visibleAffiliations,
+    affiliations,
     tenants,
   });
 
   const isLoading = isConsortiumTenantsLoading || isUsersAffiliationsLoading;
 
   const affiliationIds = useMemo(() => {
-    return visibleAffiliations.map(({ tenantId }) => tenantId);
-  }, [visibleAffiliations]);
+    return affiliations.map(({ tenantId }) => tenantId);
+  }, [affiliations]);
 
   const handleOnSubmit = useCallback(async () => {
     const getAffiliationIds = (assigned) => (
@@ -120,7 +120,7 @@ const AffiliationManagerModal = ({ onClose, onSubmit, userId }) => {
         filtersConfig
           .reduce((filtered, config) => config.filter(filtered, activeFilters, assignment), tenants)
           .filter(({ name, isCentral, id }) => {
-            if (isCentral || !affiliationIds.includes(id)) return false;
+            if (isCentral || primaryAffiliation.tenantId === id) return false;
 
             return (searchQuery ? name.toLowerCase().includes(searchQuery.toLowerCase()) : true);
           }),
@@ -128,7 +128,15 @@ const AffiliationManagerModal = ({ onClose, onSubmit, userId }) => {
         sortDirection.name,
       )
     );
-  }, [affiliationIds, assignment, filters, sortDirection.name, sortOrder, sorters, tenants]);
+  }, [
+    assignment,
+    filters,
+    primaryAffiliation.tenantId,
+    sortDirection.name,
+    sortOrder,
+    sorters,
+    tenants,
+  ]);
 
   return (
     <Modal