Merge branch 'main' of https://github.com/hubmapconsortium/ingest-ui …

…into dev-integrate
hubmapconsortium · Oct 15, 2024 · ca65a49 · ca65a49
2 parents d74b68d + 42e5d2f
commit ca65a49
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ Running the following command will create an optimized static build of your app
 npm run build
 ````
 
-## Docker build for DEV development
+## Docker build for DEV/TEST/PROD development
 
 There are a few configurable environment variables to keep in mind:
 
@@ -28,11 +28,3 @@ There are a few configurable environment variables to keep in mind:
 cd docker
 ./docker-development.sh [check|config|build|start|stop|down]
 ```
-
-## Docker build for deployment on TEST/STAGE/PROD
-
-```
-cd docker
-docker pull hubmap/ingest-ui:2.3.0 (replace with the actual released version number)
-./docker-deployment.sh [start|stop|down]
-```
diff --git a/src/src/App.js b/src/src/App.js
@@ -313,7 +313,8 @@ export function App (props){
   };
 
   function handleCancel(){
-    window.history.back();  
+    // window.history.back();  
+    navigate("/");
   }
   const onClose = (event, reason) => {
       navigate("/");

diff --git a/src/src/components/collections/collections.jsx b/src/src/components/collections/collections.jsx
@@ -388,7 +388,7 @@ export function CollectionForm (props){
     } else{
       setFormErrors((prevValues) => ({
         ...prevValues,
-        'contributors': "Contributors detected but colums are unsupported / improperly formatted. Please referto the examples linked below and try again.",
+        'contributors': "Contributors detected but colums are unsupported / improperly formatted. Please refer to the examples linked below and try again.",
       }))
       isValid = false;
     }
@@ -525,7 +525,7 @@ export function CollectionForm (props){
           }else if (row.is_contact && (row.is_contact === "TRUE"|| row.is_contact.toLowerCase()==="yes") ){
             contacts.push(row)
           }
-          contributors.push(row)
+          // contributors.push(row)
 
         }
         setFormValues ({
@@ -548,10 +548,14 @@ export function CollectionForm (props){
               key={("rowName_" + index)}
               className="row-selection"
             >
-              <TableCell className="clicky-cell" scope="row">{row.display_name}</TableCell>
-              <TableCell className="clicky-cell" scope="row">{row.affiliation}</TableCell>
-              <TableCell className="clicky-cell" scope="row"> {row.orcid} </TableCell>
-              <TableCell className="clicky-cell" scope="row"> { (row.is_contact && (row.is_contact==="TRUE" || row.is_contact.toLowerCase()==="yes"))  ? <FontAwesomeIcon icon={faCheck} /> : ""} </TableCell>
+            <TableCell className="clicky-cell" scope="row">{row.display_name}</TableCell>
+            <TableCell className="clicky-cell" scope="row">{row.affiliation}</TableCell>
+            <TableCell className="clicky-cell" scope="row">{row.orcid} </TableCell>
+            <TableCell className="clicky-cell" scope="row">{row.email	}</TableCell>
+            <TableCell className="clicky-cell" scope="row"> { (row.is_contact && (row.is_contact==="TRUE" || row.is_contact.toLowerCase()==="yes"))  ? <FontAwesomeIcon icon={faCheck} /> : ""} </TableCell>
+            <TableCell className="clicky-cell" scope="row">{row.is_principal_investigator	}</TableCell>
+            <TableCell className="clicky-cell" scope="row">{row.is_operator	}</TableCell>
+            <TableCell className="clicky-cell" scope="row">{row.metadata_schema_id}</TableCell>
             </TableRow>
           );
         });
@@ -566,10 +570,14 @@ export function CollectionForm (props){
             <Table stickyHeader aria-label="Associated Collaborators" size="small" className="table table-striped table-hover mb-0">
               <TableHead className="thead-dark font-size-sm">
                 <TableRow className="   " >
-                  <TableCell> Name</TableCell>
-                  <TableCell component="th">Affiliation</TableCell>
-                  <TableCell component="th">Orcid</TableCell>
-                  <TableCell component="th">Is Contact</TableCell>
+                <TableCell> Name</TableCell>
+                <TableCell component="th">Affiliation</TableCell>
+                <TableCell component="th">Orcid</TableCell>
+                <TableCell component="th">Email</TableCell>
+                <TableCell component="th">Is Contact</TableCell>
+                <TableCell component="th">Is Principal Investigator</TableCell>
+                <TableCell component="th">Is Operator</TableCell>
+                <TableCell component="th">Metadata Schema ID</TableCell>
                 </TableRow>
               </TableHead>
               <TableBody>
@@ -905,7 +913,7 @@ export function CollectionForm (props){
           )}
 
           <div className="text-right">
-            <Typography variant='caption'>Please referto the <a href="https://hubmapconsortium.github.io/ingest-validation-tools/contributors/current/" target='_blank'>contributor file schema information</a>, and this <a href='https://raw.githubusercontent.com/hubmapconsortium/dataset-metadata-spreadsheet/main/contributors/latest/contributors.tsv' target='_blank'>Example TSV File</a> </Typography>
+            <Typography variant='caption'>Please refer to the <a href="https://hubmapconsortium.github.io/ingest-validation-tools/contributors/current/" target='_blank'>contributor file schema information</a>, and this <a href='https://raw.githubusercontent.com/hubmapconsortium/dataset-metadata-spreadsheet/main/contributors/latest/contributors.tsv' target='_blank'>Example TSV File</a> </Typography>
           </div>
           <div className="text-left">
             <label>

diff --git a/src/src/components/collections/epicollections.jsx b/src/src/components/collections/epicollections.jsx
@@ -389,7 +389,7 @@ export function EPICollectionForm (props){
     } else{
       setFormErrors((prevValues) => ({
         ...prevValues,
-        'contributors': "Contributors detected but colums are unsupported / improperly formatted. Please referto the examples linked below and try again.",
+        'contributors': "Contributors detected but colums are unsupported / improperly formatted. Please refer to the examples linked below and try again.",
       }))
       isValid = false;
     }
@@ -533,7 +533,7 @@ export function EPICollectionForm (props){
         }else if(row.is_contact && (row.is_contact === "TRUE"|| row.is_contact.toLowerCase()==="yes") ){
           contacts.push(row)
         }
-        contributors.push(row)
+        // contributors.push(row)
       }
       setFormValues ({
         ...formValues,
@@ -557,8 +557,12 @@ export function EPICollectionForm (props){
           >
             <TableCell className="clicky-cell" scope="row">{row.display_name}</TableCell>
             <TableCell className="clicky-cell" scope="row">{row.affiliation}</TableCell>
-            <TableCell className="clicky-cell" scope="row"> {row.orcid} </TableCell>
+            <TableCell className="clicky-cell" scope="row">{row.orcid} </TableCell>
+            <TableCell className="clicky-cell" scope="row">{row.email	}</TableCell>
             <TableCell className="clicky-cell" scope="row"> { (row.is_contact && (row.is_contact==="TRUE" || row.is_contact.toLowerCase()==="yes"))  ? <FontAwesomeIcon icon={faCheck} /> : ""} </TableCell>
+            <TableCell className="clicky-cell" scope="row">{row.is_principal_investigator	}</TableCell>
+            <TableCell className="clicky-cell" scope="row">{row.is_operator	}</TableCell>
+            <TableCell className="clicky-cell" scope="row">{row.metadata_schema_id}</TableCell>
             </TableRow>
         );
       });
@@ -577,7 +581,11 @@ export function EPICollectionForm (props){
                 <TableCell> Name</TableCell>
                 <TableCell component="th">Affiliation</TableCell>
                 <TableCell component="th">Orcid</TableCell>
+                <TableCell component="th">Email</TableCell>
                 <TableCell component="th">Is Contact</TableCell>
+                <TableCell component="th">Is Principal Investigator</TableCell>
+                <TableCell component="th">Is Operator</TableCell>
+                <TableCell component="th">Metadata Schema ID</TableCell>
               </TableRow>
             </TableHead>
             <TableBody>
@@ -918,7 +926,7 @@ export function EPICollectionForm (props){
         )}
 
         <div className="text-right">
-          <Typography variant='caption'>Please referto the <a href="https://hubmapconsortium.github.io/ingest-validation-tools/contributors/current/" target='_blank'>contributor file schema information</a>, and this <a href='https://raw.githubusercontent.com/hubmapconsortium/dataset-metadata-spreadsheet/main/contributors/latest/contributors.tsv' target='_blank'>Example TSV File</a> </Typography>
+          <Typography variant='caption'>Please refer to the <a href="https://hubmapconsortium.github.io/ingest-validation-tools/contributors/current/" target='_blank'>contributor file schema information</a>, and this <a href='https://raw.githubusercontent.com/hubmapconsortium/dataset-metadata-spreadsheet/main/contributors/latest/contributors.tsv' target='_blank'>Example TSV File</a> </Typography>
         </div>
         <div className="text-left">
           <label>