diff --git a/src/Routes.jsx b/src/Routes.jsx index a3817ef39..5ffd352e7 100644 --- a/src/Routes.jsx +++ b/src/Routes.jsx @@ -6,7 +6,6 @@ import ManageDac from './pages/manage_dac/ManageDac'; import ManageEditDac from './pages/manage_dac/ManageEditDac'; import AdminManageUsers from './pages/AdminManageUsers'; import DataAccessRequestApplication from './pages/dar_application/DataAccessRequestApplication'; -import DatasetCatalog from './pages/DatasetCatalog'; import DACDatasets from './pages/DACDatasets'; import DatasetRegistration from './pages/DatasetRegistration'; import Home from './pages/Home'; @@ -98,7 +97,6 @@ const Routes = (props) => ( {checkEnv(envGroups.NON_STAGING) && } - diff --git a/src/assets/DPA.md b/src/assets/DPA.md index 305699a10..40d9de429 100644 --- a/src/assets/DPA.md +++ b/src/assets/DPA.md @@ -9,8 +9,8 @@ to Broad’s mission and consistent with its tax-exempt status. Through its Data registers and enables widespread access to various types of data and materials, including genomic and imaging data to promote global scientific and genomic research. Per these terms and conditions (this “Agreement”), Broad allows the Data Submitter, an institution, to register Data in DUOS and issue permissions to the Data Submitter’s Authorized -Submission Representatives (defined below) to register and submit datasets in the DUOS Dataset Catalog (***see*** -**https://duos.broadinstitute.org/dataset_catalog**, the “Application”) at such Authorized Submission Representatives’ +Submission Representatives (defined below) to register and submit datasets in the DUOS Dataset Library (***see*** +**https://duos.broadinstitute.org/datalibrary**, the “Application”) at such Authorized Submission Representatives’ discretion and provided further, the Data Submitter is and remains responsible for its compliance with this Agreement and for compliance herewith by its Authorized Submission Representatives.\ \ diff --git a/src/components/DuosHeader.jsx b/src/components/DuosHeader.jsx index 0e8054cef..1d4518a2d 100644 --- a/src/components/DuosHeader.jsx +++ b/src/components/DuosHeader.jsx @@ -82,7 +82,7 @@ export const headerTabsConfig = [ link: '/admin_manage_dar_collections', children: [ { label: 'DAR Requests', link: '/admin_manage_dar_collections' }, - { label: 'Dataset Catalog', link: '/dataset_catalog' }, + { label: 'Data Library', link: '/datalibrary', search: 'datalibrary' }, { label: 'DACs', link: '/manage_dac' }, { label: 'Users', link: '/admin_manage_users' }, { label: 'Institutions', link: '/admin_manage_institutions' }, @@ -119,16 +119,15 @@ export const headerTabsConfig = [ search: 'member_console', children: [ { label: 'DAR Requests', link: '/member_console' }, - { label: 'Datasets', link: '/dataset_catalog' }, + { label: 'Data Library', link: '/datalibrary', search: 'datalibrary' } ], isRendered: (user) => user.isMember }, { label: 'Researcher Console', - link: '/dataset_catalog', - search: 'dataset_catalog', + link: '/datalibrary', + search: 'datalibrary', children: [ - { label: 'Data Catalog', link: '/dataset_catalog' }, { label: 'Data Library', link: '/datalibrary', search: 'datalibrary' }, { label: 'DAR Requests', link: '/researcher_console' }, { label: 'Data Submissions', link: '/dataset_submissions', isRenderedForUser: (user) => user?.isDataSubmitter } diff --git a/src/components/data_update/DatasetUpdate.jsx b/src/components/data_update/DatasetUpdate.jsx index d63167dab..5047d81e6 100644 --- a/src/components/data_update/DatasetUpdate.jsx +++ b/src/components/data_update/DatasetUpdate.jsx @@ -101,7 +101,7 @@ export const DatasetUpdate = (props) => { multiPartFormData.append('consentGroups', consentGroups); DataSet.updateDatasetV3(dataset.dataSetId, multiPartFormData).then(() => { - history.push('/dataset_catalog'); + history.push('/datalibrary'); Notifications.showSuccess({ text: 'Update submitted successfully!' }); }, () => { Notifications.showError({ text: 'Some errors occurred, the dataset was not updated.' }); diff --git a/src/pages/StudyUpdateForm.jsx b/src/pages/StudyUpdateForm.jsx index 792e1baad..a741fe398 100644 --- a/src/pages/StudyUpdateForm.jsx +++ b/src/pages/StudyUpdateForm.jsx @@ -207,7 +207,7 @@ export const StudyUpdateForm = (props) => { const multiPartFormData = createMultiPartFormData(update); DataSet.updateStudy(studyId, multiPartFormData).then(() => { - history.push('/dataset_catalog'); + history.push('/datalibrary'); Notifications.showSuccess({ text: 'Submitted succesfully!' }); }, (e) => { Notifications.showError({ text: 'Could not submit: ' + e?.response?.data?.message || e.message }); diff --git a/src/pages/data_submission/DataSubmissionForm.jsx b/src/pages/data_submission/DataSubmissionForm.jsx index 87e32d8f6..d085796ff 100644 --- a/src/pages/data_submission/DataSubmissionForm.jsx +++ b/src/pages/data_submission/DataSubmissionForm.jsx @@ -150,7 +150,7 @@ export const DataSubmissionForm = (props) => { const multiPartFormData = createMultiPartFormData(registration); DataSet.registerDataset(multiPartFormData).then(() => { - history.push('/dataset_catalog'); + history.push('/datalibrary'); Notifications.showSuccess({ text: 'Submitted succesfully!' }); }, (e) => { Notifications.showError({ text: 'Could not submit: ' + e?.response?.data?.message || e.message });