[DUOS-2691][DUOS-2685][DUOS-2704] Data library updates (#2349)

* fix: only show open access from own institution * fix: search all studies with eLwazi in them * feat: add nhgri data library
DataBiosphere · Oct 5, 2023 · f0b9404 · f0b9404
1 parent 3bc8c34
commit f0b9404
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 18 deletions.
diff --git a/src/Routes.js b/src/Routes.js
@@ -102,6 +102,7 @@ const Routes = (props) => (
     <AuthenticatedRoute path="/datalibrary_mgb" component={DatasetSearch} props={props} rolesAllowed={[USER_ROLES.admin, USER_ROLES.all]} />
     <AuthenticatedRoute path="/datalibrary_elwazi" component={DatasetSearch} props={props} rolesAllowed={[USER_ROLES.admin, USER_ROLES.all]} />
     <AuthenticatedRoute path="/datalibrary_myinstitution" component={DatasetSearch} props={props} rolesAllowed={[USER_ROLES.admin, USER_ROLES.all]} />
+    <AuthenticatedRoute path="/datalibrary_nhgri" component={DatasetSearch} props={props} rolesAllowed={[USER_ROLES.admin, USER_ROLES.all]} />
     <AuthenticatedRoute path="/dataset_statistics/:datasetId" component={DatasetStatistics} props={props}
       rolesAllowed={[USER_ROLES.all]} />
     <AuthenticatedRoute path="/dac_datasets" component={DACDatasets} props={props} rolesAllowed={[USER_ROLES.chairperson]} />

diff --git a/src/images/nhgri-logo-color.svg b/src/images/nhgri-logo-color.svg
diff --git a/src/pages/DatasetSearch.js b/src/pages/DatasetSearch.js
@@ -7,8 +7,8 @@ import broadIcon from '../logo.svg';
 import duosIcon from '../images/duos-network-logo.svg';
 import mgbIcon from '../images/mass-general-brigham-logo.svg';
 import elwaziIcon from '../images/elwazi-logo-color.svg';
+import nhgriIcon from '../images/nhgri-logo-color.svg'
 import { Storage } from '../libs/storage';
-import { isEmpty, isNil } from 'lodash';
 import { Box, CircularProgress } from '@mui/material';
 
 const signingOfficialQuery = (user) => {
@@ -23,29 +23,18 @@ const signingOfficialQuery = (user) => {
 const myInstitutionQuery = (user) => {
   return {
     'bool': {
-      'should': [
+      'must': [
         {
-          'bool': {
-            'must': [
-              {
-                'match_phrase': {
-                  'submitter.institution.id': user.institution.id
-                }
-              },
-              {
-                'term': {
-                  'dacApproval': true
-                }
-              }
-            ]
+          'match_phrase': {
+            'submitter.institution.id': user.institution.id
           }
         },
         {
           'term': {
-            'openAccess': true
+            'dacApproval': true
           }
         }
-      ],
+      ]
     }
   };
 }
@@ -105,7 +94,7 @@ export const DatasetSearch = (props) => {
     '/datalibrary_elwazi': {
       query: {
         'match_phrase': {
-          'submitter.institution.name': 'eLwazi'
+          'study.description': 'elwazi'
         }
       },
       icon: elwaziIcon,
@@ -116,6 +105,15 @@ export const DatasetSearch = (props) => {
       icon: null,
       title: user.institution.name + ' Data Library',
     },
+    '/datalibrary_nhgri': {
+      query: {
+        'match_phrase': {
+          'study.description': 'anvil'
+        }
+      },
+      icon: nhgriIcon,
+      title: 'NHGRI Data Library',
+    }
   }
 
   const version = versions[location.pathname];