Commit 179af00a authored by Alejandro De Maria Antolinos's avatar Alejandro De Maria Antolinos
Browse files

Working on spliting the samples and participants

parent 12f97364
Pipeline #51526 failed with stage
in 2 minutes and 56 seconds
......@@ -17,6 +17,8 @@ import SampleTrackingStatsPage from './containers/Stats/SampleTracking/SampleTra
import SearchPage from './containers/SearchPage';
import OpenDataPage from './containers/OpenData/OpenDataPage';
import ClosedDataPage from './containers/ClosedData/ClosedDataPage';
import SamplesPage from './containers/SamplesPage';
import ParticipantsPage from './containers/ParticipantsPage';
import DatasetsPage from './containers/DatasetsPage';
import EventTagPage from './containers/EventTagPage';
import EventsPage from './containers/EventsPage';
......@@ -180,6 +182,14 @@ function App() {
<Route path="/investigation/:investigationId/parcel/:parcelId">
<ParcelPage />
</Route>
<Route path="/investigation/:investigationId/participants">
<ParticipantsPage />
</Route>
<Route path="/investigation/:investigationId/samples">
<SamplesPage />
</Route>
</LoadingBoundary>
</Route>
......
......@@ -325,7 +325,6 @@ function InvestigationTable(props) {
withUserPortalLink ||
(UI.userPortal.isLinkEnabled && isAdministrator),
})}
expandRow={expandRow}
handleTableChange={handleTableChange}
onSearch={onSearch}
delay={1250}
......
......@@ -46,6 +46,14 @@ function TabContainerMenu(props) {
)}
</>
)}
<>
<LinkContainer to={`${routePrefix}/participants`}>
<NavItem eventKey="shipping" href="">
<Glyphicon glyph="user" />
<span style={{ marginLeft: 2 }}> Participants </span>
</NavItem>
</LinkContainer>
</>
</Nav>
);
}
......
import React, { useEffect, useRef } from 'react';
import { Col, Grid, Row, Alert } from 'react-bootstrap';
import { useParams } from 'react-router';
import { useDispatch, useSelector } from 'react-redux';
import TabContainerMenu from '../components/TabContainerMenu/TabContainerMenu';
import Loader from '../components/Loader';
import DatasetTable from '../components/Dataset/DatasetTable';
import PageNotFound from './PageNotFound';
import { fetchDatasetsByInvestigationId } from '../actions/datasets';
import { useResource } from 'rest-hooks';
import InvestigationResource from '../resources/investigation';
import { setInvestigationBreadCrumbs } from './investigation-breadcrumbs';
import ParticipantsPanel from '../components/Investigation/ParticipantsPanel';
function ParticipantsPage() {
const { investigationId } = useParams();
const user = useSelector((state) => state.user);
return (
<Grid fluid>
<Row>
<Col sm={12}>
<TabContainerMenu />
<div style={{ margin: 20 }}>
<ParticipantsPanel
investigationId={investigationId}
name={user.name}
/>
</div>
</Col>
</Row>
</Grid>
);
}
export default ParticipantsPage;
import React, { useEffect, useRef } from 'react';
import { Col, Grid, Row, Alert } from 'react-bootstrap';
import { useParams } from 'react-router';
import { useDispatch, useSelector } from 'react-redux';
import TabContainerMenu from '../components/TabContainerMenu/TabContainerMenu';
import Loader from '../components/Loader';
import DatasetTable from '../components/Dataset/DatasetTable';
import PageNotFound from './PageNotFound';
import { fetchDatasetsByInvestigationId } from '../actions/datasets';
import { useResource } from 'rest-hooks';
import InvestigationResource from '../resources/investigation';
import { setInvestigationBreadCrumbs } from './investigation-breadcrumbs';
import ParticipantsPanel from '../components/Investigation/ParticipantsPanel';
function SamplesPage() {
const { investigationId } = useParams();
const user = useSelector((state) => state.user);
return (
<Grid fluid>
<Row>
<Col sm={12}>
<TabContainerMenu />
<div style={{ margin: 20 }}>
<ParticipantsPanel
investigationId={investigationId}
name={user.name}
/>
</div>
</Col>
</Row>
</Grid>
);
}
export default SamplesPage;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment