Merge pull request #1428 from hubmapconsortium/EPICollection

Epi collection
hubmapconsortium · Jun 27, 2024 · edc88b4 · edc88b4
2 parents 4c53464 + 9485091
commit edc88b4
Show file tree

Hide file tree

Showing 10 changed files with 1,297 additions and 169 deletions.
diff --git a/src/public/index.html b/src/public/index.html
@@ -12,7 +12,7 @@
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/hubmapconsortium/ccf-ui@3/rui/styles.css">
   <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
   <script src="%PUBLIC_URL%/assets/liveBanner.js"></script>
-  <script async src="https://cdn.jsdelivr.net/gh/hubmapconsortium/ccf-ui@3/rui/wc.js"></script>
+  <!-- <script async src="https://cdn.jsdelivr.net/gh/hubmapconsortium/ccf-ui@3/rui/wc.js"></script> -->
   <script async src="https://www.googletagmanager.com/gtag/js?id=UA-136932895-2"></script>
   <script>
     window.dataLayer = window.dataLayer || [];

diff --git a/src/src/App.js b/src/src/App.js
diff --git a/src/src/Nav.js b/src/src/Nav.js
@@ -113,7 +113,6 @@ export const Navigation = (props) => {
               />
             </a>
             </Typography>
-
             {props.login &&  userDataGroups[0] &&  userDataGroups[0].length >0 &&(
               <Box className="menu-bar"  sx={{ flexGrow: 1, display: { xs: 'flex', md: 'none' } }}>
                 <Button 
@@ -160,6 +159,20 @@ export const Navigation = (props) => {
                     to="/new/publication" >
                     Publication
                   </MenuItem>
+                  <MenuItem 
+                    className="nav-link"
+                    component={Link}
+                    onClick={handleClose}
+                    to="/new/collection" >
+                    Collection - Dataset
+                  </MenuItem>
+                  <MenuItem 
+                    className="nav-link"
+                    component={Link}
+                    onClick={handleClose}
+                    to="/new/EPICollection" >
+                    Collection - EPIC
+                  </MenuItem>
                 </Menu>
                 <Button 
                   id="BulkButton"
@@ -269,7 +282,6 @@ export const Navigation = (props) => {
             </a>
             </Typography>
             {props.login &&  userDataGroups[0] &&  userDataGroups[0].length >0 &&(
-
               <Box className="menu-bar" sx={{  display: { xs: 'none', md: 'flex' } }}>
                 <Button 
                   id="IndividualButton"
@@ -315,6 +327,20 @@ export const Navigation = (props) => {
                     to="/new/publication" >
                     Publication
                   </MenuItem>
+                  <MenuItem 
+                    className="nav-link"
+                    component={Link}
+                    onClick={handleClose}
+                    to="/new/collection" >
+                    Collection - Dataset
+                  </MenuItem>
+                  <MenuItem 
+                    className="nav-link"
+                    component={Link}
+                    onClick={handleClose}
+                    to="/new/EPICollection" >
+                    Collection - EPIC
+                  </MenuItem>
                 </Menu>
                 <Button 
                   id="BulkButton"

diff --git a/src/src/assets/Documents/sample-block-good2.tsv b/src/src/assets/Documents/sample-block-good2.tsv
@@ -0,0 +1,3 @@
+source_id	sample_id	lab_id	preparation_protocol_doi	source_storage_duration_value	source_storage_duration_unit	tissue_weight_value	tissue_weight_unit	volume_value	volume_unit	pathology_distance_value	pathology_distance_unit	preparation_medium	preparation_condition	processing_time_value	processing_time_unit	storage_medium	storage_method	quality_criteria	histological_report	notes	metadata_schema_id
+HBM332.PPZB.566	HBM354.LLDZ.429		https://dx.doi.org/10.17504/protocols.io.eq2lyno9qvx9/v1	42	minute	42	kg	42	mm^3	42	cm	Methanol	frozen in liquid nitrogen	42	minute	Methanol	frozen in liquid nitrogen				3e98cee6-d3fb-467b-8d4e-9ba7ee49eeff
+HBM367.LSDF.689	HBM455.LQGV.855		https://dx.doi.org/10.17504/protocols.io.eq2lyno9qvx9/v1	42	minute	42	kg	42	mm^3	42	cm	Methanol	frozen in liquid nitrogen	42	minute	Methanol	frozen in liquid nitrogen				3e98cee6-d3fb-467b-8d4e-9ba7ee49eeff
diff --git a/src/src/assets/Documents/sample-block-good3.tsv b/src/src/assets/Documents/sample-block-good3.tsv
@@ -0,0 +1,4 @@
+source_id	sample_id	lab_id	preparation_protocol_doi	source_storage_duration_value	source_storage_duration_unit	tissue_weight_value	tissue_weight_unit	volume_value	volume_unit	pathology_distance_value	pathology_distance_unit	preparation_medium	preparation_condition	processing_time_value	processing_time_unit	storage_medium	storage_method	quality_criteria	histological_report	notes	metadata_schema_id
+HBM332.PPZB.566	HBM354.LLDZ.429		https://dx.doi.org/10.17504/protocols.io.eq2lyno9qvx9/v1	42	minute	42	kg	42	mm^3	42	cm	Methanol	frozen in liquid nitrogen	42	minute	Methanol	frozen in liquid nitrogen				3e98cee6-d3fb-467b-8d4e-9ba7ee49eeff
+HBM367.LSDF.689	HBM455.LQGV.855		https://dx.doi.org/10.17504/protocols.io.eq2lyno9qvx9/v1	42	minute	42	kg	42	mm^3	42	cm	Methanol	frozen in liquid nitrogen	42	minute	Methanol	frozen in liquid nitrogen				3e98cee6-d3fb-467b-8d4e-9ba7ee49eeff
+HBM522.XZJV.798	HBM292.JQVP.757		https://dx.doi.org/10.17504/protocols.io.eq2lyno9qvx9/v1	42	minute	42	kg	42	mm^3	42	cm	Methanol	frozen in liquid nitrogen	42	minute	Methanol	frozen in liquid nitrogen				3e98cee6-d3fb-467b-8d4e-9ba7ee49eeff
diff --git a/src/src/components/collections/collections.jsx b/src/src/components/collections/collections.jsx
@@ -587,16 +587,18 @@ export function CollectionForm (props){
             onCellClick={handleEvent}
             loading={!associatedEntities.length > 0 && !isNew}
             sx={{
+              // minHeight: '200px',
               // display: 'inline-block',
               // // overflow: 'auto',
               // '.MuiDataGrid-virtualScroller': {
               //   minHeight: '45px',
               //   // overflow: 'scroll',
               // },
-              // '.MuiDataGrid-main > div:nth-child(2)': {
-              //   // overflowY: 'auto !important',
-              //   // flex: 'unset !important',
-              // },
+              '.MuiDataGrid-main > .MuiDataGrid-virtualScroller': {
+                minHeight: '60px',
+                // overflowY: 'auto !important',
+                // flex: 'unset !important',
+              },
             }}
           />
         </div>