From c5b24eaa81a60cd6bb0a1606b61b17468ac6c468 Mon Sep 17 00:00:00 2001
From: yuanzhou <yuanzhou19@gmail.com>
Date: Fri, 11 Oct 2024 15:39:51 -0400
Subject: [PATCH 1/4] Update README.md

---
 README.md | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/README.md b/README.md
index e1de47be..800a99f0 100644
--- 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]
-```

From 94202d316fce7750b3128cfb25b2552999664f9b Mon Sep 17 00:00:00 2001
From: Birdmachine <jeswaldrip@gmail.com>
Date: Tue, 15 Oct 2024 11:19:24 -0400
Subject: [PATCH 2/4] Fix Typo

---
 src/src/components/collections/collections.jsx    | 4 ++--
 src/src/components/collections/epicollections.jsx | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/src/components/collections/collections.jsx b/src/src/components/collections/collections.jsx
index a4aeb5c7..9967b2c2 100644
--- 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;
     }
@@ -905,7 +905,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
index 2ca032b0..7a506422 100644
--- 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;
     }
@@ -918,7 +918,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>

From 6cf90262e16e0c1bbb857799fe35ebe5d810e287 Mon Sep 17 00:00:00 2001
From: Birdmachine <jeswaldrip@gmail.com>
Date: Tue, 15 Oct 2024 11:23:56 -0400
Subject: [PATCH 3/4] Use Navigate in lieu fo window history for improved
 stability (& fixes needing to 'double cancel' out of some forms, like the
 EPICollection form)

---
 src/src/App.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/src/App.js b/src/src/App.js
index ff147736..bcc3eb18 100644
--- 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("/");

From dcb62b2dc7abf5a05f92b6c0ca88e2b6f50dfe77 Mon Sep 17 00:00:00 2001
From: Birdmachine <jeswaldrip@gmail.com>
Date: Tue, 15 Oct 2024 12:35:23 -0400
Subject: [PATCH 4/4] Fix Contributor Dupe

---
 .../components/collections/collections.jsx    | 26 ++++++++++++-------
 .../components/collections/epicollections.jsx | 12 +++++++--
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/src/components/collections/collections.jsx b/src/src/components/collections/collections.jsx
index 9967b2c2..ad221a24 100644
--- a/src/src/components/collections/collections.jsx
+++ b/src/src/components/collections/collections.jsx
@@ -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>
diff --git a/src/src/components/collections/epicollections.jsx b/src/src/components/collections/epicollections.jsx
index 7a506422..35410642 100644
--- a/src/src/components/collections/epicollections.jsx
+++ b/src/src/components/collections/epicollections.jsx
@@ -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>