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] -``` 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("/"); diff --git a/src/src/components/collections/collections.jsx b/src/src/components/collections/collections.jsx index a4aeb5c7..ad221a24 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; } @@ -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" > - {row.display_name} - {row.affiliation} - {row.orcid} - { (row.is_contact && (row.is_contact==="TRUE" || row.is_contact.toLowerCase()==="yes")) ? : ""} + {row.display_name} + {row.affiliation} + {row.orcid} + {row.email } + { (row.is_contact && (row.is_contact==="TRUE" || row.is_contact.toLowerCase()==="yes")) ? : ""} + {row.is_principal_investigator } + {row.is_operator } + {row.metadata_schema_id} ); }); @@ -566,10 +570,14 @@ export function CollectionForm (props){ - Name - Affiliation - Orcid - Is Contact + Name + Affiliation + Orcid + Email + Is Contact + Is Principal Investigator + Is Operator + Metadata Schema ID @@ -905,7 +913,7 @@ export function CollectionForm (props){ )}
- Please referto the contributor file schema information, and this Example TSV File + Please refer to the contributor file schema information, and this Example TSV File