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

Jump to bottom

DCJ-486: Remove Custom Catalog #2631

Merged
merged 1 commit into from
Jul 24, 2024
Merged

DCJ-486: Remove Custom Catalog #2631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 2 deletions src/Routes.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ import TermsOfServiceAcceptance from './pages/TermsOfServiceAcceptance';
import {HealthCheck} from './pages/HealthCheck';
import DataSubmissionForm from './pages/data_submission/DataSubmissionForm';
import {ensureSoHasDaaAcknowledgement} from './components/SigningOfficialDaaAgreementWrapper';
import CustomDatasetCatalog from './pages/dac_dataset_catalog/CustomDatasetCatalog';
import {AnVILDMSPolicyInfo, NIHDMSPolicyInfo} from './pages/DMSPolicyInfo';
import {checkEnv, envGroups} from './utils/EnvironmentUtils';
import { DatasetUpdateForm } from './pages/DatasetUpdateForm';
Expand Down Expand Up @@ -101,7 +100,6 @@ const Routes = (props) => (
<AuthenticatedRoute path="/study_update/:studyId" component={StudyUpdateForm} props={props} rolesAllowed={[USER_ROLES.admin, USER_ROLES.chairperson, USER_ROLES.dataSubmitter]} />
<AuthenticatedRoute path="/admin_manage_lc/" component={AdminManageLC} props={props} rolesAllowed={[USER_ROLES.admin]} />
<AuthenticatedRoute path="/admin_manage_dar_collections/" component={AdminManageDarCollections} props={props} rolesAllowed={[USER_ROLES.admin]} />
{checkEnv(envGroups.NON_STAGING) && <AuthenticatedRoute path="/dataset_catalog/:variant" component={CustomDatasetCatalog} props={props} rolesAllowed={[USER_ROLES.researcher]}/>}
<AuthenticatedRoute path="/datalibrary/:query" component={DatasetSearch} props={props} rolesAllowed={[USER_ROLES.admin, USER_ROLES.all]} />
<AuthenticatedRoute path="/datalibrary" component={DatasetSearch} props={props} rolesAllowed={[USER_ROLES.admin, USER_ROLES.all]} />
<AuthenticatedRoute path="/dataset/:datasetIdentifier" component={DatasetStatistics} props={props} rolesAllowed={[USER_ROLES.all]} />
Expand Down
Binary file removed src/images/broad_logo.png
View file
Open in desktop
Binary file not shown.
Binary file removed src/images/sample_dac_logo.png
View file
Open in desktop
Binary file not shown.
12 changes: 0 additions & 12 deletions src/libs/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,18 +625,6 @@ export const searchOnFilteredList = (searchTerms, originalList, filterFn, setFil
setFilteredList(searchList);
};

export const getBooleanFromEventHtmlDataValue = (e) => {
if (!isNil(e)) {
if (!isNil(e.target)) {
const dataValue = e.target.getAttribute('data-value');
if (!isNil(dataValue)) {
return dataValue.toLowerCase() === 'true';
}
}
}
return false;
};

export const hasDataSubmitterRole = (user) => {
const roles = get('roles')(user);
const dsRole = find({'roleId': 8})(roles);
Expand Down
Loading
Loading