From a13e8d660079df5bb304d9c79b80e79057b32dd1 Mon Sep 17 00:00:00 2001
From: HangLe <hannyle91@gmail.com>
Date: Fri, 3 Sep 2021 16:46:43 +0300
Subject: [PATCH 1/4] Add Title to linking accessionIds

---
 .../WizardFillObjectDetailsForm.js            |  5 +-
 .../WizardForms/WizardJSONSchemaParser.js     | 60 +++++++++++--------
 2 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/src/components/NewDraftWizard/WizardForms/WizardFillObjectDetailsForm.js b/src/components/NewDraftWizard/WizardForms/WizardFillObjectDetailsForm.js
index 7ce40514..f4f254f3 100644
--- a/src/components/NewDraftWizard/WizardForms/WizardFillObjectDetailsForm.js
+++ b/src/components/NewDraftWizard/WizardForms/WizardFillObjectDetailsForm.js
@@ -488,7 +488,10 @@ const WizardFillObjectDetailsForm = (): React$Element<typeof Container> => {
 
   const getAccessionIds = (objectType: string) => {
     const submissions = metadataObjects?.filter(obj => obj.schema.toLowerCase() === objectType)
-    const accessionIds = submissions?.map(obj => obj.accessionId)
+
+    // const accessionIds = submissions?.map(obj => obj.accessionId)
+    const accessionIds = submissions?.map(obj => `${obj.accessionId} - Title: ${obj.tags.displayTitle}`)
+    console.log("accessionIds :>> ", accessionIds)
     return accessionIds
   }
 
diff --git a/src/components/NewDraftWizard/WizardForms/WizardJSONSchemaParser.js b/src/components/NewDraftWizard/WizardForms/WizardJSONSchemaParser.js
index cfde13df..99a3d33c 100644
--- a/src/components/NewDraftWizard/WizardForms/WizardJSONSchemaParser.js
+++ b/src/components/NewDraftWizard/WizardForms/WizardJSONSchemaParser.js
@@ -816,32 +816,40 @@ const FormSelectField = ({
         <Controller
           name={name}
           control={control}
-          render={({ field, fieldState: { error } }) => (
-            <div className={classes.divBaseline}>
-              <ValidationSelectField
-                {...field}
-                label={label}
-                value={field.value || ""}
-                error={!!error}
-                helperText={error?.message}
-                required={required}
-                select
-                SelectProps={{ native: true }}
-              >
-                <option aria-label="None" value="" disabled />
-                {options.map(option => (
-                  <option key={`${name}-${option}`} value={option}>
-                    {option}
-                  </option>
-                ))}
-              </ValidationSelectField>
-              {description && (
-                <FieldTooltip title={description} placement="top" arrow>
-                  <HelpOutlineIcon className={classes.fieldTip} />
-                </FieldTooltip>
-              )}
-            </div>
-          )}
+          render={({ field, fieldState: { error } }) => {
+            let accessionId = null
+            if (field.value?.includes("Title")) {
+              const hyphenIndex = field.value.indexOf("-")
+              accessionId = field.value.slice(0, hyphenIndex - 1)
+            }
+
+            return (
+              <div className={classes.divBaseline}>
+                <ValidationSelectField
+                  {...field}
+                  label={label}
+                  value={accessionId || field.value || ""}
+                  error={!!error}
+                  helperText={error?.message}
+                  required={required}
+                  select
+                  SelectProps={{ native: true }}
+                >
+                  <option aria-label="None" value="" disabled />
+                  {options.map(option => (
+                    <option key={`${name}-${option}`} value={option}>
+                      {option}
+                    </option>
+                  ))}
+                </ValidationSelectField>
+                {description && (
+                  <FieldTooltip title={description} placement="top" arrow>
+                    <HelpOutlineIcon className={classes.fieldTip} />
+                  </FieldTooltip>
+                )}
+              </div>
+            )
+          }}
         />
       )
     }}

From b111f4c6509f959ab9e11f71b3208b23a78cab4f Mon Sep 17 00:00:00 2001
From: HangLe <hannyle91@gmail.com>
Date: Mon, 6 Sep 2021 12:39:51 +0300
Subject: [PATCH 2/4] Make linkingAccessionIds selectable and work with Title

---
 .../WizardFillObjectDetailsForm.js            |  4 +---
 .../WizardForms/WizardJSONSchemaParser.js     | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/components/NewDraftWizard/WizardForms/WizardFillObjectDetailsForm.js b/src/components/NewDraftWizard/WizardForms/WizardFillObjectDetailsForm.js
index f4f254f3..5ffb00f3 100644
--- a/src/components/NewDraftWizard/WizardForms/WizardFillObjectDetailsForm.js
+++ b/src/components/NewDraftWizard/WizardForms/WizardFillObjectDetailsForm.js
@@ -488,10 +488,8 @@ const WizardFillObjectDetailsForm = (): React$Element<typeof Container> => {
 
   const getAccessionIds = (objectType: string) => {
     const submissions = metadataObjects?.filter(obj => obj.schema.toLowerCase() === objectType)
-
-    // const accessionIds = submissions?.map(obj => obj.accessionId)
+    // Add "- Title: " to accessionId
     const accessionIds = submissions?.map(obj => `${obj.accessionId} - Title: ${obj.tags.displayTitle}`)
-    console.log("accessionIds :>> ", accessionIds)
     return accessionIds
   }
 
diff --git a/src/components/NewDraftWizard/WizardForms/WizardJSONSchemaParser.js b/src/components/NewDraftWizard/WizardForms/WizardJSONSchemaParser.js
index 99a3d33c..a08ad34d 100644
--- a/src/components/NewDraftWizard/WizardForms/WizardJSONSchemaParser.js
+++ b/src/components/NewDraftWizard/WizardForms/WizardJSONSchemaParser.js
@@ -817,23 +817,28 @@ const FormSelectField = ({
           name={name}
           control={control}
           render={({ field, fieldState: { error } }) => {
-            let accessionId = null
-            if (field.value?.includes("Title")) {
-              const hyphenIndex = field.value.indexOf("-")
-              accessionId = field.value.slice(0, hyphenIndex - 1)
-            }
-
             return (
               <div className={classes.divBaseline}>
                 <ValidationSelectField
                   {...field}
                   label={label}
-                  value={accessionId || field.value || ""}
+                  value={field.value || ""}
                   error={!!error}
                   helperText={error?.message}
                   required={required}
                   select
                   SelectProps={{ native: true }}
+                  onChange={e =>
+                    field.onChange(() => {
+                      const val = e.target.value
+                      // Case: linkingAccessionIds which include "AccessionId + Form's title", we need to return only accessionId as value
+                      if (val?.includes("Title")) {
+                        const hyphenIndex = val.indexOf("-")
+                        return val.slice(0, hyphenIndex - 1)
+                      }
+                      return val
+                    })
+                  }
                 >
                   <option aria-label="None" value="" disabled />
                   {options.map(option => (

From d978b205a06a420d92b574b8385f7dfa5a78a488 Mon Sep 17 00:00:00 2001
From: HangLe <hannyle91@gmail.com>
Date: Mon, 6 Sep 2021 17:39:29 +0300
Subject: [PATCH 3/4] Make Title as required field in form and update cypress
 test

---
 .../integration/linkingAccessionIds.spec.js   | 29 +++++++++++++++++--
 .../WizardFillObjectDetailsForm.js            |  2 +-
 .../WizardForms/WizardJSONSchemaParser.js     |  3 ++
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/cypress/integration/linkingAccessionIds.spec.js b/cypress/integration/linkingAccessionIds.spec.js
index cc500a9e..6cc11680 100644
--- a/cypress/integration/linkingAccessionIds.spec.js
+++ b/cypress/integration/linkingAccessionIds.spec.js
@@ -44,7 +44,8 @@ describe("Linking Accession Ids", function () {
           .should("be.visible")
           .then($btn => $btn.click())
       )
-    cy.get("input[name='sampleName.taxonId']").type(123)
+    cy.get("[data-testid='title']").type("Test Sample title")
+    cy.get("[data-testid='sampleName.taxonId']").type(123)
     // Submit Sample form
     cy.get("button[type=submit]").contains("Submit").click()
     cy.get(".MuiListItem-container", { timeout: 10000 }).should("have.length", 1)
@@ -66,13 +67,16 @@ describe("Linking Accession Ids", function () {
           .should("be.visible")
           .then($btn => $btn.click())
       )
+    cy.get("[data-testid='title']").type("Test Experiment title")
     cy.get("input[name='studyRef.label']").type("Study Label")
 
     // Select studyAccessionId
     cy.get("select[name='studyRef.accessionId']").then($el => {
       const studyAccessionId = cy.get("@studyAccessionId")
+      $el.click()
       $el.select(studyAccessionId)
     })
+    cy.get("select[name='studyRef.accessionId']").should("contain", " - Title:")
 
     cy.get("textarea[name='design.designDescription']").type("Design description")
     cy.get("select[name='design.sampleDescriptor']").select("Individual Sample")
@@ -82,6 +86,7 @@ describe("Linking Accession Ids", function () {
       const sampleAccessionId = cy.get("@sampleAccessionId")
       $el.select(sampleAccessionId)
     })
+    cy.get("select[name='design.sampleDescriptor.accessionId']").should("contain", " - Title:")
 
     cy.get("select[name='design.libraryDescriptor.libraryStrategy']").select("AMPLICON")
     cy.get("select[name='design.libraryDescriptor.librarySource']").select("GENOMIC")
@@ -107,6 +112,7 @@ describe("Linking Accession Ids", function () {
           .should("be.visible")
           .then($btn => $btn.click())
       )
+    cy.get("[data-testid='title']").type("Test Run title")
     cy.get("h2[data-testid='experimentRef']").parent().children("button").click()
     cy.get("[data-testid='experimentRef[0].label']").type("Test experiment label ref")
     // Select experimentAccessionId
@@ -114,6 +120,7 @@ describe("Linking Accession Ids", function () {
       const experimentAccessionId = cy.get("@experimentAccessionId")
       $el.select(experimentAccessionId)
     })
+    cy.get("select[name='experimentRef[0].accessionId']").should("contain", " - Title:")
 
     // Submit Run form
     cy.get("button[type=submit]").contains("Submit").click()
@@ -136,6 +143,7 @@ describe("Linking Accession Ids", function () {
           .should("be.visible")
           .then($btn => $btn.click())
       )
+    cy.get("[data-testid='title']").type("Test Analysis title")
     cy.get("select[name='analysisType']").select("Reference Alignment")
     cy.get("select[name='analysisType.referenceAlignment.assembly']").select("Standard")
     cy.get("input[name='analysisType.referenceAlignment.assembly.accessionId']").type("Standard accessionId")
@@ -144,24 +152,32 @@ describe("Linking Accession Ids", function () {
       const studyAccessionId = cy.get("@studyAccessionId")
       $el.select(studyAccessionId)
     })
+    cy.get("select[name='studyRef.accessionId']").should("contain", " - Title:")
+
     // Select experimentAccessionId
     cy.get("div").contains("Experiment Reference").parent().children("button").click()
     cy.get("select[name='experimentRef[0].accessionId']").then($el => {
       const experimentAccessionId = cy.get("@experimentAccessionId")
       $el.select(experimentAccessionId)
     })
+    cy.get("select[name='experimentRef[0].accessionId']").should("contain", " - Title:")
+
     // Select sampleAccessionId
     cy.get("div").contains("Sample Reference").parent().children("button").click()
     cy.get("select[name='sampleRef[0].accessionId']").then($el => {
       const sampleAccessionId = cy.get("@sampleAccessionId")
       $el.select(sampleAccessionId)
     })
+    cy.get("select[name='sampleRef[0].accessionId']").should("contain", " - Title:")
+
     // Select runAccessionId
     cy.get("div").contains("Run Reference").parent().children("button").click()
     cy.get("select[name='runRef[0].accessionId']").then($el => {
       const runAccessionId = cy.get("@runAccessionId")
       $el.select(runAccessionId)
     })
+    cy.get("select[name='runRef[0].accessionId']").should("contain", " - Title:")
+
     // Submit Analysis form
     cy.get("button[type=submit]").contains("Submit").click()
     cy.get(".MuiListItem-container", { timeout: 10000 }).should("have.length", 1)
@@ -173,6 +189,7 @@ describe("Linking Accession Ids", function () {
 
     // Another Analysis form
     cy.get("button[type=button]").contains("New form").click()
+    cy.get("[data-testid='title']").type("Test Analysis title 2")
     cy.get("select[name='analysisType']").select("Reference Alignment")
     cy.get("select[name='analysisType.referenceAlignment.assembly']").select("Standard")
     cy.get("input[name='analysisType.referenceAlignment.assembly.accessionId']").type("Standard accessionId 2")
@@ -183,6 +200,7 @@ describe("Linking Accession Ids", function () {
       const analysisAccessionId = cy.get("@analysisAccessionId")
       $el.select(analysisAccessionId)
     })
+    cy.get("select[name='analysisRef[0].accessionId']").should("contain", " - Title:")
 
     // Submit Analysis form
     cy.get("button[type=submit]").contains("Submit").click()
@@ -229,11 +247,14 @@ describe("Linking Accession Ids", function () {
           .should("be.visible")
           .then($btn => $btn.click())
       )
+    cy.get("[data-testid='title']").type("Test Policy title")
     cy.get("input[name='dacRef.label']").type("Test DAC")
     cy.get("select[name='dacRef.accessionId']").then($el => {
       const dacAccessionId = cy.get("@dacAccessionId")
       $el.select(dacAccessionId)
     })
+    cy.get("select[name='dacRef.accessionId']").should("contain", " - Title:")
+
     cy.get("select[name='policy']").select("Policy Text")
     cy.get("textarea[name='policy.policyText']").type("Test policy text")
     // Submit Policy form
@@ -257,7 +278,7 @@ describe("Linking Accession Ids", function () {
           .then($btn => $btn.click())
       )
 
-    cy.get("input[name='title']").type("Dataset title")
+    cy.get("[data-testid='title']").type("Test Dataset title")
     cy.get("textarea[name='description']").type("Dataset description")
     cy.get("input[name='datasetType']").first().check()
 
@@ -266,6 +287,7 @@ describe("Linking Accession Ids", function () {
       const policyAccessionId = cy.get("@policyAccessionId")
       $el.select(policyAccessionId)
     })
+    cy.get("select[name='policyRef.accessionId']").should("contain", " - Title:")
 
     // Select runAccessionId
     cy.get("div").contains("Run Reference").parent().children("button").click()
@@ -273,6 +295,7 @@ describe("Linking Accession Ids", function () {
       const runAccessionId = cy.get("@runAccessionId")
       $el.select(runAccessionId)
     })
+    cy.get("select[name='runRef[0].accessionId']").should("contain", " - Title:")
 
     // Select analysisAccessionId
     cy.get("div").contains("Analysis Reference").parent().children("button").click()
@@ -280,6 +303,8 @@ describe("Linking Accession Ids", function () {
       const analysisAccessionId = cy.get("@analysisAccessionId")
       $el.select(analysisAccessionId)
     })
+    cy.get("select[name='analysisRef[0].accessionId']").should("contain", " - Title:")
+
     // Submit Dataset form
     cy.get("button[type=submit]").contains("Submit").click()
     cy.get(".MuiListItem-container", { timeout: 10000 }).should("have.length", 1)
diff --git a/src/components/NewDraftWizard/WizardForms/WizardFillObjectDetailsForm.js b/src/components/NewDraftWizard/WizardForms/WizardFillObjectDetailsForm.js
index 5ffb00f3..2c9671c3 100644
--- a/src/components/NewDraftWizard/WizardForms/WizardFillObjectDetailsForm.js
+++ b/src/components/NewDraftWizard/WizardForms/WizardFillObjectDetailsForm.js
@@ -489,7 +489,7 @@ const WizardFillObjectDetailsForm = (): React$Element<typeof Container> => {
   const getAccessionIds = (objectType: string) => {
     const submissions = metadataObjects?.filter(obj => obj.schema.toLowerCase() === objectType)
     // Add "- Title: " to accessionId
-    const accessionIds = submissions?.map(obj => `${obj.accessionId} - Title: ${obj.tags.displayTitle}`)
+    const accessionIds = submissions?.map(obj => `${obj.accessionId} - Title: ${obj.tags?.displayTitle}`)
     return accessionIds
   }
 
diff --git a/src/components/NewDraftWizard/WizardForms/WizardJSONSchemaParser.js b/src/components/NewDraftWizard/WizardForms/WizardJSONSchemaParser.js
index a08ad34d..5834d4a4 100644
--- a/src/components/NewDraftWizard/WizardForms/WizardJSONSchemaParser.js
+++ b/src/components/NewDraftWizard/WizardForms/WizardJSONSchemaParser.js
@@ -228,6 +228,9 @@ const traverseFields = (
             let required = object?.else?.required ?? object.required
             let requireFirstItem = false
 
+            if (path.length === 0 && propertyKey === "title" && !object.title.includes("DAC - Data Access Committee")) {
+              requireFirstItem = true
+            }
             // Require first field of section if parent section is a required property
             if (
               requireFirst ||

From 4ac41fb11f2de8d58f9200e0c4404181d9757f87 Mon Sep 17 00:00:00 2001
From: HangLe <hannyle91@gmail.com>
Date: Tue, 7 Sep 2021 10:20:42 +0300
Subject: [PATCH 4/4] Add special case for DAC form

---
 cypress/integration/linkingAccessionIds.spec.js           | 2 +-
 .../WizardForms/WizardFillObjectDetailsForm.js            | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/cypress/integration/linkingAccessionIds.spec.js b/cypress/integration/linkingAccessionIds.spec.js
index 6cc11680..de6ad913 100644
--- a/cypress/integration/linkingAccessionIds.spec.js
+++ b/cypress/integration/linkingAccessionIds.spec.js
@@ -253,7 +253,7 @@ describe("Linking Accession Ids", function () {
       const dacAccessionId = cy.get("@dacAccessionId")
       $el.select(dacAccessionId)
     })
-    cy.get("select[name='dacRef.accessionId']").should("contain", " - Title:")
+    cy.get("select[name='dacRef.accessionId']").should("contain", " - Main Contact:")
 
     cy.get("select[name='policy']").select("Policy Text")
     cy.get("textarea[name='policy.policyText']").type("Test policy text")
diff --git a/src/components/NewDraftWizard/WizardForms/WizardFillObjectDetailsForm.js b/src/components/NewDraftWizard/WizardForms/WizardFillObjectDetailsForm.js
index 2c9671c3..4b9a5168 100644
--- a/src/components/NewDraftWizard/WizardForms/WizardFillObjectDetailsForm.js
+++ b/src/components/NewDraftWizard/WizardForms/WizardFillObjectDetailsForm.js
@@ -488,8 +488,12 @@ const WizardFillObjectDetailsForm = (): React$Element<typeof Container> => {
 
   const getAccessionIds = (objectType: string) => {
     const submissions = metadataObjects?.filter(obj => obj.schema.toLowerCase() === objectType)
-    // Add "- Title: " to accessionId
-    const accessionIds = submissions?.map(obj => `${obj.accessionId} - Title: ${obj.tags?.displayTitle}`)
+    // Add "- Title: " to accessionId, special case DAC form: add "- Main Contact:"
+    const accessionIds = submissions?.map(obj =>
+      obj.schema === ObjectTypes.dac
+        ? `${obj.accessionId} - Main Contact: ${obj.tags?.displayTitle}`
+        : `${obj.accessionId} - Title: ${obj.tags?.displayTitle}`
+    )
     return accessionIds
   }