From f0fe054f076c580a1c6925d67559af8611afff1b Mon Sep 17 00:00:00 2001
From: Florian Boulnois <fboulnoi@broadinstitute.org>
Date: Mon, 6 Nov 2023 11:19:04 -0500
Subject: [PATCH 1/2] feat: add anvil data library

---
 src/images/anvil-logo.svg  | 27 +++++++++++++++++++++++++++
 src/pages/DatasetSearch.js | 13 ++++++++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 src/images/anvil-logo.svg

diff --git a/src/images/anvil-logo.svg b/src/images/anvil-logo.svg
new file mode 100644
index 000000000..c63dcd77f
--- /dev/null
+++ b/src/images/anvil-logo.svg
@@ -0,0 +1,27 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 278.594 232.385">
+    <defs>
+        <clipPath id="a" clipPathUnits="userSpaceOnUse">
+            <path fill="#866e90" stroke-width="1.658" d="M54.828 88.408h112.986V230.3H54.828Z" />
+        </clipPath>
+    </defs>
+    <path fill="#035c94"
+        d="M176.52 89.305H1v12.7s123.74 46.27 39.93 117.83v11.55h154.1v-11.54c-17.18-19.54-59.54-57.6-31-75.81 30.91-18.42 51.45-19.14 81.64-29.79 30.19-10.65 40.71-17.46 24-17.46h-93.15z" />
+    <path fill="none" stroke="#035c94" stroke-miterlimit="10" stroke-width="5"
+        d="M86.05 91.155s-22.31-23.39 7.14-53.91c29.45-30.52 11-38.59 18.67-31.16 1.33 1.28 17.48 16.87 17.06 30.36-.55 17.23-17.94 33.06-17.94 33.06s25.35-13.94 26.33-22.18c.84-7.06 16.54 25-2.28 43.82"
+        class="cls-4" />
+    <path fill="none" stroke="#035c94" stroke-miterlimit="10" stroke-width="5"
+        d="M137.31 47.325s-2.12 15-54 37.14m60.89-18.96s-1.34 12.22-47.52 29.71m31.3-65.3s-2 13.17-50 32.66"
+        class="cls-4" />
+    <g fill="none" stroke="#fff" stroke-miterlimit="10" stroke-width="5" clip-path="url(#a)"
+        transform="translate(1 1.005)">
+        <path
+            d="M109.96 42.86C86.55 64.12 82.79 69.62 82.74 81.14c0 7.49 3 17.67 26.87 37.91 23.87 20.24 26.88 30.58 26.85 37.91-.05 11.49-3.71 17.06-27.2 38.28"
+            class="cls-6" />
+        <path
+            d="M109.26 195.25c-40.45-34.45-30.42-49.94.35-76.2 24.13-20.55 27.13-30.79 27.21-38.27.05-11.52-3.64-17-26.86-37.91M82.74 81.14l54.09-.37m-.37 76.2-53.86.36m5.82-16.89 41.8-.28m-41.21 33.99 41.61-.29M88.63 64.25l42.46-.29M88.96 97.95l41.5-.28m-21.22 97.58c-23.41 21.25-27.17 26.77-27.22 38.25 0 7.49 3 17.67 26.87 37.91 23.87 20.24 26.85 30.62 26.85 37.95-.05 11.49-3.71 17.06-27.2 38.28"
+            class="cls-6" />
+        <path
+            d="M108.54 347.64c-40.45-34.45-30.42-49.94.35-76.2 24.1-20.57 27.18-30.8 27.21-38.28.05-11.52-3.64-17-26.86-37.91m-20.61 21.39 42.46-.29"
+            class="cls-6" />
+    </g>
+</svg>
diff --git a/src/pages/DatasetSearch.js b/src/pages/DatasetSearch.js
index 9056cc321..f2f1eefec 100644
--- a/src/pages/DatasetSearch.js
+++ b/src/pages/DatasetSearch.js
@@ -8,9 +8,11 @@ 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 anvilIcon from '../images/anvil-logo.svg';
 import homeIcon from '../images/icon_dataset_.png';
 import { Storage } from '../libs/storage';
 import { Box, CircularProgress } from '@mui/material';
+import { toLower } from 'lodash';
 
 const signingOfficialQuery = (user) => {
   return {
@@ -115,6 +117,15 @@ export const DatasetSearch = (props) => {
       icon: nhgriIcon,
       title: 'NHGRI Data Library',
     },
+    'anvil': {
+      query: {
+        'match_phrase': {
+          'study.description': 'anvil'
+        }
+      },
+      icon: anvilIcon,
+      title: 'AnVIL Data Library',
+    },
     '/custom': {
       query: {
         'bool': {
@@ -137,7 +148,7 @@ export const DatasetSearch = (props) => {
     }
   }
 
-  const key = query === undefined ? '/datalibrary' : query;
+  const key = query === undefined ? '/datalibrary' : toLower(query);
   const version = versions[key] === undefined ? versions['/custom'] : versions[key];
 
   useEffect(() => {

From 8e80ba087eb4d97b79bc3899efeffd5f211c6f22 Mon Sep 17 00:00:00 2001
From: Florian Boulnois <fboulnoi@broadinstitute.org>
Date: Mon, 6 Nov 2023 11:30:41 -0500
Subject: [PATCH 2/2] fix: ensure custom data libraries are part of tab nav

---
 src/components/DuosHeader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/DuosHeader.js b/src/components/DuosHeader.js
index e15592959..0050beb07 100644
--- a/src/components/DuosHeader.js
+++ b/src/components/DuosHeader.js
@@ -129,7 +129,7 @@ export const headerTabsConfig = [
     search: 'dataset_catalog',
     children: [
       { label: 'Data Catalog', link: '/dataset_catalog' },
-      { label: 'Data Library', link: '/datalibrary' },
+      { label: 'Data Library', link: '/datalibrary', search: 'datalibrary' },
       { label: 'DAR Requests', link: '/researcher_console' },
       { label: 'Data Submissions', link: '/dataset_submissions', isRenderedForUser: (user) => user?.isDataSubmitter }
     ],