DES-2629: Use portal names to build list. (#1258)

DesignSafe-CI · May 23, 2024 · 31b14de · 31b14de
1 parent 89f8246
commit 31b14de
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/client/modules/_hooks/src/systems/types.ts b/client/modules/_hooks/src/systems/types.ts
@@ -61,6 +61,7 @@ export type TTapisSystem = {
     label?: string;
     keyservice?: boolean;
     isMyData?: boolean;
+    portalNames: string[];
   };
   importRefId?: string;
   uuid: string;

diff --git a/client/modules/workspace/src/SelectModal/SelectModal.tsx b/client/modules/workspace/src/SelectModal/SelectModal.tsx
@@ -21,6 +21,7 @@ type TModalChildren = (props: {
 }) => React.ReactElement;
 
 const api = 'tapis';
+const portalName = 'DesignSafe';
 const HeaderTitle: React.FC<{
   api: string;
   system: string;
@@ -109,15 +110,20 @@ export const SelectModal: React.FC<{
   const {
     data: { storageSystems, defaultStorageSystem },
   } = useGetSystems();
-  // only pick up enabled systems with label
+  // only pick up enabled systems in this portal
   const includedSystems = storageSystems.filter(
-    (s) => s.enabled && s.notes?.label
+    (s) => s.enabled && s.notes?.portalNames?.includes(portalName)
   );
 
-  const systemOptions = includedSystems.map((system) => ({
-    label: system.notes.label,
-    value: system.id,
-  }));
+  // Sort - so mydata is shown first.
+  const systemOptions = includedSystems
+    .sort((a, b) => {
+      return (a.notes?.isMyData ? 0 : 1) - (b.notes?.isMyData ? 0 : 1);
+    })
+    .map((system) => ({
+      label: system.notes.label,
+      value: system.id,
+    }));
   systemOptions.push({ label: 'My Projects', value: 'myprojects' });
 
   const defaultParams = useMemo(