Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DUOS-2751] AnVIL data library #2382

Merged
merged 2 commits into from
Nov 9, 2023
Merged

[DUOS-2751] AnVIL data library #2382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0fe054
feat: add anvil data library
fboulnois Nov 6, 2023
8e80ba0
fix: ensure custom data libraries are part of tab nav
fboulnois Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/DuosHeader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
],
Expand Down
27 changes: 27 additions & 0 deletions src/images/anvil-logo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 12 additions & 1 deletion src/pages/DatasetSearch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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': {
Expand All @@ -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(() => {
Expand Down
Loading