From 7cb22c90b804e4cb446225e955738f31068af5e4 Mon Sep 17 00:00:00 2001 From: Sky Rubenstein Date: Tue, 3 Dec 2024 15:37:14 -0500 Subject: [PATCH 1/2] Add study details page --- src/Routes.jsx | 102 +++++----- src/components/DuosHeader.jsx | 94 ++++----- .../data_search/DatasetSearchFooter.tsx | 4 +- .../data_search/DatasetSearchTable.jsx | 32 +-- .../DatasetSearchTableConstants.tsx | 4 +- .../data_search/DatasetSearchTableDisplay.tsx | 2 +- src/components/study_details/StudyDetails.tsx | 191 ++++++++++++++++++ src/types/tdrModel.ts | 7 + 8 files changed, 319 insertions(+), 117 deletions(-) create mode 100644 src/components/study_details/StudyDetails.tsx diff --git a/src/Routes.jsx b/src/Routes.jsx index 2f5fce388..fed9fdcdb 100644 --- a/src/Routes.jsx +++ b/src/Routes.jsx @@ -1,5 +1,6 @@ import React from 'react'; import {Redirect, Route, Switch} from 'react-router-dom'; +import { StudyDetails } from './components/study_details/StudyDetails'; import AuthenticatedRoute from './components/AuthenticatedRoute'; import {USER_ROLES} from './libs/utils'; import ManageDac from './pages/manage_dac/ManageDac'; @@ -47,65 +48,66 @@ import EditDac from './pages/manage_dac/EditDac'; const Routes = (props) => ( - } /> - } /> - } /> - - } /> + } /> + } /> + + checkEnv(envGroups.NON_STAGING) ? : } /> - - - - - - - - - - - - - - - - - {DAAUtils.isEnabled() && } - {DAAUtils.isEnabled() && } - - - - - - + + + + + + + + + + + + + + + + {DAAUtils.isEnabled() && } + {DAAUtils.isEnabled() && } + + + + + + - {/* Order is important for processing links with embedded dataRequestIds */} - - - - {DAAUtils.isEnabled() && } - - {DAAUtils.isEnabled() && } - - - - - - - - - - - - - {checkEnv(envGroups.NON_PROD) && } - + + + {DAAUtils.isEnabled() && } + + {DAAUtils.isEnabled() && } + + + + + + + + + + + + + + {checkEnv(envGroups.NON_PROD) && } + ); diff --git a/src/components/DuosHeader.jsx b/src/components/DuosHeader.jsx index b1fc90ca0..80b73e33f 100644 --- a/src/components/DuosHeader.jsx +++ b/src/components/DuosHeader.jsx @@ -160,26 +160,26 @@ const NavigationTabsComponent = (props) => { return (
{makeNotifications()} -