Merge pull request #598 from CBIIT/CRDCDH-2291

CRDCDH-2291 Re-enable ORCID in the Submission Request form
CBIIT · Jan 22, 2025 · f2bcc96 · f2bcc96
2 parents 93cad2a + e8f9ef8
commit f2bcc96
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/src/components/Contexts/FormContext.tsx b/src/components/Contexts/FormContext.tsx
@@ -392,11 +392,6 @@ export const FormProvider: FC<ProviderProps> = ({ children, id }: ProviderProps)
         };
       }
 
-      // TODO: Remove in 3.2.0
-      if (questionnaireData.pi) {
-        questionnaireData.pi.ORCID = "";
-      }
-
       setState({
         status: Status.LOADED,
         data: {

diff --git a/src/content/questionnaire/sections/A.tsx b/src/content/questionnaire/sections/A.tsx
@@ -11,7 +11,13 @@ import SectionGroup from "../../../components/Questionnaire/SectionGroup";
 import TextInput from "../../../components/Questionnaire/TextInput";
 import AutocompleteInput from "../../../components/Questionnaire/AutocompleteInput";
 import AddRemoveButton from "../../../components/AddRemoveButton";
-import { filterForNumbers, mapObjectWithKey, validateEmail } from "../../../utils";
+import {
+  filterForNumbers,
+  formatORCIDInput,
+  isValidORCID,
+  mapObjectWithKey,
+  validateEmail,
+} from "../../../utils";
 import TransitionGroupWrapper from "../../../components/Questionnaire/TransitionGroupWrapper";
 import { InitialQuestionnaire } from "../../../config/InitialValues";
 import SectionMetadata from "../../../config/SectionMetadata";
@@ -83,9 +89,6 @@ const FormSectionA: FC<FormSectionProps> = ({ SectionOption, refs }: FormSection
       combinedData.primaryContact = null;
     }
 
-    // TODO: Remove in 3.2.0
-    combinedData.pi.ORCID = "";
-
     return { ref: formRef, data: combinedData };
   };
 
@@ -174,6 +177,17 @@ const FormSectionA: FC<FormSectionProps> = ({ SectionOption, refs }: FormSection
           required
           readOnly={readOnlyInputs}
         />
+        <TextInput
+          id="section-a-pi-orcid"
+          label="ORCID"
+          name="pi[ORCID]"
+          value={pi?.ORCID}
+          placeholder="e.g. 0000-0001-2345-6789"
+          validate={(val) => val?.length === 0 || isValidORCID(val)}
+          filter={formatORCIDInput}
+          errorText="Please provide a valid ORCID"
+          readOnly={readOnlyInputs}
+        />
         <AutocompleteInput
           id="section-a-pi-institution"
           label="Institution"

diff --git a/src/content/questionnaire/sections/Review.tsx b/src/content/questionnaire/sections/Review.tsx
@@ -36,12 +36,6 @@ const StyledDivider = styled(Divider)(() => ({
   marginBottom: "8px",
 }));
 
-const BlankGrid = styled(Grid)(() => ({
-  "&.MuiGrid-item": {
-    paddingTop: 0,
-  },
-}));
-
 /**
  * Form Section Review View
  *
@@ -132,7 +126,7 @@ const FormSectionReview: FC<FormSectionProps> = ({ SectionOption, refs }: FormSe
             label="Institution Name"
             value={pi.institution}
           />
-          <BlankGrid md={6} xs={12} item />
+          <ReviewDataListingProperty idPrefix="review-pi-orcid" label="ORCID" value={pi.ORCID} />
           <ReviewDataListingProperty
             idPrefix="review-pi-institution-address"
             label="Institution Address"