Merge branch 'main' into task/WP-320--no-download-tab

TACC · Nov 16, 2023 · 8c435b1 · 8c435b1
2 parents 2ae082c + 1af7c8f
commit 8c435b1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/...nents/Allocations/AllocationsModals/AllocationsTeamViewModal/AllocationsTeamViewModal.jsx b/...nents/Allocations/AllocationsModals/AllocationsTeamViewModal/AllocationsTeamViewModal.jsx
@@ -83,6 +83,15 @@ const AllocationsTeamViewModal = ({ isOpen, toggle }) => {
   const handleTabChange = (e, newValue) => {
     setSelectedTab(newValue);
   };
+
+  let selectedUser = null;
+  if (removingUserOperation && removingUserOperation.username) {
+    selectedUser = removingUserOperation.username;
+  }
+  if (card && card.username === selectedUser) {
+    setCard(null);
+  }
+
   return (
     <Modal isOpen={isOpen} toggle={toggle} size="lg" onClosed={resetCard}>
       <ModalHeader className="has-MuiTabs" toggle={toggle} charCode="&#xe912;">

diff --git a/server/portal/apps/projects/views.py b/server/portal/apps/projects/views.py
@@ -86,7 +86,7 @@ def get(self, request):
             search = search.extra(from_=int(offset), size=int(limit))
 
             res = search.execute()
-            hits = list(map(lambda hit: hit.id, res))
+            hits = [hit.id for hit in res if hasattr(hit, 'id') and hit.id is not None]
             listing = []
             # Filter search results to projects specific to user
             if hits: