From f0b94043c54805a3cf01f0064be6b979f57be8e2 Mon Sep 17 00:00:00 2001
From: fboulnois <fboulnois@users.noreply.github.com>
Date: Thu, 5 Oct 2023 09:18:28 -0400
Subject: [PATCH] [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
---
 src/Routes.js                   |  1 +
 src/images/nhgri-logo-color.svg |  5 +++++
 src/pages/DatasetSearch.js      | 34 ++++++++++++++++-----------------
 3 files changed, 22 insertions(+), 18 deletions(-)
 create mode 100644 src/images/nhgri-logo-color.svg

diff --git a/src/Routes.js b/src/Routes.js
index 36ebf6815..9d472a4e0 100644
--- 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
new file mode 100644
index 000000000..a2d79ddd4
--- /dev/null
+++ b/src/images/nhgri-logo-color.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="76px" height="47px" viewBox="0 0 76 47" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <path d="M52.59,13.08 L52.59,33.9 L48.95,33.9 L48.95,33.9 L48.95,24.51 L39.47,24.51 L39.47,33.9 L35.82,33.9 L35.82,13.08 L39.47,13.08 L39.47,21.36 L48.95,21.36 L48.95,13.08 L48.95,13.08 L52.59,13.08 Z M32.18,33.9 L32.18,33.9 L28.53,33.9 L28.53,13.08 L32.18,13.08 L32.18,33.9 Z M24.94,33.9 L24.94,33.9 L21.09,33.9 L11.61,18.59 L11.52,18.59 L11.52,33.9 L8.06,33.9 L8.06,33.9 L8.06,13.08 L8.06,13.08 L11.91,13.08 L11.91,13.08 L21.42,28.42 L21.48,28.42 L21.48,13.08 L24.95,13.08 L24.95,33.9 L24.94,33.9 Z M65.43,23.42 L52.55,0.15 L5.13,0.15 C2.76,0.15 0.84,2.07 0.84,4.44 L0.84,42.44 C0.84,44.81 2.76,46.72 5.13,46.72 L52.52,46.72 L65.43,23.42 Z" id="Shape" fill="#616265"></path>
+    <path d="M55.74,46.72 L68.65,23.41 L55.78,0.15 L59,0.15 C60.76,0.15 62.91,1.42 63.76,2.96 L75.07,23.42 L63.72,43.92 C62.87,45.46 60.72,46.72 58.96,46.72 L55.74,46.72 Z" id="Path" fill="#20558A"></path>
+</svg>
diff --git a/src/pages/DatasetSearch.js b/src/pages/DatasetSearch.js
index 35350cc82..6daabe46d 100644
--- 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];