Support #35422 - Add vernacular name to organism (#1489)

* Support #35422 - Add vernacular name to organism - Added the field under organism remarks and above the determination section. - Added it to the material sample type. - Added support to the form template. * Support #35422 - Add vernacular name to organism - Fix tests
AAFC-BICoE · Dec 18, 2024 · 8dfb8f0 · 8dfb8f0
1 parent 1a4561e
commit 8dfb8f0
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 0 deletions.
diff --git a/packages/dina-ui/components/collection/material-sample/OrganismStateField.tsx b/packages/dina-ui/components/collection/material-sample/OrganismStateField.tsx
@@ -18,6 +18,7 @@ export const ORGANISM_FIELDS = [
   "lifeStage",
   "sex",
   "remarks",
+  "dwcVernacularName",
   "determination",
   "isTarget",
   "managedAttributes"
@@ -109,6 +110,11 @@ export function OrganismStateField({
             className="col-sm-12"
             multiLines={true}
           />
+          <TextField
+            {...fieldProps("dwcVernacularName")}
+            customName="dwcVernacularName"
+            className="col-sm-12"
+          />
         </div>
         <ManagedAttributesEditor
           valuesPath={fieldProps("managedAttributes").name}

diff --git a/packages/dina-ui/intl/dina-ui-en.ts b/packages/dina-ui/intl/dina-ui-en.ts
@@ -412,6 +412,7 @@ export const DINAUI_MESSAGES_ENGLISH = {
   field_name: "Name",
   field_notPubliclyReleasableReason: "Not Publicly Releasable Reason",
   field_organismRemarks: "Organism Remarks",
+  field_dwcVernacularName: "Vernacular Name",
   field_organismsIndividualEntry: "Individual Organism Entry",
   field_organismsIndividualEntry_tooltip:
     "Leave this OFF to copy the same data for every Organism. Toggle ON to enter different data for each Organism.",

diff --git a/packages/dina-ui/page-tests/collection/form-template/__tests__/edit.test.tsx b/packages/dina-ui/page-tests/collection/form-template/__tests__/edit.test.tsx
@@ -1448,6 +1448,11 @@ const expected = {
               name: "organism[0].remarks",
               visible: false
             },
+            {
+              defaultValue: undefined,
+              name: "organism[0].dwcVernacularName",
+              visible: false
+            },
             {
               defaultValue: undefined,
               name: "organism[0].managedAttributes",

diff --git a/packages/dina-ui/types/collection-api/resources/Organism.ts b/packages/dina-ui/types/collection-api/resources/Organism.ts
@@ -7,6 +7,7 @@ export interface OrganismAttributes {
   lifeStage?: string | null;
   sex?: string | null;
   remarks?: string | null;
+  dwcVernacularName?: string | null;
   isTarget?: boolean | null;
   determination?: Determination[] | null;
   managedAttributes?: ManagedAttributeValues;

diff --git a/packages/dina-ui/types/collection-api/resources/form-legends/MaterialSampleForm.ts b/packages/dina-ui/types/collection-api/resources/form-legends/MaterialSampleForm.ts
@@ -420,6 +420,9 @@ export const MATERIAL_SAMPLE_FORM_LEGEND: FormLegendComponentInformation[] = [
           {
             id: "organism[0].remarks"
           },
+          {
+            id: "organism[0].dwcVernacularName"
+          },
           {
             id: "organism[0].managedAttributes"
           }
-Original file line number
+Diff line change
@@ Expand Up @@
               {
                 id: "organism[0].remarks"
               },
+              {
+                id: "organism[0].dwcVernacularName"
+              },
               {
                 id: "organism[0].managedAttributes"
               }
@@ Expand Down @@