From ade8508e1c89be8276326afc079035ccc5206a1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Fri, 26 Jul 2024 09:10:44 -0300
Subject: [PATCH 01/52] chore: remove comment

---
 .../collection-form/top-fields-section/TopFieldsSection.tsx      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/sections/create-collection/collection-form/top-fields-section/TopFieldsSection.tsx b/src/sections/create-collection/collection-form/top-fields-section/TopFieldsSection.tsx
index 2ae6ee826..543a485f5 100644
--- a/src/sections/create-collection/collection-form/top-fields-section/TopFieldsSection.tsx
+++ b/src/sections/create-collection/collection-form/top-fields-section/TopFieldsSection.tsx
@@ -147,7 +147,6 @@ export const TopFieldsSection = () => {
                   isInvalid={invalid}
                   ref={ref}
                   disabled>
-                  {/* TODO:ME What are this options? do they come from a configuration? */}
                   <option value="">Select...</option>
                   {Object.values(collectionStorageOptions).map((type) => (
                     <option value={type} key={type}>

From e9a9755ab8bc50c19795718beb5d6389ce5febef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Fri, 26 Jul 2024 11:39:56 -0300
Subject: [PATCH 02/52] feat: initial work, use fields from root functionality

---
 src/collection/domain/models/Collection.ts    |  7 ++
 .../domain/useCases/DTOs/CollectionDTO.ts     | 11 +++
 .../domain/models/MetadataBlockInfo.ts        | 11 +++
 .../create-collection/CreateCollection.tsx    |  4 +-
 .../collection-form/CollectionForm.tsx        |  7 +-
 .../MetadataFieldsFromRootCheckbox.tsx        | 90 +++++++++++++++++++
 .../MetadataFieldsSection.tsx                 | 36 +++++++-
 .../InputLevelField.tsx                       |  7 ++
 .../MetadataInputLevelFieldsBlock.tsx         | 48 ++++++++++
 9 files changed, 214 insertions(+), 7 deletions(-)
 create mode 100644 src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsFromRootCheckbox.tsx
 create mode 100644 src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/InputLevelField.tsx
 create mode 100644 src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx

diff --git a/src/collection/domain/models/Collection.ts b/src/collection/domain/models/Collection.ts
index 003250eff..885c0a13a 100644
--- a/src/collection/domain/models/Collection.ts
+++ b/src/collection/domain/models/Collection.ts
@@ -7,4 +7,11 @@ export interface Collection {
   isReleased: boolean
   description?: string
   affiliation?: string
+  inputLevels?: CollectionInputLevel[]
+}
+
+export interface CollectionInputLevel {
+  datasetFieldName: string
+  include: boolean
+  required: boolean
 }
diff --git a/src/collection/domain/useCases/DTOs/CollectionDTO.ts b/src/collection/domain/useCases/DTOs/CollectionDTO.ts
index 1e32dc172..a6728733a 100644
--- a/src/collection/domain/useCases/DTOs/CollectionDTO.ts
+++ b/src/collection/domain/useCases/DTOs/CollectionDTO.ts
@@ -3,6 +3,11 @@ export interface CollectionDTO {
   name: string
   contacts: string[]
   type: CollectionType
+  affiliation?: string
+  description?: string
+  metadataBlockNames?: string[]
+  facetIds?: string[]
+  inputLevels?: CollectionInputLevelDTO[]
 }
 
 export enum CollectionType {
@@ -17,6 +22,12 @@ export enum CollectionType {
   DEPARTMENT = 'DEPARTMENT'
 }
 
+export interface CollectionInputLevelDTO {
+  datasetFieldName: string
+  include: boolean
+  required: boolean
+}
+
 export const collectionTypeOptions = {
   RESEARCHERS: {
     label: 'Researchers',
diff --git a/src/metadata-block-info/domain/models/MetadataBlockInfo.ts b/src/metadata-block-info/domain/models/MetadataBlockInfo.ts
index 4e2cd657d..9ace52756 100644
--- a/src/metadata-block-info/domain/models/MetadataBlockInfo.ts
+++ b/src/metadata-block-info/domain/models/MetadataBlockInfo.ts
@@ -8,6 +8,17 @@ export interface MetadataBlockInfo {
   displayOnCreate: boolean
 }
 
+export enum MetadataBlockName {
+  CITATION = 'citation',
+  GEOSPATIAL = 'geospatial',
+  ASTROPHYSICS = 'astrophysics',
+  BIOMEDICAL = 'biomedical',
+  CODE_META = 'codeMeta20',
+  COMPUTATIONAL_WORKFLOW = 'computationalworkflow',
+  JOURNAL = 'journal',
+  SOCIAL_SCIENCE = 'socialscience'
+}
+
 export interface MetadataBlockInfoWithMaybeValues extends MetadataBlockInfo {
   metadataFields: Record<string, MetadataFieldWithMaybeValue>
 }
diff --git a/src/sections/create-collection/CreateCollection.tsx b/src/sections/create-collection/CreateCollection.tsx
index 9db15db0c..426896f21 100644
--- a/src/sections/create-collection/CreateCollection.tsx
+++ b/src/sections/create-collection/CreateCollection.tsx
@@ -10,6 +10,7 @@ import { CollectionForm, CollectionFormData } from './collection-form/Collection
 import { SeparationLine } from '../shared/layout/SeparationLine/SeparationLine'
 import { PageNotFound } from '../page-not-found/PageNotFound'
 import { CreateCollectionSkeleton } from './CreateCollectionSkeleton'
+import { USE_FIELDS_FROM_ROOT_NAME } from './collection-form/metadata-fields-section/MetadataFieldsFromRootCheckbox'
 
 interface CreateCollectionProps {
   ownerCollectionId: string
@@ -51,7 +52,8 @@ export function CreateCollection({
     contacts: [{ value: user?.email ?? '' }],
     affiliation: user?.affiliation ?? '',
     storage: 'Local (Default)',
-    description: ''
+    description: '',
+    [USE_FIELDS_FROM_ROOT_NAME]: true
   }
 
   return (
diff --git a/src/sections/create-collection/collection-form/CollectionForm.tsx b/src/sections/create-collection/collection-form/CollectionForm.tsx
index 151372002..1ac62b672 100644
--- a/src/sections/create-collection/collection-form/CollectionForm.tsx
+++ b/src/sections/create-collection/collection-form/CollectionForm.tsx
@@ -14,6 +14,7 @@ import { TopFieldsSection } from './top-fields-section/TopFieldsSection'
 import { MetadataFieldsSection } from './metadata-fields-section/MetadataFieldsSection'
 import { BrowseSearchFacetsSection } from './browse-search-facets-section/BrowseSearchFacetsSection'
 import styles from './CollectionForm.module.scss'
+import { USE_FIELDS_FROM_ROOT_NAME } from './metadata-fields-section/MetadataFieldsFromRootCheckbox'
 
 export interface CollectionFormProps {
   collectionRepository: CollectionRepository
@@ -30,6 +31,7 @@ export type CollectionFormData = {
   type: CollectionType | ''
   description: string
   contacts: { value: string }[]
+  [USE_FIELDS_FROM_ROOT_NAME]: boolean
 }
 // On the submit function callback, type is CollectionType as type field is required and wont never be ""
 export type CollectionFormValuesOnSubmit = Omit<CollectionFormData, 'type'> & {
@@ -124,9 +126,10 @@ export const CollectionForm = ({
           </Stack>
 
           <Stack direction="horizontal" className="pt-3">
-            <Button type="submit" disabled={disableSubmitButton}>
+            <Button type="submit">{t('formButtons.save')}</Button>
+            {/* <Button type="submit" disabled={disableSubmitButton}>
               {t('formButtons.save')}
-            </Button>
+            </Button> */}
             <Button
               variant="secondary"
               type="button"
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsFromRootCheckbox.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsFromRootCheckbox.tsx
new file mode 100644
index 000000000..995c8e5b8
--- /dev/null
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsFromRootCheckbox.tsx
@@ -0,0 +1,90 @@
+import { ChangeEvent, useId, useState } from 'react'
+import { Controller, UseControllerProps, useFormContext } from 'react-hook-form'
+import { Alert, Button, Form, Modal } from '@iqss/dataverse-design-system'
+
+export const USE_FIELDS_FROM_ROOT_NAME = 'useFieldsFromRoot'
+
+export const MetadataFieldsFromRootCheckbox = () => {
+  const checkboxID = useId()
+  const { control, setValue } = useFormContext()
+  const [showResetConfirmationModal, setShowResetConfirmationModal] = useState(false)
+
+  const handleContinueWithReset = () => {
+    setValue(USE_FIELDS_FROM_ROOT_NAME, true)
+    closeModal()
+  }
+
+  const openModal = () => setShowResetConfirmationModal(true)
+  const closeModal = () => setShowResetConfirmationModal(false)
+
+  const rules: UseControllerProps['rules'] = {}
+
+  return (
+    <>
+      <Controller
+        name={USE_FIELDS_FROM_ROOT_NAME}
+        control={control}
+        rules={rules}
+        render={({ field: { onChange, ref, value }, fieldState: { invalid, error } }) => {
+          const handleChange = (e: ChangeEvent<HTMLInputElement>) => {
+            // Only if trying to check the checkbox, open the modal to confirm the reset
+            if (e.target.checked) {
+              openModal()
+            } else {
+              onChange(e)
+            }
+          }
+          return (
+            <Form.Group.Checkbox
+              id={checkboxID}
+              onChange={handleChange}
+              name={USE_FIELDS_FROM_ROOT_NAME}
+              label="Use metadata fields from Root"
+              checked={value as boolean}
+              isInvalid={invalid}
+              invalidFeedback={error?.message}
+              ref={ref}
+            />
+          )
+        }}
+      />
+
+      <ConfirmResetModificationsModal
+        showModal={showResetConfirmationModal}
+        onContinue={handleContinueWithReset}
+        onCancel={closeModal}
+      />
+    </>
+  )
+}
+
+interface ConfirmResetModificationsModalProps {
+  showModal: boolean
+  onContinue: () => void
+  onCancel: () => void
+}
+
+const ConfirmResetModificationsModal = ({
+  showModal,
+  onContinue,
+  onCancel
+}: ConfirmResetModificationsModalProps) => (
+  <Modal show={showModal} onHide={onCancel} size="xl">
+    <Modal.Header>
+      <Modal.Title>Reset Modifications</Modal.Title>
+    </Modal.Header>
+    <Modal.Body>
+      {/* <AlertIcon */}
+      <Alert variant="warning" dismissible={false}>
+        Are you sure you want to reset the selected metadata fields? If you do this, any
+        customizations (hidden, required, optional) you have done will no longer appear.
+      </Alert>
+    </Modal.Body>
+    <Modal.Footer>
+      <Button onClick={onContinue}>Continue</Button>
+      <Button variant="secondary" onClick={onCancel}>
+        Cancel
+      </Button>
+    </Modal.Footer>
+  </Modal>
+)
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx
index 8395ea535..f2e58d0cc 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx
@@ -1,5 +1,8 @@
 import { useTranslation } from 'react-i18next'
-import { Alert, Col, Form, Row } from '@iqss/dataverse-design-system'
+import { Col, Form, Row, Stack } from '@iqss/dataverse-design-system'
+import { MetadataInputLevelFieldsBlock } from './metadata-input-level-fields-block/MetadataInputLevelFieldsBlock'
+import { MetadataFieldsFromRootCheckbox } from './MetadataFieldsFromRootCheckbox'
+import { MetadataBlockName } from '../../../../metadata-block-info/domain/models/MetadataBlockInfo'
 
 export const MetadataFieldsSection = () => {
   const { t } = useTranslation('createCollection')
@@ -12,9 +15,34 @@ export const MetadataFieldsSection = () => {
       <Col lg={9}>
         <Form.Group.Text>{t('fields.metadataFields.helperText')}</Form.Group.Text>
         <Col className="mt-3">
-          <Alert variant="info" dismissible={false} customHeading="Coming soon">
-            Work in progress
-          </Alert>
+          <Stack gap={2}>
+            <MetadataFieldsFromRootCheckbox />
+
+            <MetadataInputLevelFieldsBlock
+              name={MetadataBlockName.CITATION}
+              blockDisplayName="Citation Metadata (Required)"
+            />
+            <MetadataInputLevelFieldsBlock
+              name={MetadataBlockName.GEOSPATIAL}
+              blockDisplayName="Geospatial Metadata"
+            />
+            <MetadataInputLevelFieldsBlock
+              name={MetadataBlockName.SOCIAL_SCIENCE}
+              blockDisplayName="Social Science and Humanities Metadata"
+            />
+            <MetadataInputLevelFieldsBlock
+              name={MetadataBlockName.ASTROPHYSICS}
+              blockDisplayName="Astronomy and Astrophysics Metadata"
+            />
+            <MetadataInputLevelFieldsBlock
+              name={MetadataBlockName.BIOMEDICAL}
+              blockDisplayName="Life Sciences Metadata"
+            />
+            <MetadataInputLevelFieldsBlock
+              name={MetadataBlockName.JOURNAL}
+              blockDisplayName="Journal Metadata"
+            />
+          </Stack>
         </Col>
       </Col>
     </Row>
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/InputLevelField.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/InputLevelField.tsx
new file mode 100644
index 000000000..6cefa1e9f
--- /dev/null
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/InputLevelField.tsx
@@ -0,0 +1,7 @@
+export const InputLevelField = () => {
+  return (
+    <div>
+      <span>InputLevelField</span>
+    </div>
+  )
+}
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
new file mode 100644
index 000000000..f437c39d9
--- /dev/null
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
@@ -0,0 +1,48 @@
+import { useId } from 'react'
+import { Controller, UseControllerProps, useFormContext, useWatch } from 'react-hook-form'
+import { Form } from '@iqss/dataverse-design-system'
+import { CollectionInputLevel } from '../../../../../collection/domain/models/Collection'
+import { MetadataBlockName } from '../../../../../metadata-block-info/domain/models/MetadataBlockInfo'
+import { USE_FIELDS_FROM_ROOT_NAME } from '../MetadataFieldsFromRootCheckbox'
+
+interface MetadataInputLevelFieldsBlockProps {
+  name: MetadataBlockName
+  blockDisplayName: string
+  inputLevels?: CollectionInputLevel[]
+}
+
+export const MetadataInputLevelFieldsBlock = ({
+  name,
+  blockDisplayName,
+  inputLevels
+}: MetadataInputLevelFieldsBlockProps) => {
+  const checkboxID = useId()
+  const { control } = useFormContext()
+  const useFieldsFromRootFieldValue = useWatch({ name: USE_FIELDS_FROM_ROOT_NAME }) as boolean
+
+  const rules: UseControllerProps['rules'] = {}
+  //   metadataBlockNames
+  return (
+    <>
+      <Controller
+        name={name}
+        control={control}
+        rules={rules}
+        render={({ field: { onChange, ref, value }, fieldState: { invalid, error } }) => (
+          <Form.Group.Checkbox
+            // required
+            id={checkboxID}
+            onChange={onChange}
+            name={name}
+            label={blockDisplayName}
+            checked={value as boolean}
+            isInvalid={invalid}
+            ref={ref}
+            invalidFeedback={error?.message}
+            disabled={useFieldsFromRootFieldValue}
+          />
+        )}
+      />
+    </>
+  )
+}

From b8f98f124a83d85538bd3926272f9afc3c833c63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Fri, 26 Jul 2024 12:16:10 -0300
Subject: [PATCH 03/52] feat: files refactor, reset values functionality

---
 .../create-collection/CreateCollection.tsx    | 13 ++++-
 .../collection-form/CollectionForm.tsx        |  9 +++-
 .../MetadataFieldsSection.tsx                 |  4 +-
 .../ConfirmResetModificationsModal.tsx        | 31 ++++++++++++
 .../FieldsFromRootCheckbox.tsx}               | 50 +++++++------------
 .../MetadataInputLevelFieldsBlock.tsx         | 18 ++++---
 6 files changed, 79 insertions(+), 46 deletions(-)
 create mode 100644 src/sections/create-collection/collection-form/metadata-fields-section/fields-from-root-checkbox/ConfirmResetModificationsModal.tsx
 rename src/sections/create-collection/collection-form/metadata-fields-section/{MetadataFieldsFromRootCheckbox.tsx => fields-from-root-checkbox/FieldsFromRootCheckbox.tsx} (63%)

diff --git a/src/sections/create-collection/CreateCollection.tsx b/src/sections/create-collection/CreateCollection.tsx
index 426896f21..7f3e654cc 100644
--- a/src/sections/create-collection/CreateCollection.tsx
+++ b/src/sections/create-collection/CreateCollection.tsx
@@ -10,7 +10,8 @@ import { CollectionForm, CollectionFormData } from './collection-form/Collection
 import { SeparationLine } from '../shared/layout/SeparationLine/SeparationLine'
 import { PageNotFound } from '../page-not-found/PageNotFound'
 import { CreateCollectionSkeleton } from './CreateCollectionSkeleton'
-import { USE_FIELDS_FROM_ROOT_NAME } from './collection-form/metadata-fields-section/MetadataFieldsFromRootCheckbox'
+import { USE_FIELDS_FROM_ROOT_NAME } from './collection-form/metadata-fields-section/fields-from-root-checkbox/FieldsFromRootCheckbox'
+import { METADATA_BLOCKS_NAMES_GROUPER } from './collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock'
 
 interface CreateCollectionProps {
   ownerCollectionId: string
@@ -53,7 +54,15 @@ export function CreateCollection({
     affiliation: user?.affiliation ?? '',
     storage: 'Local (Default)',
     description: '',
-    [USE_FIELDS_FROM_ROOT_NAME]: true
+    [USE_FIELDS_FROM_ROOT_NAME]: true,
+    [METADATA_BLOCKS_NAMES_GROUPER]: {
+      citation: true,
+      geospatial: false,
+      socialscience: false,
+      astrophysics: false,
+      biomedical: false,
+      journal: false
+    }
   }
 
   return (
diff --git a/src/sections/create-collection/collection-form/CollectionForm.tsx b/src/sections/create-collection/collection-form/CollectionForm.tsx
index 1ac62b672..1100d1d8e 100644
--- a/src/sections/create-collection/collection-form/CollectionForm.tsx
+++ b/src/sections/create-collection/collection-form/CollectionForm.tsx
@@ -13,8 +13,10 @@ import { SubmissionStatus, useSubmitCollection } from './useSubmitCollection'
 import { TopFieldsSection } from './top-fields-section/TopFieldsSection'
 import { MetadataFieldsSection } from './metadata-fields-section/MetadataFieldsSection'
 import { BrowseSearchFacetsSection } from './browse-search-facets-section/BrowseSearchFacetsSection'
+import { USE_FIELDS_FROM_ROOT_NAME } from './metadata-fields-section/fields-from-root-checkbox/FieldsFromRootCheckbox'
+import { METADATA_BLOCKS_NAMES_GROUPER } from './metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock'
+import { MetadataBlockName } from '../../../metadata-block-info/domain/models/MetadataBlockInfo'
 import styles from './CollectionForm.module.scss'
-import { USE_FIELDS_FROM_ROOT_NAME } from './metadata-fields-section/MetadataFieldsFromRootCheckbox'
 
 export interface CollectionFormProps {
   collectionRepository: CollectionRepository
@@ -32,6 +34,10 @@ export type CollectionFormData = {
   description: string
   contacts: { value: string }[]
   [USE_FIELDS_FROM_ROOT_NAME]: boolean
+  [METADATA_BLOCKS_NAMES_GROUPER]: Omit<
+    Record<MetadataBlockName, boolean>,
+    'codeMeta20' | 'computationalworkflow'
+  >
 }
 // On the submit function callback, type is CollectionType as type field is required and wont never be ""
 export type CollectionFormValuesOnSubmit = Omit<CollectionFormData, 'type'> & {
@@ -85,7 +91,6 @@ export const CollectionForm = ({
     return submissionStatus === SubmissionStatus.IsSubmitting || !formState.isDirty
   }, [submissionStatus, formState.isDirty])
 
-  // TODO:ME Apply max width to container
   return (
     <div
       className={styles['form-container']}
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx
index f2e58d0cc..35f35cd3f 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx
@@ -1,7 +1,7 @@
 import { useTranslation } from 'react-i18next'
 import { Col, Form, Row, Stack } from '@iqss/dataverse-design-system'
 import { MetadataInputLevelFieldsBlock } from './metadata-input-level-fields-block/MetadataInputLevelFieldsBlock'
-import { MetadataFieldsFromRootCheckbox } from './MetadataFieldsFromRootCheckbox'
+import { FieldsFromRootCheckbox } from './fields-from-root-checkbox/FieldsFromRootCheckbox'
 import { MetadataBlockName } from '../../../../metadata-block-info/domain/models/MetadataBlockInfo'
 
 export const MetadataFieldsSection = () => {
@@ -16,7 +16,7 @@ export const MetadataFieldsSection = () => {
         <Form.Group.Text>{t('fields.metadataFields.helperText')}</Form.Group.Text>
         <Col className="mt-3">
           <Stack gap={2}>
-            <MetadataFieldsFromRootCheckbox />
+            <FieldsFromRootCheckbox />
 
             <MetadataInputLevelFieldsBlock
               name={MetadataBlockName.CITATION}
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-root-checkbox/ConfirmResetModificationsModal.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-root-checkbox/ConfirmResetModificationsModal.tsx
new file mode 100644
index 000000000..619b597c1
--- /dev/null
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-root-checkbox/ConfirmResetModificationsModal.tsx
@@ -0,0 +1,31 @@
+import { Alert, Button, Modal } from '@iqss/dataverse-design-system'
+
+interface ConfirmResetModificationsModalProps {
+  showModal: boolean
+  onContinue: () => void
+  onCancel: () => void
+}
+
+export const ConfirmResetModificationsModal = ({
+  showModal,
+  onContinue,
+  onCancel
+}: ConfirmResetModificationsModalProps) => (
+  <Modal show={showModal} onHide={onCancel} size="xl">
+    <Modal.Header>
+      <Modal.Title>Reset Modifications</Modal.Title>
+    </Modal.Header>
+    <Modal.Body>
+      <Alert variant="warning" dismissible={false}>
+        Are you sure you want to reset the selected metadata fields? If you do this, any
+        customizations (hidden, required, optional) you have done will no longer appear.
+      </Alert>
+    </Modal.Body>
+    <Modal.Footer>
+      <Button onClick={onContinue}>Continue</Button>
+      <Button variant="secondary" onClick={onCancel}>
+        Cancel
+      </Button>
+    </Modal.Footer>
+  </Modal>
+)
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsFromRootCheckbox.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-root-checkbox/FieldsFromRootCheckbox.tsx
similarity index 63%
rename from src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsFromRootCheckbox.tsx
rename to src/sections/create-collection/collection-form/metadata-fields-section/fields-from-root-checkbox/FieldsFromRootCheckbox.tsx
index 995c8e5b8..a0a921075 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsFromRootCheckbox.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-root-checkbox/FieldsFromRootCheckbox.tsx
@@ -1,16 +1,31 @@
 import { ChangeEvent, useId, useState } from 'react'
 import { Controller, UseControllerProps, useFormContext } from 'react-hook-form'
-import { Alert, Button, Form, Modal } from '@iqss/dataverse-design-system'
+import { Form } from '@iqss/dataverse-design-system'
+import { MetadataBlockName } from '../../../../../metadata-block-info/domain/models/MetadataBlockInfo'
+import { METADATA_BLOCKS_NAMES_GROUPER } from '../metadata-input-level-fields-block/MetadataInputLevelFieldsBlock'
+import { ConfirmResetModificationsModal } from './ConfirmResetModificationsModal'
 
 export const USE_FIELDS_FROM_ROOT_NAME = 'useFieldsFromRoot'
+const ALL_INPUT_LEVEL_FIELDS_EXCEPT_CITATION = [
+  MetadataBlockName.GEOSPATIAL,
+  MetadataBlockName.SOCIAL_SCIENCE,
+  MetadataBlockName.ASTROPHYSICS,
+  MetadataBlockName.BIOMEDICAL,
+  MetadataBlockName.JOURNAL
+]
 
-export const MetadataFieldsFromRootCheckbox = () => {
+export const FieldsFromRootCheckbox = () => {
   const checkboxID = useId()
   const { control, setValue } = useFormContext()
   const [showResetConfirmationModal, setShowResetConfirmationModal] = useState(false)
 
   const handleContinueWithReset = () => {
     setValue(USE_FIELDS_FROM_ROOT_NAME, true)
+
+    ALL_INPUT_LEVEL_FIELDS_EXCEPT_CITATION.forEach((blockName) => {
+      setValue(`${METADATA_BLOCKS_NAMES_GROUPER}.${blockName}`, false)
+    })
+
     closeModal()
   }
 
@@ -57,34 +72,3 @@ export const MetadataFieldsFromRootCheckbox = () => {
     </>
   )
 }
-
-interface ConfirmResetModificationsModalProps {
-  showModal: boolean
-  onContinue: () => void
-  onCancel: () => void
-}
-
-const ConfirmResetModificationsModal = ({
-  showModal,
-  onContinue,
-  onCancel
-}: ConfirmResetModificationsModalProps) => (
-  <Modal show={showModal} onHide={onCancel} size="xl">
-    <Modal.Header>
-      <Modal.Title>Reset Modifications</Modal.Title>
-    </Modal.Header>
-    <Modal.Body>
-      {/* <AlertIcon */}
-      <Alert variant="warning" dismissible={false}>
-        Are you sure you want to reset the selected metadata fields? If you do this, any
-        customizations (hidden, required, optional) you have done will no longer appear.
-      </Alert>
-    </Modal.Body>
-    <Modal.Footer>
-      <Button onClick={onContinue}>Continue</Button>
-      <Button variant="secondary" onClick={onCancel}>
-        Cancel
-      </Button>
-    </Modal.Footer>
-  </Modal>
-)
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
index f437c39d9..ad7ed6bac 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
@@ -3,7 +3,9 @@ import { Controller, UseControllerProps, useFormContext, useWatch } from 'react-
 import { Form } from '@iqss/dataverse-design-system'
 import { CollectionInputLevel } from '../../../../../collection/domain/models/Collection'
 import { MetadataBlockName } from '../../../../../metadata-block-info/domain/models/MetadataBlockInfo'
-import { USE_FIELDS_FROM_ROOT_NAME } from '../MetadataFieldsFromRootCheckbox'
+import { USE_FIELDS_FROM_ROOT_NAME } from '../fields-from-root-checkbox/FieldsFromRootCheckbox'
+
+export const METADATA_BLOCKS_NAMES_GROUPER = 'metadataBlockNames'
 
 interface MetadataInputLevelFieldsBlockProps {
   name: MetadataBlockName
@@ -20,26 +22,28 @@ export const MetadataInputLevelFieldsBlock = ({
   const { control } = useFormContext()
   const useFieldsFromRootFieldValue = useWatch({ name: USE_FIELDS_FROM_ROOT_NAME }) as boolean
 
+  const isCitation = name === MetadataBlockName.CITATION
+
   const rules: UseControllerProps['rules'] = {}
-  //   metadataBlockNames
+  const withGroupName = `${METADATA_BLOCKS_NAMES_GROUPER}.${name}`
+
   return (
     <>
       <Controller
-        name={name}
+        name={withGroupName}
         control={control}
         rules={rules}
         render={({ field: { onChange, ref, value }, fieldState: { invalid, error } }) => (
           <Form.Group.Checkbox
-            // required
             id={checkboxID}
             onChange={onChange}
-            name={name}
+            name={withGroupName}
             label={blockDisplayName}
             checked={value as boolean}
             isInvalid={invalid}
-            ref={ref}
             invalidFeedback={error?.message}
-            disabled={useFieldsFromRootFieldValue}
+            disabled={isCitation ? true : useFieldsFromRootFieldValue}
+            ref={ref}
           />
         )}
       />

From 8edc586396bdbd8cee2a1e37145d5ffb4a4bc4ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Fri, 26 Jul 2024 12:22:40 -0300
Subject: [PATCH 04/52] feat: move constants to collection form

---
 src/sections/create-collection/CreateCollection.tsx      | 9 ++++++---
 .../create-collection/collection-form/CollectionForm.tsx | 5 +++--
 .../fields-from-root-checkbox/FieldsFromRootCheckbox.tsx | 3 +--
 .../MetadataInputLevelFieldsBlock.tsx                    | 4 +---
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/sections/create-collection/CreateCollection.tsx b/src/sections/create-collection/CreateCollection.tsx
index 7f3e654cc..c040f7788 100644
--- a/src/sections/create-collection/CreateCollection.tsx
+++ b/src/sections/create-collection/CreateCollection.tsx
@@ -6,12 +6,15 @@ import { useLoading } from '../loading/LoadingContext'
 import { useSession } from '../session/SessionContext'
 import { RequiredFieldText } from '../shared/form/RequiredFieldText/RequiredFieldText'
 import { BreadcrumbsGenerator } from '../shared/hierarchy/BreadcrumbsGenerator'
-import { CollectionForm, CollectionFormData } from './collection-form/CollectionForm'
+import {
+  CollectionForm,
+  CollectionFormData,
+  METADATA_BLOCKS_NAMES_GROUPER,
+  USE_FIELDS_FROM_ROOT_NAME
+} from './collection-form/CollectionForm'
 import { SeparationLine } from '../shared/layout/SeparationLine/SeparationLine'
 import { PageNotFound } from '../page-not-found/PageNotFound'
 import { CreateCollectionSkeleton } from './CreateCollectionSkeleton'
-import { USE_FIELDS_FROM_ROOT_NAME } from './collection-form/metadata-fields-section/fields-from-root-checkbox/FieldsFromRootCheckbox'
-import { METADATA_BLOCKS_NAMES_GROUPER } from './collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock'
 
 interface CreateCollectionProps {
   ownerCollectionId: string
diff --git a/src/sections/create-collection/collection-form/CollectionForm.tsx b/src/sections/create-collection/collection-form/CollectionForm.tsx
index 1100d1d8e..971331295 100644
--- a/src/sections/create-collection/collection-form/CollectionForm.tsx
+++ b/src/sections/create-collection/collection-form/CollectionForm.tsx
@@ -13,11 +13,12 @@ import { SubmissionStatus, useSubmitCollection } from './useSubmitCollection'
 import { TopFieldsSection } from './top-fields-section/TopFieldsSection'
 import { MetadataFieldsSection } from './metadata-fields-section/MetadataFieldsSection'
 import { BrowseSearchFacetsSection } from './browse-search-facets-section/BrowseSearchFacetsSection'
-import { USE_FIELDS_FROM_ROOT_NAME } from './metadata-fields-section/fields-from-root-checkbox/FieldsFromRootCheckbox'
-import { METADATA_BLOCKS_NAMES_GROUPER } from './metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock'
 import { MetadataBlockName } from '../../../metadata-block-info/domain/models/MetadataBlockInfo'
 import styles from './CollectionForm.module.scss'
 
+export const METADATA_BLOCKS_NAMES_GROUPER = 'metadataBlockNames'
+export const USE_FIELDS_FROM_ROOT_NAME = 'useFieldsFromRoot'
+
 export interface CollectionFormProps {
   collectionRepository: CollectionRepository
   ownerCollectionId: string
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-root-checkbox/FieldsFromRootCheckbox.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-root-checkbox/FieldsFromRootCheckbox.tsx
index a0a921075..4cd392b3b 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-root-checkbox/FieldsFromRootCheckbox.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-root-checkbox/FieldsFromRootCheckbox.tsx
@@ -2,10 +2,9 @@ import { ChangeEvent, useId, useState } from 'react'
 import { Controller, UseControllerProps, useFormContext } from 'react-hook-form'
 import { Form } from '@iqss/dataverse-design-system'
 import { MetadataBlockName } from '../../../../../metadata-block-info/domain/models/MetadataBlockInfo'
-import { METADATA_BLOCKS_NAMES_GROUPER } from '../metadata-input-level-fields-block/MetadataInputLevelFieldsBlock'
 import { ConfirmResetModificationsModal } from './ConfirmResetModificationsModal'
+import { METADATA_BLOCKS_NAMES_GROUPER, USE_FIELDS_FROM_ROOT_NAME } from '../../CollectionForm'
 
-export const USE_FIELDS_FROM_ROOT_NAME = 'useFieldsFromRoot'
 const ALL_INPUT_LEVEL_FIELDS_EXCEPT_CITATION = [
   MetadataBlockName.GEOSPATIAL,
   MetadataBlockName.SOCIAL_SCIENCE,
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
index ad7ed6bac..021f99d4b 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
@@ -3,9 +3,7 @@ import { Controller, UseControllerProps, useFormContext, useWatch } from 'react-
 import { Form } from '@iqss/dataverse-design-system'
 import { CollectionInputLevel } from '../../../../../collection/domain/models/Collection'
 import { MetadataBlockName } from '../../../../../metadata-block-info/domain/models/MetadataBlockInfo'
-import { USE_FIELDS_FROM_ROOT_NAME } from '../fields-from-root-checkbox/FieldsFromRootCheckbox'
-
-export const METADATA_BLOCKS_NAMES_GROUPER = 'metadataBlockNames'
+import { METADATA_BLOCKS_NAMES_GROUPER, USE_FIELDS_FROM_ROOT_NAME } from '../../CollectionForm'
 
 interface MetadataInputLevelFieldsBlockProps {
   name: MetadataBlockName

From 1f2bde12ea0e025443360aeb238f103c43ccfff6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Fri, 26 Jul 2024 15:55:12 -0300
Subject: [PATCH 05/52] chore: update latest version of js-dataverse

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1bdce50e3..afd8a93e9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.1.0",
       "dependencies": {
         "@faker-js/faker": "7.6.0",
-        "@iqss/dataverse-client-javascript": "2.0.0-pr155.be01a3f",
+        "@iqss/dataverse-client-javascript": "2.0.0-pr162.eee6302",
         "@iqss/dataverse-design-system": "*",
         "@istanbuljs/nyc-config-typescript": "1.0.2",
         "@tanstack/react-table": "8.9.2",
@@ -3610,9 +3610,9 @@
     },
     "node_modules/@iqss/dataverse-client-javascript": {
       "name": "@IQSS/dataverse-client-javascript",
-      "version": "2.0.0-pr155.be01a3f",
-      "resolved": "https://npm.pkg.github.com/download/@IQSS/dataverse-client-javascript/2.0.0-pr155.be01a3f/dea4dac3ef3aab1802b444ccc08326843c530d80",
-      "integrity": "sha512-Q2KhE3JGu3BaTD1TB3l0iQ6yZIvpUOkds8Zk0nezNymm4pL8gjdISomJDUXFFW9tQuAZ0PkXuOEQGmVfzEUKNA==",
+      "version": "2.0.0-pr162.eee6302",
+      "resolved": "https://npm.pkg.github.com/download/@IQSS/dataverse-client-javascript/2.0.0-pr162.eee6302/42f7a97a7234421be7a6a7ac56b9216d288681d0",
+      "integrity": "sha512-YRSvzuP/zyvBS0kh4HIMYqK+r5IetEkmQB14tAKyTL+BrlOLTYQLju1ZHVrYie/hRUpTcM8WbqE4B67FlX2h7g==",
       "license": "MIT",
       "dependencies": {
         "@types/node": "^18.15.11",
diff --git a/package.json b/package.json
index bf43ed983..f9f4c68c8 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@faker-js/faker": "7.6.0",
-    "@iqss/dataverse-client-javascript": "2.0.0-pr155.be01a3f",
+    "@iqss/dataverse-client-javascript": "2.0.0-pr162.eee6302",
     "@iqss/dataverse-design-system": "*",
     "@istanbuljs/nyc-config-typescript": "1.0.2",
     "@tanstack/react-table": "8.9.2",

From 039ccc5d15a5d3a1d9a6eb30e45728675516b402 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Fri, 26 Jul 2024 18:15:20 -0300
Subject: [PATCH 06/52] feat: add inputLevels to mapper

---
 src/collection/infrastructure/mappers/JSCollectionMapper.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/collection/infrastructure/mappers/JSCollectionMapper.ts b/src/collection/infrastructure/mappers/JSCollectionMapper.ts
index e4d036fa3..988946da7 100644
--- a/src/collection/infrastructure/mappers/JSCollectionMapper.ts
+++ b/src/collection/infrastructure/mappers/JSCollectionMapper.ts
@@ -21,7 +21,8 @@ export class JSCollectionMapper {
         jsCollection.name,
         jsCollection.alias,
         jsCollection.isPartOf
-      )
+      ),
+      inputLevels: jsCollection.inputLevels
     }
   }
 

From 8729e1dc77af821524caac36b600dca0badc236b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Fri, 26 Jul 2024 18:16:20 -0300
Subject: [PATCH 07/52] feat: dynamic root text

---
 .../fields-from-root-checkbox/FieldsFromRootCheckbox.tsx     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-root-checkbox/FieldsFromRootCheckbox.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-root-checkbox/FieldsFromRootCheckbox.tsx
index 4cd392b3b..917c7b715 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-root-checkbox/FieldsFromRootCheckbox.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-root-checkbox/FieldsFromRootCheckbox.tsx
@@ -1,5 +1,5 @@
 import { ChangeEvent, useId, useState } from 'react'
-import { Controller, UseControllerProps, useFormContext } from 'react-hook-form'
+import { Controller, UseControllerProps, useFormContext, useWatch } from 'react-hook-form'
 import { Form } from '@iqss/dataverse-design-system'
 import { MetadataBlockName } from '../../../../../metadata-block-info/domain/models/MetadataBlockInfo'
 import { ConfirmResetModificationsModal } from './ConfirmResetModificationsModal'
@@ -17,6 +17,7 @@ export const FieldsFromRootCheckbox = () => {
   const checkboxID = useId()
   const { control, setValue } = useFormContext()
   const [showResetConfirmationModal, setShowResetConfirmationModal] = useState(false)
+  const hostCollectionFieldValue = useWatch({ name: 'hostCollection' }) as string
 
   const handleContinueWithReset = () => {
     setValue(USE_FIELDS_FROM_ROOT_NAME, true)
@@ -53,7 +54,7 @@ export const FieldsFromRootCheckbox = () => {
               id={checkboxID}
               onChange={handleChange}
               name={USE_FIELDS_FROM_ROOT_NAME}
-              label="Use metadata fields from Root"
+              label={`Use metadata fields from ${hostCollectionFieldValue}`}
               checked={value as boolean}
               isInvalid={invalid}
               invalidFeedback={error?.message}

From 8c0834d9a7401d809899cd5b8914d1297c773204 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Fri, 26 Jul 2024 18:17:00 -0300
Subject: [PATCH 08/52] feat: get block names configured on the collection

---
 .../create-collection/CreateCollection.tsx    | 54 ++++++++++++-----
 .../CreateCollectionFactory.tsx               |  3 +
 .../collection-form/CollectionForm.tsx        | 11 ++--
 .../useGetMetadataBlocksNamesInfo.tsx         | 59 +++++++++++++++++++
 4 files changed, 109 insertions(+), 18 deletions(-)
 create mode 100644 src/sections/create-collection/useGetMetadataBlocksNamesInfo.tsx

diff --git a/src/sections/create-collection/CreateCollection.tsx b/src/sections/create-collection/CreateCollection.tsx
index c040f7788..e9d66d398 100644
--- a/src/sections/create-collection/CreateCollection.tsx
+++ b/src/sections/create-collection/CreateCollection.tsx
@@ -1,29 +1,35 @@
 import { useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
+import { useDeepCompareMemo } from 'use-deep-compare'
 import { useCollection } from '../collection/useCollection'
 import { CollectionRepository } from '../../collection/domain/repositories/CollectionRepository'
 import { useLoading } from '../loading/LoadingContext'
 import { useSession } from '../session/SessionContext'
-import { RequiredFieldText } from '../shared/form/RequiredFieldText/RequiredFieldText'
-import { BreadcrumbsGenerator } from '../shared/hierarchy/BreadcrumbsGenerator'
+import { MetadataBlockInfoRepository } from '../../metadata-block-info/domain/repositories/MetadataBlockInfoRepository'
+import { useGetMetadataBlocksNamesInfo } from './useGetMetadataBlocksNamesInfo'
 import {
   CollectionForm,
   CollectionFormData,
+  CollectionFormMetadataBlocks,
   METADATA_BLOCKS_NAMES_GROUPER,
   USE_FIELDS_FROM_ROOT_NAME
 } from './collection-form/CollectionForm'
+import { BreadcrumbsGenerator } from '../shared/hierarchy/BreadcrumbsGenerator'
 import { SeparationLine } from '../shared/layout/SeparationLine/SeparationLine'
+import { RequiredFieldText } from '../shared/form/RequiredFieldText/RequiredFieldText'
 import { PageNotFound } from '../page-not-found/PageNotFound'
 import { CreateCollectionSkeleton } from './CreateCollectionSkeleton'
 
 interface CreateCollectionProps {
   ownerCollectionId: string
   collectionRepository: CollectionRepository
+  metadataBlockInfoRepository: MetadataBlockInfoRepository
 }
 
 export function CreateCollection({
   ownerCollectionId,
-  collectionRepository
+  collectionRepository,
+  metadataBlockInfoRepository
 }: CreateCollectionProps) {
   const { t } = useTranslation('createCollection')
   const { isLoading, setIsLoading } = useLoading()
@@ -34,19 +40,46 @@ export function CreateCollection({
     ownerCollectionId
   )
 
+  const { metadataBlocksNamesInfo, isLoading: isLoadingMetadataBlocksNamesInfo } =
+    useGetMetadataBlocksNamesInfo({
+      collectionId: ownerCollectionId,
+      metadataBlockInfoRepository
+    })
+
+  const defaultBlocksNames = useDeepCompareMemo(
+    () =>
+      metadataBlocksNamesInfo.reduce(
+        (acc, blockName) => {
+          acc[blockName as keyof CollectionFormMetadataBlocks] = true
+          return acc
+        },
+        {
+          citation: false,
+          geospatial: false,
+          socialscience: false,
+          astrophysics: false,
+          biomedical: false,
+          journal: false
+        } as CollectionFormMetadataBlocks
+      ),
+    [metadataBlocksNamesInfo]
+  )
+
   useEffect(() => {
-    if (!isLoadingCollection) {
+    if (!isLoadingCollection && !isLoadingMetadataBlocksNamesInfo) {
       setIsLoading(false)
     }
-  }, [isLoading, isLoadingCollection, setIsLoading])
+  }, [isLoading, isLoadingCollection, isLoadingMetadataBlocksNamesInfo, setIsLoading])
 
   if (!isLoadingCollection && !collection) {
     return <PageNotFound />
   }
 
-  if (isLoadingCollection || !collection) {
+  if (isLoadingCollection || isLoadingMetadataBlocksNamesInfo || !collection) {
     return <CreateCollectionSkeleton />
   }
+  console.log({ collection, metadataBlocksNamesInfo })
+  console.log({ defaultBlocksNames })
 
   const formDefaultValues: CollectionFormData = {
     hostCollection: collection.name,
@@ -58,14 +91,7 @@ export function CreateCollection({
     storage: 'Local (Default)',
     description: '',
     [USE_FIELDS_FROM_ROOT_NAME]: true,
-    [METADATA_BLOCKS_NAMES_GROUPER]: {
-      citation: true,
-      geospatial: false,
-      socialscience: false,
-      astrophysics: false,
-      biomedical: false,
-      journal: false
-    }
+    [METADATA_BLOCKS_NAMES_GROUPER]: defaultBlocksNames
   }
 
   return (
diff --git a/src/sections/create-collection/CreateCollectionFactory.tsx b/src/sections/create-collection/CreateCollectionFactory.tsx
index 7b14b50f6..c9aa326d5 100644
--- a/src/sections/create-collection/CreateCollectionFactory.tsx
+++ b/src/sections/create-collection/CreateCollectionFactory.tsx
@@ -2,8 +2,10 @@ import { ReactElement } from 'react'
 import { useParams } from 'react-router-dom'
 import { CollectionJSDataverseRepository } from '../../collection/infrastructure/repositories/CollectionJSDataverseRepository'
 import { CreateCollection } from './CreateCollection'
+import { MetadataBlockInfoJSDataverseRepository } from '../../metadata-block-info/infrastructure/repositories/MetadataBlockInfoJSDataverseRepository'
 
 const collectionRepository = new CollectionJSDataverseRepository()
+const metadataBlockInfoRepository = new MetadataBlockInfoJSDataverseRepository()
 
 export class CreateCollectionFactory {
   static create(): ReactElement {
@@ -20,6 +22,7 @@ function CreateCollectionWithParams() {
     <CreateCollection
       ownerCollectionId={ownerCollectionId}
       collectionRepository={collectionRepository}
+      metadataBlockInfoRepository={metadataBlockInfoRepository}
       key={ownerCollectionId}
     />
   )
diff --git a/src/sections/create-collection/collection-form/CollectionForm.tsx b/src/sections/create-collection/collection-form/CollectionForm.tsx
index 971331295..ec19cf5fc 100644
--- a/src/sections/create-collection/collection-form/CollectionForm.tsx
+++ b/src/sections/create-collection/collection-form/CollectionForm.tsx
@@ -35,11 +35,14 @@ export type CollectionFormData = {
   description: string
   contacts: { value: string }[]
   [USE_FIELDS_FROM_ROOT_NAME]: boolean
-  [METADATA_BLOCKS_NAMES_GROUPER]: Omit<
-    Record<MetadataBlockName, boolean>,
-    'codeMeta20' | 'computationalworkflow'
-  >
+  [METADATA_BLOCKS_NAMES_GROUPER]: CollectionFormMetadataBlocks
 }
+
+export type CollectionFormMetadataBlocks = Omit<
+  Record<MetadataBlockName, boolean>,
+  'codeMeta20' | 'computationalworkflow'
+>
+
 // On the submit function callback, type is CollectionType as type field is required and wont never be ""
 export type CollectionFormValuesOnSubmit = Omit<CollectionFormData, 'type'> & {
   type: CollectionType
diff --git a/src/sections/create-collection/useGetMetadataBlocksNamesInfo.tsx b/src/sections/create-collection/useGetMetadataBlocksNamesInfo.tsx
new file mode 100644
index 000000000..9270f8853
--- /dev/null
+++ b/src/sections/create-collection/useGetMetadataBlocksNamesInfo.tsx
@@ -0,0 +1,59 @@
+import { useEffect, useState } from 'react'
+import { MetadataBlockInfoRepository } from '../../metadata-block-info/domain/repositories/MetadataBlockInfoRepository'
+import { getMetadataBlockInfoByCollectionId } from '../../metadata-block-info/domain/useCases/getMetadataBlockInfoByCollectionId'
+import {
+  MetadataBlockInfo,
+  MetadataBlockName
+} from '../../metadata-block-info/domain/models/MetadataBlockInfo'
+
+interface Props {
+  collectionId: string
+  metadataBlockInfoRepository: MetadataBlockInfoRepository
+}
+
+interface UseGetMetadataBlocksNamesInfoReturn {
+  metadataBlocksNamesInfo: MetadataBlockName[]
+  error: string | null
+  isLoading: boolean
+}
+
+export const useGetMetadataBlocksNamesInfo = ({
+  collectionId,
+  metadataBlockInfoRepository
+}: Props): UseGetMetadataBlocksNamesInfoReturn => {
+  const [metadataBlocksNamesInfo, setMetadataBlocksNamesInfo] = useState<MetadataBlockName[]>([])
+  const [isLoading, setIsLoading] = useState<boolean>(true)
+  const [error, setError] = useState<string | null>(null)
+
+  useEffect(() => {
+    const handleGetCollectionMetadataBlockNames = async () => {
+      setIsLoading(true)
+      try {
+        const metadataBlocks: MetadataBlockInfo[] = await getMetadataBlockInfoByCollectionId(
+          metadataBlockInfoRepository,
+          collectionId
+        )
+
+        const blocksNames = metadataBlocks.map((block) => block.name) as MetadataBlockName[]
+
+        setMetadataBlocksNamesInfo(blocksNames)
+      } catch (err) {
+        const errorMessage =
+          err instanceof Error && err.message
+            ? err.message
+            : 'Something went wrong getting the information from the metadata blocks. Try again later.'
+        setError(errorMessage)
+      } finally {
+        setIsLoading(false)
+      }
+    }
+
+    void handleGetCollectionMetadataBlockNames()
+  }, [collectionId, metadataBlockInfoRepository])
+
+  return {
+    metadataBlocksNamesInfo,
+    error,
+    isLoading
+  }
+}

From a99c2650d973d60ad8a304e8f4ef17f252f85d8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Mon, 29 Jul 2024 08:22:39 -0300
Subject: [PATCH 09/52] feat: remove disabled from fields

---
 .../collection-form/top-fields-section/TopFieldsSection.tsx     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/sections/create-collection/collection-form/top-fields-section/TopFieldsSection.tsx b/src/sections/create-collection/collection-form/top-fields-section/TopFieldsSection.tsx
index 543a485f5..98444b630 100644
--- a/src/sections/create-collection/collection-form/top-fields-section/TopFieldsSection.tsx
+++ b/src/sections/create-collection/collection-form/top-fields-section/TopFieldsSection.tsx
@@ -119,7 +119,6 @@ export const TopFieldsSection = () => {
                   onChange={onChange}
                   isInvalid={invalid}
                   ref={ref}
-                  disabled
                 />
                 <Form.Group.Feedback type="invalid">{error?.message}</Form.Group.Feedback>
               </Col>
@@ -210,7 +209,6 @@ export const TopFieldsSection = () => {
                   onChange={onChange}
                   isInvalid={invalid}
                   ref={ref}
-                  disabled
                 />
                 <Form.Group.Feedback type="invalid">{error?.message}</Form.Group.Feedback>
               </Col>

From 1629a4ae8fd9aad67a7b18ccc407fffb2b5e2189 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Mon, 29 Jul 2024 12:11:04 -0300
Subject: [PATCH 10/52] feat: temporal use case

---
 .../repositories/MetadataBlockInfoRepository.ts      |  1 +
 .../useCases/getMetadataBlockInfoByNameTemporal.ts   | 11 +++++++++++
 .../MetadataBlockInfoJSDataverseRepository.ts        | 12 ++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 src/metadata-block-info/domain/useCases/getMetadataBlockInfoByNameTemporal.ts

diff --git a/src/metadata-block-info/domain/repositories/MetadataBlockInfoRepository.ts b/src/metadata-block-info/domain/repositories/MetadataBlockInfoRepository.ts
index b7488d995..140c5cfc3 100644
--- a/src/metadata-block-info/domain/repositories/MetadataBlockInfoRepository.ts
+++ b/src/metadata-block-info/domain/repositories/MetadataBlockInfoRepository.ts
@@ -2,6 +2,7 @@ import { MetadataBlockInfoDisplayFormat, MetadataBlockInfo } from '../models/Met
 
 export interface MetadataBlockInfoRepository {
   getByName: (name: string) => Promise<MetadataBlockInfoDisplayFormat | undefined>
+  getByNameTemporal: (name: string) => Promise<MetadataBlockInfo>
   getDisplayedOnCreateByCollectionId: (
     collectionId: number | string
   ) => Promise<MetadataBlockInfo[]>
diff --git a/src/metadata-block-info/domain/useCases/getMetadataBlockInfoByNameTemporal.ts b/src/metadata-block-info/domain/useCases/getMetadataBlockInfoByNameTemporal.ts
new file mode 100644
index 000000000..82bf9f3ec
--- /dev/null
+++ b/src/metadata-block-info/domain/useCases/getMetadataBlockInfoByNameTemporal.ts
@@ -0,0 +1,11 @@
+import { MetadataBlockInfoRepository } from '../repositories/MetadataBlockInfoRepository'
+import { MetadataBlockInfo } from '../models/MetadataBlockInfo'
+
+export async function getMetadataBlockInfoByNameTemporal(
+  metadataBlockInfoRepository: MetadataBlockInfoRepository,
+  name: string
+): Promise<MetadataBlockInfo> {
+  return metadataBlockInfoRepository.getByNameTemporal(name).catch((error: Error) => {
+    throw new Error(error.message)
+  })
+}
diff --git a/src/metadata-block-info/infrastructure/repositories/MetadataBlockInfoJSDataverseRepository.ts b/src/metadata-block-info/infrastructure/repositories/MetadataBlockInfoJSDataverseRepository.ts
index 7eef0c166..32b1e04b2 100644
--- a/src/metadata-block-info/infrastructure/repositories/MetadataBlockInfoJSDataverseRepository.ts
+++ b/src/metadata-block-info/infrastructure/repositories/MetadataBlockInfoJSDataverseRepository.ts
@@ -23,6 +23,18 @@ export class MetadataBlockInfoJSDataverseRepository implements MetadataBlockInfo
       })
   }
 
+  // TODO: This will be replaced to a new use case that will return all metadata blocks info
+  getByNameTemporal(name: string): Promise<MetadataBlockInfo> {
+    return getMetadataBlockByName
+      .execute(name)
+      .then((jsMetadataBlockInfo: JSMetadataBlockInfo) => {
+        return jsMetadataBlockInfo
+      })
+      .catch((error: ReadError) => {
+        throw new Error(error.message)
+      })
+  }
+
   getByColecctionId(collectionIdOrAlias: number | string): Promise<MetadataBlockInfo[]> {
     return getCollectionMetadataBlocks
       .execute(collectionIdOrAlias)

From c6c1d8c9b54bda0c7dba29a1e3f9716582aa3368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Tue, 30 Jul 2024 08:59:01 -0300
Subject: [PATCH 11/52] feat: more work

---
 .../components/form/form-group/FormGroup.tsx  |   2 +
 .../form-group/form-element/FormRadio.tsx     |  31 ++++
 .../create-collection/CreateCollection.tsx    |  13 +-
 .../collection-form/CollectionForm.tsx        |  11 +-
 .../MetadataFieldsSection.tsx                 |  27 +++-
 .../FieldsFromRootCheckbox.tsx                |   8 +-
 .../InputLevelField.tsx                       |   7 -
 .../MetadataInputLevelFieldsBlock.tsx         | 144 ++++++++++++++----
 .../input-levels-table/InputLevelFieldRow.tsx |  67 ++++++++
 .../InputLevelsTable.module.scss              |  45 ++++++
 .../input-levels-table/InputLevelsTable.tsx   |  44 ++++++
 .../useGetBlockMetadataInputLevelFields.tsx   |  98 ++++++++++++
 .../collection-form/useSubmitCollection.ts    |  44 +++---
 13 files changed, 466 insertions(+), 75 deletions(-)
 create mode 100644 packages/design-system/src/lib/components/form/form-group/form-element/FormRadio.tsx
 delete mode 100644 src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/InputLevelField.tsx
 create mode 100644 src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
 create mode 100644 src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.module.scss
 create mode 100644 src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.tsx
 create mode 100644 src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/useGetBlockMetadataInputLevelFields.tsx

diff --git a/packages/design-system/src/lib/components/form/form-group/FormGroup.tsx b/packages/design-system/src/lib/components/form/form-group/FormGroup.tsx
index 5248609b0..2560231e8 100644
--- a/packages/design-system/src/lib/components/form/form-group/FormGroup.tsx
+++ b/packages/design-system/src/lib/components/form/form-group/FormGroup.tsx
@@ -10,6 +10,7 @@ import { Row } from '../../grid/Row'
 import { FormCheckbox } from './form-element/FormCheckbox'
 import { FormFeedback } from './form-element/FormFeedback'
 import { FormSelectMultiple } from './form-element/FormSelectMultiple'
+import { FormRadio } from './form-element/FormRadio'
 
 interface FormGroupProps extends ColProps {
   as?: typeof Col | typeof Row
@@ -31,6 +32,7 @@ FormGroup.SelectMultiple = FormSelectMultiple
 FormGroup.TextArea = FormTextArea
 FormGroup.Text = FormText
 FormGroup.Checkbox = FormCheckbox
+FormGroup.Radio = FormRadio
 FormGroup.Feedback = FormFeedback
 
 export { FormGroup }
diff --git a/packages/design-system/src/lib/components/form/form-group/form-element/FormRadio.tsx b/packages/design-system/src/lib/components/form/form-group/form-element/FormRadio.tsx
new file mode 100644
index 000000000..efc1a6902
--- /dev/null
+++ b/packages/design-system/src/lib/components/form/form-group/form-element/FormRadio.tsx
@@ -0,0 +1,31 @@
+import { Form as FormBS } from 'react-bootstrap'
+import * as React from 'react'
+
+export interface FormRadioProps extends Omit<React.InputHTMLAttributes<HTMLInputElement>, 'type'> {
+  id: string
+  label: string
+  isValid?: boolean
+  isInvalid?: boolean
+  invalidFeedback?: string
+  validFeedback?: string
+}
+
+export const FormRadio = React.forwardRef(function FormRadio(
+  { label, id, isValid, isInvalid, validFeedback, invalidFeedback, ...props }: FormRadioProps,
+  ref
+) {
+  return (
+    <FormBS.Check type="radio" id={id}>
+      <FormBS.Check.Input
+        type="radio"
+        isValid={isValid}
+        isInvalid={isInvalid}
+        ref={ref as React.ForwardedRef<HTMLInputElement>}
+        {...props}
+      />
+      <FormBS.Check.Label>{label}</FormBS.Check.Label>
+      <FormBS.Control.Feedback type="invalid">{invalidFeedback}</FormBS.Control.Feedback>
+      <FormBS.Control.Feedback type="valid">{validFeedback}</FormBS.Control.Feedback>
+    </FormBS.Check>
+  )
+})
diff --git a/src/sections/create-collection/CreateCollection.tsx b/src/sections/create-collection/CreateCollection.tsx
index e9d66d398..15a51c497 100644
--- a/src/sections/create-collection/CreateCollection.tsx
+++ b/src/sections/create-collection/CreateCollection.tsx
@@ -12,7 +12,7 @@ import {
   CollectionFormData,
   CollectionFormMetadataBlocks,
   METADATA_BLOCKS_NAMES_GROUPER,
-  USE_FIELDS_FROM_ROOT_NAME
+  USE_FIELDS_FROM_PARENT
 } from './collection-form/CollectionForm'
 import { BreadcrumbsGenerator } from '../shared/hierarchy/BreadcrumbsGenerator'
 import { SeparationLine } from '../shared/layout/SeparationLine/SeparationLine'
@@ -40,6 +40,8 @@ export function CreateCollection({
     ownerCollectionId
   )
 
+  // TODO:ME Quizas en modo edicion collection id no deberia ser sobre el owner sino sobre la collection en si, pero esta quizas se puede diferenciar por pagina.
+  // Es decir, en esta pagina create, esta bien obtener sobre el padre, en la pagina edit sobre el mismo collection.
   const { metadataBlocksNamesInfo, isLoading: isLoadingMetadataBlocksNamesInfo } =
     useGetMetadataBlocksNamesInfo({
       collectionId: ownerCollectionId,
@@ -78,8 +80,7 @@ export function CreateCollection({
   if (isLoadingCollection || isLoadingMetadataBlocksNamesInfo || !collection) {
     return <CreateCollectionSkeleton />
   }
-  console.log({ collection, metadataBlocksNamesInfo })
-  console.log({ defaultBlocksNames })
+  console.log({ collection })
 
   const formDefaultValues: CollectionFormData = {
     hostCollection: collection.name,
@@ -90,8 +91,9 @@ export function CreateCollection({
     affiliation: user?.affiliation ?? '',
     storage: 'Local (Default)',
     description: '',
-    [USE_FIELDS_FROM_ROOT_NAME]: true,
-    [METADATA_BLOCKS_NAMES_GROUPER]: defaultBlocksNames
+    [USE_FIELDS_FROM_PARENT]: true,
+    [METADATA_BLOCKS_NAMES_GROUPER]: defaultBlocksNames,
+    inputLevels: collection.inputLevels
   }
 
   return (
@@ -110,6 +112,7 @@ export function CreateCollection({
 
       <CollectionForm
         collectionRepository={collectionRepository}
+        metadataBlockInfoRepository={metadataBlockInfoRepository}
         ownerCollectionId={ownerCollectionId}
         defaultValues={formDefaultValues}
       />
diff --git a/src/sections/create-collection/collection-form/CollectionForm.tsx b/src/sections/create-collection/collection-form/CollectionForm.tsx
index ec19cf5fc..d9a18dd46 100644
--- a/src/sections/create-collection/collection-form/CollectionForm.tsx
+++ b/src/sections/create-collection/collection-form/CollectionForm.tsx
@@ -14,13 +14,16 @@ import { TopFieldsSection } from './top-fields-section/TopFieldsSection'
 import { MetadataFieldsSection } from './metadata-fields-section/MetadataFieldsSection'
 import { BrowseSearchFacetsSection } from './browse-search-facets-section/BrowseSearchFacetsSection'
 import { MetadataBlockName } from '../../../metadata-block-info/domain/models/MetadataBlockInfo'
+import { Collection } from '../../../collection/domain/models/Collection'
 import styles from './CollectionForm.module.scss'
+import { MetadataBlockInfoRepository } from '../../../metadata-block-info/domain/repositories/MetadataBlockInfoRepository'
 
 export const METADATA_BLOCKS_NAMES_GROUPER = 'metadataBlockNames'
-export const USE_FIELDS_FROM_ROOT_NAME = 'useFieldsFromRoot'
+export const USE_FIELDS_FROM_PARENT = 'useFieldsFromParent'
 
 export interface CollectionFormProps {
   collectionRepository: CollectionRepository
+  metadataBlockInfoRepository: MetadataBlockInfoRepository
   ownerCollectionId: string
   defaultValues: CollectionFormData
 }
@@ -34,8 +37,9 @@ export type CollectionFormData = {
   type: CollectionType | ''
   description: string
   contacts: { value: string }[]
-  [USE_FIELDS_FROM_ROOT_NAME]: boolean
+  [USE_FIELDS_FROM_PARENT]: boolean
   [METADATA_BLOCKS_NAMES_GROUPER]: CollectionFormMetadataBlocks
+  inputLevels: Collection['inputLevels']
 }
 
 export type CollectionFormMetadataBlocks = Omit<
@@ -50,6 +54,7 @@ export type CollectionFormValuesOnSubmit = Omit<CollectionFormData, 'type'> & {
 
 export const CollectionForm = ({
   collectionRepository,
+  metadataBlockInfoRepository,
   ownerCollectionId,
   defaultValues
 }: CollectionFormProps) => {
@@ -123,7 +128,7 @@ export const CollectionForm = ({
           <Stack>
             <Card>
               <Card.Body>
-                <MetadataFieldsSection />
+                <MetadataFieldsSection metadataBlockInfoRepository={metadataBlockInfoRepository} />
               </Card.Body>
             </Card>
 
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx
index 35f35cd3f..2c52a3dc9 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx
@@ -3,8 +3,15 @@ import { Col, Form, Row, Stack } from '@iqss/dataverse-design-system'
 import { MetadataInputLevelFieldsBlock } from './metadata-input-level-fields-block/MetadataInputLevelFieldsBlock'
 import { FieldsFromRootCheckbox } from './fields-from-root-checkbox/FieldsFromRootCheckbox'
 import { MetadataBlockName } from '../../../../metadata-block-info/domain/models/MetadataBlockInfo'
+import { MetadataBlockInfoRepository } from '../../../../metadata-block-info/domain/repositories/MetadataBlockInfoRepository'
 
-export const MetadataFieldsSection = () => {
+interface MetadataFieldsSectionProps {
+  metadataBlockInfoRepository: MetadataBlockInfoRepository
+}
+
+export const MetadataFieldsSection = ({
+  metadataBlockInfoRepository
+}: MetadataFieldsSectionProps) => {
   const { t } = useTranslation('createCollection')
 
   return (
@@ -19,28 +26,34 @@ export const MetadataFieldsSection = () => {
             <FieldsFromRootCheckbox />
 
             <MetadataInputLevelFieldsBlock
-              name={MetadataBlockName.CITATION}
+              blockName={MetadataBlockName.CITATION}
               blockDisplayName="Citation Metadata (Required)"
+              metadataBlockInfoRepository={metadataBlockInfoRepository}
             />
             <MetadataInputLevelFieldsBlock
-              name={MetadataBlockName.GEOSPATIAL}
+              blockName={MetadataBlockName.GEOSPATIAL}
               blockDisplayName="Geospatial Metadata"
+              metadataBlockInfoRepository={metadataBlockInfoRepository}
             />
             <MetadataInputLevelFieldsBlock
-              name={MetadataBlockName.SOCIAL_SCIENCE}
+              blockName={MetadataBlockName.SOCIAL_SCIENCE}
               blockDisplayName="Social Science and Humanities Metadata"
+              metadataBlockInfoRepository={metadataBlockInfoRepository}
             />
             <MetadataInputLevelFieldsBlock
-              name={MetadataBlockName.ASTROPHYSICS}
+              blockName={MetadataBlockName.ASTROPHYSICS}
               blockDisplayName="Astronomy and Astrophysics Metadata"
+              metadataBlockInfoRepository={metadataBlockInfoRepository}
             />
             <MetadataInputLevelFieldsBlock
-              name={MetadataBlockName.BIOMEDICAL}
+              blockName={MetadataBlockName.BIOMEDICAL}
               blockDisplayName="Life Sciences Metadata"
+              metadataBlockInfoRepository={metadataBlockInfoRepository}
             />
             <MetadataInputLevelFieldsBlock
-              name={MetadataBlockName.JOURNAL}
+              blockName={MetadataBlockName.JOURNAL}
               blockDisplayName="Journal Metadata"
+              metadataBlockInfoRepository={metadataBlockInfoRepository}
             />
           </Stack>
         </Col>
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-root-checkbox/FieldsFromRootCheckbox.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-root-checkbox/FieldsFromRootCheckbox.tsx
index 917c7b715..49a411146 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-root-checkbox/FieldsFromRootCheckbox.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-root-checkbox/FieldsFromRootCheckbox.tsx
@@ -3,7 +3,7 @@ import { Controller, UseControllerProps, useFormContext, useWatch } from 'react-
 import { Form } from '@iqss/dataverse-design-system'
 import { MetadataBlockName } from '../../../../../metadata-block-info/domain/models/MetadataBlockInfo'
 import { ConfirmResetModificationsModal } from './ConfirmResetModificationsModal'
-import { METADATA_BLOCKS_NAMES_GROUPER, USE_FIELDS_FROM_ROOT_NAME } from '../../CollectionForm'
+import { METADATA_BLOCKS_NAMES_GROUPER, USE_FIELDS_FROM_PARENT } from '../../CollectionForm'
 
 const ALL_INPUT_LEVEL_FIELDS_EXCEPT_CITATION = [
   MetadataBlockName.GEOSPATIAL,
@@ -20,7 +20,7 @@ export const FieldsFromRootCheckbox = () => {
   const hostCollectionFieldValue = useWatch({ name: 'hostCollection' }) as string
 
   const handleContinueWithReset = () => {
-    setValue(USE_FIELDS_FROM_ROOT_NAME, true)
+    setValue(USE_FIELDS_FROM_PARENT, true)
 
     ALL_INPUT_LEVEL_FIELDS_EXCEPT_CITATION.forEach((blockName) => {
       setValue(`${METADATA_BLOCKS_NAMES_GROUPER}.${blockName}`, false)
@@ -37,7 +37,7 @@ export const FieldsFromRootCheckbox = () => {
   return (
     <>
       <Controller
-        name={USE_FIELDS_FROM_ROOT_NAME}
+        name={USE_FIELDS_FROM_PARENT}
         control={control}
         rules={rules}
         render={({ field: { onChange, ref, value }, fieldState: { invalid, error } }) => {
@@ -53,7 +53,7 @@ export const FieldsFromRootCheckbox = () => {
             <Form.Group.Checkbox
               id={checkboxID}
               onChange={handleChange}
-              name={USE_FIELDS_FROM_ROOT_NAME}
+              name={USE_FIELDS_FROM_PARENT}
               label={`Use metadata fields from ${hostCollectionFieldValue}`}
               checked={value as boolean}
               isInvalid={invalid}
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/InputLevelField.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/InputLevelField.tsx
deleted file mode 100644
index 6cefa1e9f..000000000
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/InputLevelField.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-export const InputLevelField = () => {
-  return (
-    <div>
-      <span>InputLevelField</span>
-    </div>
-  )
-}
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
index 021f99d4b..6f46ffed3 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
@@ -1,50 +1,136 @@
-import { useId } from 'react'
+import { useId, useState } from 'react'
 import { Controller, UseControllerProps, useFormContext, useWatch } from 'react-hook-form'
-import { Form } from '@iqss/dataverse-design-system'
-import { CollectionInputLevel } from '../../../../../collection/domain/models/Collection'
+import { Button, Form, Stack } from '@iqss/dataverse-design-system'
+import { CloseButton } from 'react-bootstrap'
+// import { CollectionInputLevel } from '../../../../../collection/domain/models/Collection'
 import { MetadataBlockName } from '../../../../../metadata-block-info/domain/models/MetadataBlockInfo'
-import { METADATA_BLOCKS_NAMES_GROUPER, USE_FIELDS_FROM_ROOT_NAME } from '../../CollectionForm'
+import { METADATA_BLOCKS_NAMES_GROUPER, USE_FIELDS_FROM_PARENT } from '../../CollectionForm'
+import { MetadataBlockInfoRepository } from '../../../../../metadata-block-info/domain/repositories/MetadataBlockInfoRepository'
+import { useGetBlockMetadataInputLevelFields } from './useGetBlockMetadataInputLevelFields'
+import { InputLevelsTable } from './input-levels-table/InputLevelsTable'
 
 interface MetadataInputLevelFieldsBlockProps {
-  name: MetadataBlockName
+  blockName: MetadataBlockName
   blockDisplayName: string
-  inputLevels?: CollectionInputLevel[]
+  metadataBlockInfoRepository: MetadataBlockInfoRepository
 }
 
 export const MetadataInputLevelFieldsBlock = ({
-  name,
+  blockName,
   blockDisplayName,
-  inputLevels
+  metadataBlockInfoRepository
 }: MetadataInputLevelFieldsBlockProps) => {
   const checkboxID = useId()
   const { control } = useFormContext()
-  const useFieldsFromRootFieldValue = useWatch({ name: USE_FIELDS_FROM_ROOT_NAME }) as boolean
+  const [inputLevelsTableStatus, setInputLevelsTableStatus] = useState({
+    show: false,
+    asDisabled: false
+  })
 
-  const isCitation = name === MetadataBlockName.CITATION
+  const metadataBlockFieldName = `${METADATA_BLOCKS_NAMES_GROUPER}.${blockName}`
+
+  const useFieldsFromParentCheckedValue = useWatch({
+    name: USE_FIELDS_FROM_PARENT
+  }) as boolean
+  const metadataBlockCheckedValue = useWatch({
+    name: metadataBlockFieldName
+  }) as boolean
+
+  const {
+    blockMetadataInputLevelFields,
+    error: errorBlockMetadataFields,
+    isLoading: isLoadingBlockMetadataFields
+  } = useGetBlockMetadataInputLevelFields({ blockName, metadataBlockInfoRepository })
+
+  const isCitation = blockName === MetadataBlockName.CITATION
 
   const rules: UseControllerProps['rules'] = {}
-  const withGroupName = `${METADATA_BLOCKS_NAMES_GROUPER}.${name}`
+
+  const handleEditInputLevels = () => {
+    setInputLevelsTableStatus({
+      show: true,
+      asDisabled: false
+    })
+  }
+
+  const handleShowInputLevels = () => {
+    setInputLevelsTableStatus({
+      show: true,
+      asDisabled: true
+    })
+  }
+
+  const handleHideInputLevelsTable = () => {
+    setInputLevelsTableStatus({
+      show: false,
+      asDisabled: false
+    })
+  }
+
+  // TODO: Temporary, this will change with get all metadata blocks info use case
+  if (isLoadingBlockMetadataFields || errorBlockMetadataFields || !blockMetadataInputLevelFields) {
+    return null
+  }
 
   return (
-    <>
-      <Controller
-        name={withGroupName}
-        control={control}
-        rules={rules}
-        render={({ field: { onChange, ref, value }, fieldState: { invalid, error } }) => (
-          <Form.Group.Checkbox
-            id={checkboxID}
-            onChange={onChange}
-            name={withGroupName}
-            label={blockDisplayName}
-            checked={value as boolean}
-            isInvalid={invalid}
-            invalidFeedback={error?.message}
-            disabled={isCitation ? true : useFieldsFromRootFieldValue}
-            ref={ref}
-          />
+    <Stack direction="vertical" gap={2}>
+      <Stack direction="horizontal" gap={0}>
+        <Controller
+          name={metadataBlockFieldName}
+          control={control}
+          rules={rules}
+          render={({ field: { onChange, ref, value }, fieldState: { invalid, error } }) => (
+            <Form.Group.Checkbox
+              id={checkboxID}
+              onChange={onChange}
+              name={metadataBlockFieldName}
+              label={blockDisplayName}
+              checked={value as boolean}
+              isInvalid={invalid}
+              invalidFeedback={error?.message}
+              disabled={isCitation ? true : useFieldsFromParentCheckedValue}
+              ref={ref}
+            />
+          )}
+        />
+
+        {/* If checked and use fields from parent not checked */}
+        {!inputLevelsTableStatus.show &&
+          metadataBlockCheckedValue &&
+          !useFieldsFromParentCheckedValue && (
+            <Button variant="link" size="sm" type="button" onClick={handleEditInputLevels}>
+              [+] View fields + set as hidden, required, or optional
+            </Button>
+          )}
+
+        {/* If checked and use fields from parent checked */}
+        {!inputLevelsTableStatus.show &&
+          metadataBlockCheckedValue &&
+          useFieldsFromParentCheckedValue && (
+            <Button variant="link" size="sm" type="button" onClick={handleShowInputLevels}>
+              [+] View Fields
+            </Button>
+          )}
+        {/* If just not checked */}
+        {!inputLevelsTableStatus.show && !metadataBlockCheckedValue && (
+          <Button variant="link" size="sm" type="button" onClick={handleShowInputLevels}>
+            [+] View Fields
+          </Button>
         )}
+      </Stack>
+
+      <InputLevelsTable
+        show={inputLevelsTableStatus.show}
+        disabled={inputLevelsTableStatus.asDisabled}
+        blockMetadataInputLevelFields={blockMetadataInputLevelFields}
+        closeButton={
+          <CloseButton
+            onClick={handleHideInputLevelsTable}
+            aria-label="Hide input levels table"
+            tabIndex={inputLevelsTableStatus.show ? 1 : -1}
+          />
+        }
       />
-    </>
+    </Stack>
   )
 }
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
new file mode 100644
index 000000000..f50188e13
--- /dev/null
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
@@ -0,0 +1,67 @@
+import { useId } from 'react'
+import { Controller, UseControllerProps, useFormContext } from 'react-hook-form'
+import { Form } from '@iqss/dataverse-design-system'
+import { ReducedMetadataFieldInfo } from '../useGetBlockMetadataInputLevelFields'
+import styles from './InputLevelsTable.module.scss'
+//   interface CollectionInputLevel {
+//     datasetFieldName: string
+//     include: boolean
+//     required: boolean
+//   }
+
+interface InputLevelFieldRowProps {
+  metadataField: ReducedMetadataFieldInfo
+}
+
+export const InputLevelFieldRow = ({ metadataField }: InputLevelFieldRowProps) => {
+  const checkboxID = useId()
+  const { control } = useFormContext()
+  const { name, displayName, childMetadataFields } = metadataField
+
+  const rules: UseControllerProps['rules'] = {}
+
+  return (
+    <>
+      <tr className={styles['input-level-row']}>
+        <Controller
+          name={name}
+          control={control}
+          rules={rules}
+          render={({ field: { onChange, ref, value }, fieldState: { invalid, error } }) => (
+            <>
+              <td>
+                <Form.Group.Checkbox
+                  id={checkboxID}
+                  onChange={onChange}
+                  name={name}
+                  label={displayName}
+                  checked={value as boolean}
+                  isInvalid={invalid}
+                  invalidFeedback={error?.message}
+                  // disabled={isCitation ? true : useFieldsFromParentCheckedValue}
+                  ref={ref}
+                />
+              </td>
+              <td>
+                {/* <Controller
+          name={name}
+          control={control}
+          rules={rules}
+          render={({ field: { onChange, ref, value }, fieldState: { invalid, error } }) => (
+            <Form.Group.Checkbox 
+          )}
+        /> */}
+              </td>
+            </>
+          )}
+        />
+      </tr>
+      {childMetadataFields &&
+        Object.entries(childMetadataFields).map(([fieldName, field]) => (
+          <tr className={styles['input-level-row--child-field']} key={fieldName}>
+            <td>{field.displayName}</td>
+          </tr>
+        ))}
+    </>
+  )
+}
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.module.scss b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.module.scss
new file mode 100644
index 000000000..83f8bc600
--- /dev/null
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.module.scss
@@ -0,0 +1,45 @@
+@import 'node_modules/@iqss/dataverse-design-system/src/lib/assets/styles/design-tokens/colors.module';
+
+.input-levels-table-container {
+  position: relative;
+  display: grid;
+  grid-template-rows: 0fr;
+  width: 70%;
+  max-height: 400px;
+  margin-bottom: 1rem;
+  margin-left: 3rem;
+  overflow-y: auto;
+  border: solid 1px $dv-secondary-color;
+  border-radius: 4px;
+  transition: grid-template-rows 350ms;
+
+  .inner {
+    overflow: hidden;
+  }
+
+  &--show {
+    grid-template-rows: 1fr;
+
+    .inner {
+      overflow: auto;
+    }
+  }
+}
+
+.close-button-container {
+  position: sticky;
+  top: 0;
+  display: flex;
+  justify-content: flex-end;
+  padding: 0.35rem 0.5rem;
+  background-color: #fff;
+  border-bottom: solid 1px $dv-secondary-color;
+}
+
+.input-level-row {
+  &--child-field {
+    td {
+      padding-left: 1.5rem;
+    }
+  }
+}
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.tsx
new file mode 100644
index 000000000..d71673c30
--- /dev/null
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.tsx
@@ -0,0 +1,44 @@
+import { BlockMetadataInputLevelFields } from '../useGetBlockMetadataInputLevelFields'
+import cn from 'classnames'
+import styles from './InputLevelsTable.module.scss'
+import React from 'react'
+import { Table } from '@iqss/dataverse-design-system'
+import { InputLevelFieldRow } from './InputLevelFieldRow'
+
+interface InputLevelsTableProps {
+  show: boolean
+  disabled: boolean
+  blockMetadataInputLevelFields: BlockMetadataInputLevelFields
+  closeButton: React.ReactNode
+}
+
+export const InputLevelsTable = ({
+  show,
+  disabled,
+  blockMetadataInputLevelFields,
+  closeButton
+}: InputLevelsTableProps) => {
+  console.log(blockMetadataInputLevelFields)
+
+  // TODO:ME Disable everything if disabled
+  return (
+    <div
+      className={cn(styles['input-levels-table-container'], {
+        [styles['input-levels-table-container--show']]: show
+      })}>
+      <div className={styles.inner}>
+        <div className={styles['close-button-container']}>{closeButton}</div>
+
+        <Table>
+          <tbody>
+            {Object.entries(blockMetadataInputLevelFields.metadataFields).map(
+              ([fieldName, field]) => (
+                <InputLevelFieldRow metadataField={field} key={fieldName} />
+              )
+            )}
+          </tbody>
+        </Table>
+      </div>
+    </div>
+  )
+}
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/useGetBlockMetadataInputLevelFields.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/useGetBlockMetadataInputLevelFields.tsx
new file mode 100644
index 000000000..68a255dfa
--- /dev/null
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/useGetBlockMetadataInputLevelFields.tsx
@@ -0,0 +1,98 @@
+import { useEffect, useState } from 'react'
+import { MetadataBlockInfoRepository } from '../../../../../metadata-block-info/domain/repositories/MetadataBlockInfoRepository'
+import {
+  MetadataBlockInfo,
+  MetadataBlockName,
+  MetadataField
+} from '../../../../../metadata-block-info/domain/models/MetadataBlockInfo'
+import { getMetadataBlockInfoByNameTemporal } from '../../../../../metadata-block-info/domain/useCases/getMetadataBlockInfoByNameTemporal'
+
+interface Props {
+  blockName: MetadataBlockName
+  metadataBlockInfoRepository: MetadataBlockInfoRepository
+}
+
+interface UseGetBlockMetadataInputLevelsFieldsReturn {
+  blockMetadataInputLevelFields: BlockMetadataInputLevelFields | undefined
+  error: string | null
+  isLoading: boolean
+}
+
+export interface BlockMetadataInputLevelFields {
+  id: MetadataBlockInfo['id']
+  name: MetadataBlockInfo['name']
+  displayName: MetadataBlockInfo['displayName']
+  metadataFields: Record<string, ReducedMetadataFieldInfo>
+}
+
+export type ReducedMetadataFieldInfo = Pick<MetadataField, 'name' | 'displayName'> & {
+  childMetadataFields?: Record<string, Pick<MetadataField, 'name' | 'displayName'>>
+}
+
+export const useGetBlockMetadataInputLevelFields = ({
+  blockName,
+  metadataBlockInfoRepository
+}: Props): UseGetBlockMetadataInputLevelsFieldsReturn => {
+  const [blockMetadataInputLevelFields, setBlockMetadataInputLevelFields] = useState<
+    BlockMetadataInputLevelFields | undefined
+  >()
+  const [isLoading, setIsLoading] = useState<boolean>(true)
+  const [error, setError] = useState<string | null>(null)
+
+  useEffect(() => {
+    const handleGetInfo = async () => {
+      setIsLoading(true)
+      try {
+        const blockInfo = await getMetadataBlockInfoByNameTemporal(
+          metadataBlockInfoRepository,
+          blockName
+        )
+
+        const formattedMetadataFields: BlockMetadataInputLevelFields['metadataFields'] =
+          Object.entries(blockInfo.metadataFields).reduce((acc, [key, value]) => {
+            const { name, displayName, childMetadataFields } = value
+            acc[key] = {
+              name,
+              displayName,
+              childMetadataFields: childMetadataFields
+                ? Object.entries(childMetadataFields).reduce((acc, [key, value]) => {
+                    const { name, displayName } = value
+                    acc[key] = {
+                      name,
+                      displayName
+                    }
+                    return acc
+                  }, {} as Record<string, Pick<MetadataField, 'name' | 'displayName'>>)
+                : undefined
+            }
+            return acc
+          }, {} as Record<string, ReducedMetadataFieldInfo>)
+
+        const formattedBlockInfo: BlockMetadataInputLevelFields = {
+          id: blockInfo.id,
+          name: blockInfo.name,
+          displayName: blockInfo.displayName,
+          metadataFields: formattedMetadataFields
+        }
+
+        setBlockMetadataInputLevelFields(formattedBlockInfo)
+      } catch (err) {
+        const errorMessage =
+          err instanceof Error && err.message
+            ? err.message
+            : 'Something went wrong getting the information from the metadata blocks. Try again later.'
+        setError(errorMessage)
+      } finally {
+        setIsLoading(false)
+      }
+    }
+
+    void handleGetInfo()
+  }, [metadataBlockInfoRepository, blockName])
+
+  return {
+    blockMetadataInputLevelFields,
+    error,
+    isLoading
+  }
+}
diff --git a/src/sections/create-collection/collection-form/useSubmitCollection.ts b/src/sections/create-collection/collection-form/useSubmitCollection.ts
index 41c6a183c..629bae01d 100644
--- a/src/sections/create-collection/collection-form/useSubmitCollection.ts
+++ b/src/sections/create-collection/collection-form/useSubmitCollection.ts
@@ -45,35 +45,39 @@ export function useSubmitCollection(
   const submitForm = (formData: CollectionFormValuesOnSubmit): void => {
     setSubmissionStatus(SubmissionStatus.IsSubmitting)
 
+    // TODO:ME js-dataverse cannot read properties of undefined (reading 'map')
+
     const newCollection: CollectionDTO = {
       name: formData.name,
       alias: formData.alias,
       type: formData.type,
-      contacts: formData.contacts.map((contact) => contact.value)
+      affiliation: formData.affiliation,
+      description: formData.description,
+      contacts: formData.contacts.map((contact) => contact.value),
+      inputLevels: []
     }
 
+    console.log({ newCollection })
+
     // TODO: We can't send the hostCollection name, but we should send the hostCollection alias
     // So in a next iteration we should get the hostCollection alias from the hostCollection name selected
 
-    createCollection(collectionRepository, newCollection, ownerCollectionId)
-      .then(() => {
-        setSubmitError(null)
-        setSubmissionStatus(SubmissionStatus.SubmitComplete)
-
-        navigate(`${Route.COLLECTIONS}?id=${newCollection.alias}`, {
-          state: { created: true }
-        })
-        return
-      })
-      .catch((err: WriteError) => {
-        const error = new JSDataverseWriteErrorHandler(err)
-        const formattedError = error.getReasonWithoutStatusCode() ?? error.getErrorMessage()
-
-        setSubmitError(formattedError)
-        setSubmissionStatus(SubmissionStatus.Errored)
-
-        onSubmitErrorCallback()
-      })
+    // createCollection(collectionRepository, newCollection, ownerCollectionId)
+    //   .then(() => {
+    //     setSubmitError(null)
+    //     setSubmissionStatus(SubmissionStatus.SubmitComplete)
+    //     navigate(`${Route.COLLECTIONS}?id=${newCollection.alias}`, {
+    //       state: { created: true }
+    //     })
+    //     return
+    //   })
+    //   .catch((err: WriteError) => {
+    //     const error = new JSDataverseWriteErrorHandler(err)
+    //     const formattedError = error.getReasonWithoutStatusCode() ?? error.getErrorMessage()
+    //     setSubmitError(formattedError)
+    //     setSubmissionStatus(SubmissionStatus.Errored)
+    //     onSubmitErrorCallback()
+    //   })
   }
 
   return {

From ce235f9b04488f0bfdfa1b257350cc1e02dc54a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Tue, 30 Jul 2024 16:02:19 -0300
Subject: [PATCH 12/52] feat(design system): allow bordered prop

---
 packages/design-system/CHANGELOG.md                    |  1 +
 .../design-system/src/lib/components/table/Table.tsx   | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/design-system/CHANGELOG.md b/packages/design-system/CHANGELOG.md
index 580561b86..f8554dad0 100644
--- a/packages/design-system/CHANGELOG.md
+++ b/packages/design-system/CHANGELOG.md
@@ -46,6 +46,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 - **FormTextArea:** extend Props Interface to accept `autoFocus` prop.
 - **FormSelect:** extend Props Interface to accept `autoFocus` prop.
 - **Stack:** NEW Stack element to manage layouts.
+- **Table:** extend Props Interface to accept `bordered` prop to add or remove borders on all sides of the table and cells. Defaults to true.
 
 # [1.1.0](https://github.com/IQSS/dataverse-frontend/compare/@iqss/dataverse-design-system@1.0.1...@iqss/dataverse-design-system@1.1.0) (2024-03-12)
 
diff --git a/packages/design-system/src/lib/components/table/Table.tsx b/packages/design-system/src/lib/components/table/Table.tsx
index ab83b19c6..1548a467a 100644
--- a/packages/design-system/src/lib/components/table/Table.tsx
+++ b/packages/design-system/src/lib/components/table/Table.tsx
@@ -1,10 +1,14 @@
-import { PropsWithChildren } from 'react'
 import { Table as TableBS } from 'react-bootstrap'
 import styles from './Table.module.scss'
 
-export function Table({ children }: PropsWithChildren) {
+interface TableProps {
+  bordered?: boolean
+  children: React.ReactNode
+}
+
+export function Table({ bordered = true, children }: TableProps) {
   return (
-    <TableBS striped bordered className={styles.table}>
+    <TableBS striped bordered={bordered} className={styles.table}>
       {children}
     </TableBS>
   )

From 68c858c98bae513224122c38f56292039901c177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Tue, 30 Jul 2024 16:02:46 -0300
Subject: [PATCH 13/52] feat: new data mappers

---
 .../create-collection/CreateCollection.tsx    |  64 +++++++-
 .../collection-form/CollectionForm.tsx        |  32 +++-
 .../collection-form/CollectionFormHelper.ts   |  41 +++++
 .../input-levels-table/InputLevelFieldRow.tsx | 130 +++++++++++-----
 .../InputLevelsTable.module.scss              |  27 ++--
 .../input-levels-table/InputLevelsTable.tsx   |  22 ++-
 .../useGetBlockMetadataInputLevelFields.tsx   |  10 +-
 .../useGetAllMetadataBlocksInfoByName.tsx     | 144 ++++++++++++++++++
 ...eGetCollectionMetadataBlocksNamesInfo.tsx} |   2 +-
 9 files changed, 390 insertions(+), 82 deletions(-)
 create mode 100644 src/sections/create-collection/collection-form/CollectionFormHelper.ts
 create mode 100644 src/sections/create-collection/useGetAllMetadataBlocksInfoByName.tsx
 rename src/sections/create-collection/{useGetMetadataBlocksNamesInfo.tsx => useGetCollectionMetadataBlocksNamesInfo.tsx} (97%)

diff --git a/src/sections/create-collection/CreateCollection.tsx b/src/sections/create-collection/CreateCollection.tsx
index 15a51c497..346de19e9 100644
--- a/src/sections/create-collection/CreateCollection.tsx
+++ b/src/sections/create-collection/CreateCollection.tsx
@@ -6,11 +6,12 @@ import { CollectionRepository } from '../../collection/domain/repositories/Colle
 import { useLoading } from '../loading/LoadingContext'
 import { useSession } from '../session/SessionContext'
 import { MetadataBlockInfoRepository } from '../../metadata-block-info/domain/repositories/MetadataBlockInfoRepository'
-import { useGetMetadataBlocksNamesInfo } from './useGetMetadataBlocksNamesInfo'
+import { useGetCollectionMetadataBlocksNamesInfo } from './useGetCollectionMetadataBlocksNamesInfo'
 import {
   CollectionForm,
   CollectionFormData,
   CollectionFormMetadataBlocks,
+  FormattedCollectionInputLevels,
   METADATA_BLOCKS_NAMES_GROUPER,
   USE_FIELDS_FROM_PARENT
 } from './collection-form/CollectionForm'
@@ -19,6 +20,9 @@ import { SeparationLine } from '../shared/layout/SeparationLine/SeparationLine'
 import { RequiredFieldText } from '../shared/form/RequiredFieldText/RequiredFieldText'
 import { PageNotFound } from '../page-not-found/PageNotFound'
 import { CreateCollectionSkeleton } from './CreateCollectionSkeleton'
+import { CollectionInputLevel } from '../../collection/domain/models/Collection'
+import { useGetAllMetadataBlocksInfoByName } from './useGetAllMetadataBlocksInfoByName'
+import { CollectionFormHelper } from './collection-form/CollectionFormHelper'
 
 interface CreateCollectionProps {
   ownerCollectionId: string
@@ -43,11 +47,18 @@ export function CreateCollection({
   // TODO:ME Quizas en modo edicion collection id no deberia ser sobre el owner sino sobre la collection en si, pero esta quizas se puede diferenciar por pagina.
   // Es decir, en esta pagina create, esta bien obtener sobre el padre, en la pagina edit sobre el mismo collection.
   const { metadataBlocksNamesInfo, isLoading: isLoadingMetadataBlocksNamesInfo } =
-    useGetMetadataBlocksNamesInfo({
+    useGetCollectionMetadataBlocksNamesInfo({
       collectionId: ownerCollectionId,
       metadataBlockInfoRepository
     })
 
+  const { allMetadataBlocksInfo, isLoading: isLoadingAllMetadataBlocksInfo } =
+    useGetAllMetadataBlocksInfoByName({ metadataBlockInfoRepository })
+
+  const baseInputLevels = useDeepCompareMemo(() => {
+    return CollectionFormHelper.getFormBaseInputLevels(allMetadataBlocksInfo)
+  }, [allMetadataBlocksInfo])
+
   const defaultBlocksNames = useDeepCompareMemo(
     () =>
       metadataBlocksNamesInfo.reduce(
@@ -68,19 +79,55 @@ export function CreateCollection({
   )
 
   useEffect(() => {
-    if (!isLoadingCollection && !isLoadingMetadataBlocksNamesInfo) {
+    if (
+      !isLoadingCollection &&
+      !isLoadingMetadataBlocksNamesInfo &&
+      !isLoadingAllMetadataBlocksInfo
+    ) {
       setIsLoading(false)
     }
-  }, [isLoading, isLoadingCollection, isLoadingMetadataBlocksNamesInfo, setIsLoading])
+  }, [
+    isLoading,
+    isLoadingCollection,
+    isLoadingMetadataBlocksNamesInfo,
+    isLoadingAllMetadataBlocksInfo,
+    setIsLoading
+  ])
 
   if (!isLoadingCollection && !collection) {
     return <PageNotFound />
   }
 
-  if (isLoadingCollection || isLoadingMetadataBlocksNamesInfo || !collection) {
+  if (
+    isLoadingCollection ||
+    isLoadingMetadataBlocksNamesInfo ||
+    isLoadingAllMetadataBlocksInfo ||
+    !collection
+  ) {
     return <CreateCollectionSkeleton />
   }
-  console.log({ collection })
+
+  console.log({ baseInputLevels })
+
+  // TODO:ME Move to another place?
+  const transformInputLevels = (levels: CollectionInputLevel[]): FormattedCollectionInputLevels => {
+    const result: FormattedCollectionInputLevels = {}
+    levels.forEach((level) => {
+      const { datasetFieldName, include, required } = level
+      const replaceDotWithSlash = (str: string) => str.replace(/\./g, '/')
+      const normalizedFieldName = replaceDotWithSlash(datasetFieldName)
+
+      result[normalizedFieldName] = {
+        include,
+        optionalOrRequired: required ? 'required' : 'optional'
+      }
+    })
+    return result
+  }
+
+  const defaultInputLevels: FormattedCollectionInputLevels | undefined = collection.inputLevels
+    ? transformInputLevels(collection.inputLevels)
+    : undefined
 
   const formDefaultValues: CollectionFormData = {
     hostCollection: collection.name,
@@ -93,7 +140,10 @@ export function CreateCollection({
     description: '',
     [USE_FIELDS_FROM_PARENT]: true,
     [METADATA_BLOCKS_NAMES_GROUPER]: defaultBlocksNames,
-    inputLevels: collection.inputLevels
+    inputLevels: {
+      ...baseInputLevels,
+      ...defaultInputLevels
+    }
   }
 
   return (
diff --git a/src/sections/create-collection/collection-form/CollectionForm.tsx b/src/sections/create-collection/collection-form/CollectionForm.tsx
index d9a18dd46..35865c2a6 100644
--- a/src/sections/create-collection/collection-form/CollectionForm.tsx
+++ b/src/sections/create-collection/collection-form/CollectionForm.tsx
@@ -14,12 +14,12 @@ import { TopFieldsSection } from './top-fields-section/TopFieldsSection'
 import { MetadataFieldsSection } from './metadata-fields-section/MetadataFieldsSection'
 import { BrowseSearchFacetsSection } from './browse-search-facets-section/BrowseSearchFacetsSection'
 import { MetadataBlockName } from '../../../metadata-block-info/domain/models/MetadataBlockInfo'
-import { Collection } from '../../../collection/domain/models/Collection'
-import styles from './CollectionForm.module.scss'
 import { MetadataBlockInfoRepository } from '../../../metadata-block-info/domain/repositories/MetadataBlockInfoRepository'
+import styles from './CollectionForm.module.scss'
 
 export const METADATA_BLOCKS_NAMES_GROUPER = 'metadataBlockNames'
 export const USE_FIELDS_FROM_PARENT = 'useFieldsFromParent'
+export const INPUT_LEVELS_GROUPER = 'inputLevels'
 
 export interface CollectionFormProps {
   collectionRepository: CollectionRepository
@@ -39,7 +39,7 @@ export type CollectionFormData = {
   contacts: { value: string }[]
   [USE_FIELDS_FROM_PARENT]: boolean
   [METADATA_BLOCKS_NAMES_GROUPER]: CollectionFormMetadataBlocks
-  inputLevels: Collection['inputLevels']
+  [INPUT_LEVELS_GROUPER]?: FormattedCollectionInputLevels
 }
 
 export type CollectionFormMetadataBlocks = Omit<
@@ -47,6 +47,28 @@ export type CollectionFormMetadataBlocks = Omit<
   'codeMeta20' | 'computationalworkflow'
 >
 
+export type FormattedCollectionInputLevels = {
+  [key: string]: {
+    include: boolean
+    optionalOrRequired: CollectionFormInputLevelValue
+  }
+}
+
+export const CollectionFormInputLevelOptions = {
+  OPTIONAL: 'optional',
+  REQUIRED: 'required'
+} as const
+
+export type CollectionFormInputLevelValue =
+  (typeof CollectionFormInputLevelOptions)[keyof typeof CollectionFormInputLevelOptions]
+
+// export type FormattedCollectionInputLevels = {
+//   [key: string]: {
+//     include: boolean
+//     required: boolean
+//   }
+// }
+
 // On the submit function callback, type is CollectionType as type field is required and wont never be ""
 export type CollectionFormValuesOnSubmit = Omit<CollectionFormData, 'type'> & {
   type: CollectionType
@@ -73,7 +95,9 @@ export const CollectionForm = ({
     defaultValues
   })
 
-  const { formState } = form
+  const { formState, watch } = form
+
+  console.log(watch('inputLevels'))
 
   const preventEnterSubmit = (e: React.KeyboardEvent<HTMLFormElement | HTMLButtonElement>) => {
     // When pressing Enter, only submit the form  if the user is focused on the submit button itself
diff --git a/src/sections/create-collection/collection-form/CollectionFormHelper.ts b/src/sections/create-collection/collection-form/CollectionFormHelper.ts
new file mode 100644
index 000000000..036c1a5f0
--- /dev/null
+++ b/src/sections/create-collection/collection-form/CollectionFormHelper.ts
@@ -0,0 +1,41 @@
+import { ReducedMetadataBlockInfo } from '../useGetAllMetadataBlocksInfoByName'
+import { FormattedCollectionInputLevels } from './CollectionForm'
+
+export class CollectionFormHelper {
+  public static replaceDotWithSlash = (str: string) => str.replace(/\./g, '/')
+
+  public static replaceSlashWithDot = (str: string) => str.replace(/\//g, '.')
+
+  public static getFormBaseInputLevels(
+    allMetadataBlocksInfoReduced: ReducedMetadataBlockInfo[]
+  ): FormattedCollectionInputLevels {
+    const fields: FormattedCollectionInputLevels = {}
+    const childFields: FormattedCollectionInputLevels = {}
+
+    allMetadataBlocksInfoReduced.forEach((block) => {
+      Object.entries(block.metadataFields).forEach(([_key, field]) => {
+        const normalizedFieldName = this.replaceDotWithSlash(field.name)
+
+        fields[normalizedFieldName] = {
+          include: true,
+          optionalOrRequired: 'optional'
+        }
+
+        if (field.childMetadataFields) {
+          Object.entries(field.childMetadataFields).forEach(([_key, childField]) => {
+            const normalizedFieldName = this.replaceDotWithSlash(childField.name)
+            childFields[normalizedFieldName] = {
+              include: true,
+              optionalOrRequired: 'optional'
+            }
+          })
+        }
+      })
+    })
+
+    return {
+      ...fields,
+      ...childFields
+    }
+  }
+}
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
index f50188e13..f225b4757 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
@@ -1,20 +1,16 @@
-import { useId } from 'react'
+import { ChangeEvent, useId } from 'react'
 import { Controller, UseControllerProps, useFormContext } from 'react-hook-form'
-import { Form } from '@iqss/dataverse-design-system'
+import { Form, Stack } from '@iqss/dataverse-design-system'
 import { ReducedMetadataFieldInfo } from '../useGetBlockMetadataInputLevelFields'
 import styles from './InputLevelsTable.module.scss'
-//   interface CollectionInputLevel {
-//     datasetFieldName: string
-//     include: boolean
-//     required: boolean
-//   }
+import { CollectionFormInputLevelValue, INPUT_LEVELS_GROUPER } from '../../../CollectionForm'
 
 interface InputLevelFieldRowProps {
   metadataField: ReducedMetadataFieldInfo
 }
 
 export const InputLevelFieldRow = ({ metadataField }: InputLevelFieldRowProps) => {
-  const checkboxID = useId()
+  const uniqueInputLevelRowID = useId()
   const { control } = useFormContext()
   const { name, displayName, childMetadataFields } = metadataField
 
@@ -23,45 +19,97 @@ export const InputLevelFieldRow = ({ metadataField }: InputLevelFieldRowProps) =
   return (
     <>
       <tr className={styles['input-level-row']}>
-        <Controller
-          name={name}
-          control={control}
-          rules={rules}
-          render={({ field: { onChange, ref, value }, fieldState: { invalid, error } }) => (
-            <>
-              <td>
-                <Form.Group.Checkbox
-                  id={checkboxID}
-                  onChange={onChange}
-                  name={name}
-                  label={displayName}
-                  checked={value as boolean}
-                  isInvalid={invalid}
-                  invalidFeedback={error?.message}
-                  // disabled={isCitation ? true : useFieldsFromParentCheckedValue}
-                  ref={ref}
-                />
-              </td>
-              <td>
-                {/* <Controller
-          name={name}
-          control={control}
-          rules={rules}
-          render={({ field: { onChange, ref, value }, fieldState: { invalid, error } }) => (
-            <Form.Group.Checkbox 
+        <td>
+          <Controller
+            name={`${INPUT_LEVELS_GROUPER}.${name}.include`}
+            control={control}
+            rules={rules}
+            render={({ field: { onChange, ref, value }, fieldState: { invalid, error } }) => (
+              <Form.Group.Checkbox
+                id={`${uniqueInputLevelRowID}-checkbox`}
+                onChange={onChange}
+                label={displayName}
+                checked={Boolean(value as boolean)}
+                isInvalid={invalid}
+                invalidFeedback={error?.message}
+                // disabled={isCitation ? true : useFieldsFromParentCheckedValue}
+                ref={ref}
+                data-name={`${name}`}
+              />
+            )}
+          />
+        </td>
+        <td>
+          {!childMetadataFields && (
+            <RequiredAndOptionalRadios
+              fieldName={`${INPUT_LEVELS_GROUPER}.${name}.optionalOrRequired`}
+              uniqueInputLevelRowID={uniqueInputLevelRowID}
+            />
           )}
-        /> */}
-              </td>
-            </>
-          )}
-        />
+        </td>
       </tr>
       {childMetadataFields &&
-        Object.entries(childMetadataFields).map(([fieldName, field]) => (
-          <tr className={styles['input-level-row--child-field']} key={fieldName}>
+        Object.entries(childMetadataFields).map(([key, field]) => (
+          <tr className={styles['input-level-row--child-field']} key={key}>
             <td>{field.displayName}</td>
+            <td>
+              <RequiredAndOptionalRadios
+                fieldName={`${INPUT_LEVELS_GROUPER}.${field.name}.optionalOrRequired`}
+                uniqueInputLevelRowID={`${uniqueInputLevelRowID}-${field.name}`}
+              />
+            </td>
           </tr>
         ))}
     </>
   )
 }
+
+interface RequiredAndOptionalRadiosProps {
+  fieldName: string
+  uniqueInputLevelRowID: string
+}
+
+const RequiredAndOptionalRadios = ({
+  fieldName,
+  uniqueInputLevelRowID
+}: RequiredAndOptionalRadiosProps) => {
+  const { control } = useFormContext()
+
+  return (
+    <Controller
+      name={fieldName}
+      control={control}
+      render={({ field: { onChange, ref, value }, fieldState: { invalid, error } }) => {
+        const castedValue = value as CollectionFormInputLevelValue
+
+        const handleChange = (e: ChangeEvent<HTMLInputElement>) => {
+          console.log(e)
+          onChange(e.target.value)
+        }
+
+        return (
+          <Stack direction="horizontal">
+            <Form.Group.Radio
+              label="Required"
+              onChange={handleChange}
+              checked={castedValue === 'required'}
+              value="required"
+              name={`${uniqueInputLevelRowID}-radio-group`}
+              id={`${uniqueInputLevelRowID}-required-radio`}
+              ref={ref}
+            />
+            <Form.Group.Radio
+              label="Optional"
+              onChange={handleChange}
+              checked={castedValue === 'optional'}
+              value="optional"
+              name={`${uniqueInputLevelRowID}-radio-group`}
+              id={`${uniqueInputLevelRowID}-optional-radio`}
+              ref={ref}
+            />
+          </Stack>
+        )
+      }}
+    />
+  )
+}
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.module.scss b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.module.scss
index 83f8bc600..6a2cb6114 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.module.scss
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.module.scss
@@ -2,27 +2,17 @@
 
 .input-levels-table-container {
   position: relative;
-  display: grid;
-  grid-template-rows: 0fr;
+  display: none;
   width: 70%;
   max-height: 400px;
   margin-bottom: 1rem;
   margin-left: 3rem;
   overflow-y: auto;
-  border: solid 1px $dv-secondary-color;
   border-radius: 4px;
-  transition: grid-template-rows 350ms;
-
-  .inner {
-    overflow: hidden;
-  }
 
   &--show {
-    grid-template-rows: 1fr;
-
-    .inner {
-      overflow: auto;
-    }
+    display: block;
+    border: solid 1px $dv-secondary-color;
   }
 }
 
@@ -37,9 +27,18 @@
 }
 
 .input-level-row {
+  td {
+    width: 50%;
+  }
+
   &--child-field {
     td {
-      padding-left: 1.5rem;
+      padding-block: 1rem;
+
+      &:first-child {
+        padding-left: 3rem;
+        text-wrap: balance;
+      }
     }
   }
 }
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.tsx
index d71673c30..7016b4f41 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.tsx
@@ -18,7 +18,7 @@ export const InputLevelsTable = ({
   blockMetadataInputLevelFields,
   closeButton
 }: InputLevelsTableProps) => {
-  console.log(blockMetadataInputLevelFields)
+  // console.log(blockMetadataInputLevelFields)
 
   // TODO:ME Disable everything if disabled
   return (
@@ -26,19 +26,15 @@ export const InputLevelsTable = ({
       className={cn(styles['input-levels-table-container'], {
         [styles['input-levels-table-container--show']]: show
       })}>
-      <div className={styles.inner}>
-        <div className={styles['close-button-container']}>{closeButton}</div>
+      <div className={styles['close-button-container']}>{closeButton}</div>
 
-        <Table>
-          <tbody>
-            {Object.entries(blockMetadataInputLevelFields.metadataFields).map(
-              ([fieldName, field]) => (
-                <InputLevelFieldRow metadataField={field} key={fieldName} />
-              )
-            )}
-          </tbody>
-        </Table>
-      </div>
+      <Table bordered={false}>
+        <tbody>
+          {Object.entries(blockMetadataInputLevelFields.metadataFields).map(([key, field]) => (
+            <InputLevelFieldRow metadataField={field} key={key} />
+          ))}
+        </tbody>
+      </Table>
     </div>
   )
 }
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/useGetBlockMetadataInputLevelFields.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/useGetBlockMetadataInputLevelFields.tsx
index 68a255dfa..82554b73f 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/useGetBlockMetadataInputLevelFields.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/useGetBlockMetadataInputLevelFields.tsx
@@ -51,14 +51,20 @@ export const useGetBlockMetadataInputLevelFields = ({
         const formattedMetadataFields: BlockMetadataInputLevelFields['metadataFields'] =
           Object.entries(blockInfo.metadataFields).reduce((acc, [key, value]) => {
             const { name, displayName, childMetadataFields } = value
+            const replaceDotWithSlash = (str: string) => str.replace(/\./g, '/')
+            const normalizedName = replaceDotWithSlash(name)
+
             acc[key] = {
-              name,
+              name: normalizedName,
               displayName,
               childMetadataFields: childMetadataFields
                 ? Object.entries(childMetadataFields).reduce((acc, [key, value]) => {
                     const { name, displayName } = value
+
+                    const normalizedChildfieldName = replaceDotWithSlash(name)
+
                     acc[key] = {
-                      name,
+                      name: normalizedChildfieldName,
                       displayName
                     }
                     return acc
diff --git a/src/sections/create-collection/useGetAllMetadataBlocksInfoByName.tsx b/src/sections/create-collection/useGetAllMetadataBlocksInfoByName.tsx
new file mode 100644
index 000000000..c6dceab1b
--- /dev/null
+++ b/src/sections/create-collection/useGetAllMetadataBlocksInfoByName.tsx
@@ -0,0 +1,144 @@
+import { useEffect, useState } from 'react'
+import { MetadataBlockInfoRepository } from '../../metadata-block-info/domain/repositories/MetadataBlockInfoRepository'
+import {
+  MetadataBlockInfo,
+  MetadataBlockName,
+  MetadataField
+} from '../../metadata-block-info/domain/models/MetadataBlockInfo'
+import { getMetadataBlockInfoByNameTemporal } from '../../metadata-block-info/domain/useCases/getMetadataBlockInfoByNameTemporal'
+// import { MetadataBlockInfoRepository } from '../../../../../metadata-block-info/domain/repositories/MetadataBlockInfoRepository'
+// import {
+//   MetadataBlockInfo,
+//   MetadataBlockName,
+//   MetadataField
+// } from '../../../../../metadata-block-info/domain/models/MetadataBlockInfo'
+// import { getMetadataBlockInfoByNameTemporal } from '../../../../../metadata-block-info/domain/useCases/getMetadataBlockInfoByNameTemporal'
+
+interface Props {
+  metadataBlockInfoRepository: MetadataBlockInfoRepository
+}
+
+interface UseGetAllMetadataBlocksInfoByName {
+  allMetadataBlocksInfo: ReducedMetadataBlockInfo[]
+  error: string | null
+  isLoading: boolean
+}
+
+export interface ReducedMetadataBlockInfo {
+  id: MetadataBlockInfo['id']
+  name: MetadataBlockInfo['name']
+  displayName: MetadataBlockInfo['displayName']
+  metadataFields: Record<string, ReducedMetadataFieldInfo>
+}
+
+export type ReducedMetadataFieldInfo = Pick<MetadataField, 'name' | 'displayName'> & {
+  childMetadataFields?: Record<string, Pick<MetadataField, 'name' | 'displayName'>>
+}
+
+const blocksNames: MetadataBlockName[] = [
+  MetadataBlockName.CITATION,
+  MetadataBlockName.GEOSPATIAL,
+  MetadataBlockName.SOCIAL_SCIENCE,
+  MetadataBlockName.ASTROPHYSICS,
+  MetadataBlockName.BIOMEDICAL,
+  MetadataBlockName.JOURNAL
+]
+
+export const useGetAllMetadataBlocksInfoByName = ({
+  metadataBlockInfoRepository
+}: Props): UseGetAllMetadataBlocksInfoByName => {
+  const [allMetadataBlocksInfo, setAllMetadataBlocksInfo] = useState<ReducedMetadataBlockInfo[]>([])
+  const [isLoading, setIsLoading] = useState<boolean>(true)
+  const [error, setError] = useState<string | null>(null)
+
+  useEffect(() => {
+    const handleGetInfo = async () => {
+      setIsLoading(true)
+      try {
+        const promises = blocksNames.map((blockName) =>
+          getMetadataBlockInfoByNameTemporal(metadataBlockInfoRepository, blockName)
+        )
+
+        const blocksInfo = await Promise.all(promises)
+
+        const reducedMetadataBlocksInfo: ReducedMetadataBlockInfo[] = blocksInfo.map(
+          (blockInfo) => {
+            const formattedMetadataFields: Record<string, ReducedMetadataFieldInfo> =
+              Object.entries(blockInfo.metadataFields).reduce((acc, [key, value]) => {
+                const { name, displayName, childMetadataFields } = value
+                const replaceDotWithSlash = (str: string) => str.replace(/\./g, '/')
+                const normalizedName = replaceDotWithSlash(name)
+
+                acc[key] = {
+                  name: normalizedName,
+                  displayName,
+                  childMetadataFields: childMetadataFields
+                    ? Object.entries(childMetadataFields).reduce((acc, [key, value]) => {
+                        const { name, displayName } = value
+
+                        const normalizedChildfieldName = replaceDotWithSlash(name)
+
+                        acc[key] = {
+                          name: normalizedChildfieldName,
+                          displayName
+                        }
+                        return acc
+                      }, {} as Record<string, Pick<MetadataField, 'name' | 'displayName'>>)
+                    : undefined
+                }
+                return acc
+              }, {} as Record<string, ReducedMetadataFieldInfo>)
+
+            const reducedMetadataBlockInfo: ReducedMetadataBlockInfo = {
+              id: blockInfo.id,
+              name: blockInfo.name,
+              displayName: blockInfo.displayName,
+              metadataFields: formattedMetadataFields
+            }
+
+            return reducedMetadataBlockInfo
+          }
+        )
+
+        // #region Temporal
+        // const citationBlock: MetadataBlockInfo = reducedMetadataBlocksInfo.find(
+        //   (block) => block.name === MetadataBlockName.CITATION
+        // )
+        // const geospatialBlock: MetadataBlockInfo = reducedMetadataBlocksInfo.find(
+        //   (block) => block.name === MetadataBlockName.GEOSPATIAL
+        // )
+        // const socialScienceBlock: MetadataBlockInfo = reducedMetadataBlocksInfo.find(
+        //   (block) => block.name === MetadataBlockName.SOCIAL_SCIENCE
+        // )
+        // const astrophysicsBlock: MetadataBlockInfo = reducedMetadataBlocksInfo.find(
+        //   (block) => block.name === MetadataBlockName.ASTROPHYSICS
+        // )
+        // const biomedicalBlock: MetadataBlockInfo = reducedMetadataBlocksInfo.find(
+        //   (block) => block.name === MetadataBlockName.BIOMEDICAL
+        // )
+        // const journalBlock: MetadataBlockInfo = reducedMetadataBlocksInfo.find(
+        //   (block) => block.name === MetadataBlockName.JOURNAL
+        // )
+        // #endregion
+
+        setAllMetadataBlocksInfo(reducedMetadataBlocksInfo)
+      } catch (err) {
+        const errorMessage =
+          err instanceof Error && err.message
+            ? err.message
+            : 'Something went wrong getting the information from the metadata blocks. Try again later.'
+        setError(errorMessage)
+      } finally {
+        setIsLoading(false)
+      }
+    }
+
+    void handleGetInfo()
+  }, [metadataBlockInfoRepository])
+
+  return {
+    allMetadataBlocksInfo,
+    error,
+    isLoading
+  }
+}
diff --git a/src/sections/create-collection/useGetMetadataBlocksNamesInfo.tsx b/src/sections/create-collection/useGetCollectionMetadataBlocksNamesInfo.tsx
similarity index 97%
rename from src/sections/create-collection/useGetMetadataBlocksNamesInfo.tsx
rename to src/sections/create-collection/useGetCollectionMetadataBlocksNamesInfo.tsx
index 9270f8853..e9ca4944b 100644
--- a/src/sections/create-collection/useGetMetadataBlocksNamesInfo.tsx
+++ b/src/sections/create-collection/useGetCollectionMetadataBlocksNamesInfo.tsx
@@ -17,7 +17,7 @@ interface UseGetMetadataBlocksNamesInfoReturn {
   isLoading: boolean
 }
 
-export const useGetMetadataBlocksNamesInfo = ({
+export const useGetCollectionMetadataBlocksNamesInfo = ({
   collectionId,
   metadataBlockInfoRepository
 }: Props): UseGetMetadataBlocksNamesInfoReturn => {

From 3dc04f8ad0abaec4102f197db0e4f25d9bb70c00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Tue, 30 Jul 2024 16:41:21 -0300
Subject: [PATCH 14/52] feat: correctly defined base inputLevels

---
 .../create-collection/CreateCollection.tsx    | 40 +++++--------------
 .../collection-form/CollectionForm.tsx        | 12 ++----
 .../collection-form/CollectionFormHelper.ts   | 25 +++++++++++-
 3 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/src/sections/create-collection/CreateCollection.tsx b/src/sections/create-collection/CreateCollection.tsx
index 346de19e9..68361ab39 100644
--- a/src/sections/create-collection/CreateCollection.tsx
+++ b/src/sections/create-collection/CreateCollection.tsx
@@ -20,7 +20,6 @@ import { SeparationLine } from '../shared/layout/SeparationLine/SeparationLine'
 import { RequiredFieldText } from '../shared/form/RequiredFieldText/RequiredFieldText'
 import { PageNotFound } from '../page-not-found/PageNotFound'
 import { CreateCollectionSkeleton } from './CreateCollectionSkeleton'
-import { CollectionInputLevel } from '../../collection/domain/models/Collection'
 import { useGetAllMetadataBlocksInfoByName } from './useGetAllMetadataBlocksInfoByName'
 import { CollectionFormHelper } from './collection-form/CollectionFormHelper'
 
@@ -44,8 +43,8 @@ export function CreateCollection({
     ownerCollectionId
   )
 
-  // TODO:ME Quizas en modo edicion collection id no deberia ser sobre el owner sino sobre la collection en si, pero esta quizas se puede diferenciar por pagina.
-  // Es decir, en esta pagina create, esta bien obtener sobre el padre, en la pagina edit sobre el mismo collection.
+  // TODO:ME Maybe in edit mode collection id should not be on the owner but on the collection itself, but this can perhaps be differentiated by page.
+  // That is to say, in this create page, it is good to get on the parent, in the edit page on the same collection.
   const { metadataBlocksNamesInfo, isLoading: isLoadingMetadataBlocksNamesInfo } =
     useGetCollectionMetadataBlocksNamesInfo({
       collectionId: ownerCollectionId,
@@ -55,10 +54,14 @@ export function CreateCollection({
   const { allMetadataBlocksInfo, isLoading: isLoadingAllMetadataBlocksInfo } =
     useGetAllMetadataBlocksInfoByName({ metadataBlockInfoRepository })
 
-  const baseInputLevels = useDeepCompareMemo(() => {
-    return CollectionFormHelper.getFormBaseInputLevels(allMetadataBlocksInfo)
+  const formBaseInputLevels: FormattedCollectionInputLevels = useDeepCompareMemo(() => {
+    return CollectionFormHelper.defineBaseInputLevels(allMetadataBlocksInfo)
   }, [allMetadataBlocksInfo])
 
+  const formDefaultInputLevels: FormattedCollectionInputLevels = useDeepCompareMemo(() => {
+    return CollectionFormHelper.formatCollectiontInputLevels(collection?.inputLevels)
+  }, [collection?.inputLevels])
+
   const defaultBlocksNames = useDeepCompareMemo(
     () =>
       metadataBlocksNamesInfo.reduce(
@@ -94,6 +97,7 @@ export function CreateCollection({
     setIsLoading
   ])
 
+  // TODO:ME Instead show error of parent collection not found.
   if (!isLoadingCollection && !collection) {
     return <PageNotFound />
   }
@@ -107,28 +111,6 @@ export function CreateCollection({
     return <CreateCollectionSkeleton />
   }
 
-  console.log({ baseInputLevels })
-
-  // TODO:ME Move to another place?
-  const transformInputLevels = (levels: CollectionInputLevel[]): FormattedCollectionInputLevels => {
-    const result: FormattedCollectionInputLevels = {}
-    levels.forEach((level) => {
-      const { datasetFieldName, include, required } = level
-      const replaceDotWithSlash = (str: string) => str.replace(/\./g, '/')
-      const normalizedFieldName = replaceDotWithSlash(datasetFieldName)
-
-      result[normalizedFieldName] = {
-        include,
-        optionalOrRequired: required ? 'required' : 'optional'
-      }
-    })
-    return result
-  }
-
-  const defaultInputLevels: FormattedCollectionInputLevels | undefined = collection.inputLevels
-    ? transformInputLevels(collection.inputLevels)
-    : undefined
-
   const formDefaultValues: CollectionFormData = {
     hostCollection: collection.name,
     name: user?.displayName ? `${user?.displayName} Collection` : '',
@@ -141,8 +123,8 @@ export function CreateCollection({
     [USE_FIELDS_FROM_PARENT]: true,
     [METADATA_BLOCKS_NAMES_GROUPER]: defaultBlocksNames,
     inputLevels: {
-      ...baseInputLevels,
-      ...defaultInputLevels
+      ...formBaseInputLevels,
+      ...formDefaultInputLevels
     }
   }
 
diff --git a/src/sections/create-collection/collection-form/CollectionForm.tsx b/src/sections/create-collection/collection-form/CollectionForm.tsx
index 35865c2a6..037cb9024 100644
--- a/src/sections/create-collection/collection-form/CollectionForm.tsx
+++ b/src/sections/create-collection/collection-form/CollectionForm.tsx
@@ -62,13 +62,6 @@ export const CollectionFormInputLevelOptions = {
 export type CollectionFormInputLevelValue =
   (typeof CollectionFormInputLevelOptions)[keyof typeof CollectionFormInputLevelOptions]
 
-// export type FormattedCollectionInputLevels = {
-//   [key: string]: {
-//     include: boolean
-//     required: boolean
-//   }
-// }
-
 // On the submit function callback, type is CollectionType as type field is required and wont never be ""
 export type CollectionFormValuesOnSubmit = Omit<CollectionFormData, 'type'> & {
   type: CollectionType
@@ -95,9 +88,10 @@ export const CollectionForm = ({
     defaultValues
   })
 
-  const { formState, watch } = form
+  const { formState } = form
 
-  console.log(watch('inputLevels'))
+  console.log({ defaultValues })
+  // console.log(watch('inputLevels'))
 
   const preventEnterSubmit = (e: React.KeyboardEvent<HTMLFormElement | HTMLButtonElement>) => {
     // When pressing Enter, only submit the form  if the user is focused on the submit button itself
diff --git a/src/sections/create-collection/collection-form/CollectionFormHelper.ts b/src/sections/create-collection/collection-form/CollectionFormHelper.ts
index 036c1a5f0..c4f368172 100644
--- a/src/sections/create-collection/collection-form/CollectionFormHelper.ts
+++ b/src/sections/create-collection/collection-form/CollectionFormHelper.ts
@@ -1,3 +1,4 @@
+import { CollectionInputLevel } from '../../../collection/domain/models/Collection'
 import { ReducedMetadataBlockInfo } from '../useGetAllMetadataBlocksInfoByName'
 import { FormattedCollectionInputLevels } from './CollectionForm'
 
@@ -6,7 +7,7 @@ export class CollectionFormHelper {
 
   public static replaceSlashWithDot = (str: string) => str.replace(/\//g, '.')
 
-  public static getFormBaseInputLevels(
+  public static defineBaseInputLevels(
     allMetadataBlocksInfoReduced: ReducedMetadataBlockInfo[]
   ): FormattedCollectionInputLevels {
     const fields: FormattedCollectionInputLevels = {}
@@ -38,4 +39,26 @@ export class CollectionFormHelper {
       ...childFields
     }
   }
+
+  public static formatCollectiontInputLevels(
+    collectionInputLevels: CollectionInputLevel[] | undefined
+  ): FormattedCollectionInputLevels {
+    const result: FormattedCollectionInputLevels = {}
+
+    if (!collectionInputLevels) {
+      return result
+    }
+
+    collectionInputLevels.forEach((level) => {
+      const { datasetFieldName, include, required } = level
+      const replaceDotWithSlash = (str: string) => str.replace(/\./g, '/')
+      const normalizedFieldName = replaceDotWithSlash(datasetFieldName)
+
+      result[normalizedFieldName] = {
+        include,
+        optionalOrRequired: required ? 'required' : 'optional'
+      }
+    })
+    return result
+  }
 }

From 3b07a603ab3085346bf2e6463572101a5dcb4a2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Tue, 30 Jul 2024 17:05:33 -0300
Subject: [PATCH 15/52] feat: clean up, refactor all blocks fetching

---
 .../create-collection/CreateCollection.tsx    | 10 ++---
 .../collection-form/CollectionForm.tsx        | 14 +++---
 .../collection-form/CollectionFormHelper.ts   | 45 +++++++++++++++++++
 .../MetadataFieldsSection.tsx                 | 30 ++++++++-----
 .../MetadataInputLevelFieldsBlock.tsx         | 23 +++-------
 .../input-levels-table/InputLevelFieldRow.tsx |  2 +-
 .../input-levels-table/InputLevelsTable.tsx   |  8 ++--
 .../useGetAllMetadataBlocksInfoByName.tsx     | 28 ------------
 8 files changed, 86 insertions(+), 74 deletions(-)

diff --git a/src/sections/create-collection/CreateCollection.tsx b/src/sections/create-collection/CreateCollection.tsx
index 68361ab39..758fd11cf 100644
--- a/src/sections/create-collection/CreateCollection.tsx
+++ b/src/sections/create-collection/CreateCollection.tsx
@@ -2,11 +2,13 @@ import { useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useDeepCompareMemo } from 'use-deep-compare'
 import { useCollection } from '../collection/useCollection'
+import { useGetCollectionMetadataBlocksNamesInfo } from './useGetCollectionMetadataBlocksNamesInfo'
+import { useGetAllMetadataBlocksInfoByName } from './useGetAllMetadataBlocksInfoByName'
 import { CollectionRepository } from '../../collection/domain/repositories/CollectionRepository'
+import { MetadataBlockInfoRepository } from '../../metadata-block-info/domain/repositories/MetadataBlockInfoRepository'
 import { useLoading } from '../loading/LoadingContext'
 import { useSession } from '../session/SessionContext'
-import { MetadataBlockInfoRepository } from '../../metadata-block-info/domain/repositories/MetadataBlockInfoRepository'
-import { useGetCollectionMetadataBlocksNamesInfo } from './useGetCollectionMetadataBlocksNamesInfo'
+import { CollectionFormHelper } from './collection-form/CollectionFormHelper'
 import {
   CollectionForm,
   CollectionFormData,
@@ -20,8 +22,6 @@ import { SeparationLine } from '../shared/layout/SeparationLine/SeparationLine'
 import { RequiredFieldText } from '../shared/form/RequiredFieldText/RequiredFieldText'
 import { PageNotFound } from '../page-not-found/PageNotFound'
 import { CreateCollectionSkeleton } from './CreateCollectionSkeleton'
-import { useGetAllMetadataBlocksInfoByName } from './useGetAllMetadataBlocksInfoByName'
-import { CollectionFormHelper } from './collection-form/CollectionFormHelper'
 
 interface CreateCollectionProps {
   ownerCollectionId: string
@@ -144,9 +144,9 @@ export function CreateCollection({
 
       <CollectionForm
         collectionRepository={collectionRepository}
-        metadataBlockInfoRepository={metadataBlockInfoRepository}
         ownerCollectionId={ownerCollectionId}
         defaultValues={formDefaultValues}
+        allMetadataBlocksInfo={allMetadataBlocksInfo}
       />
     </section>
   )
diff --git a/src/sections/create-collection/collection-form/CollectionForm.tsx b/src/sections/create-collection/collection-form/CollectionForm.tsx
index 037cb9024..944a68da2 100644
--- a/src/sections/create-collection/collection-form/CollectionForm.tsx
+++ b/src/sections/create-collection/collection-form/CollectionForm.tsx
@@ -8,13 +8,13 @@ import {
   CollectionType,
   CollectionStorage
 } from '../../../collection/domain/useCases/DTOs/CollectionDTO'
-import { SeparationLine } from '../../shared/layout/SeparationLine/SeparationLine'
 import { SubmissionStatus, useSubmitCollection } from './useSubmitCollection'
+import { ReducedMetadataBlockInfo } from '../useGetAllMetadataBlocksInfoByName'
+import { MetadataBlockName } from '../../../metadata-block-info/domain/models/MetadataBlockInfo'
+import { SeparationLine } from '../../shared/layout/SeparationLine/SeparationLine'
 import { TopFieldsSection } from './top-fields-section/TopFieldsSection'
 import { MetadataFieldsSection } from './metadata-fields-section/MetadataFieldsSection'
 import { BrowseSearchFacetsSection } from './browse-search-facets-section/BrowseSearchFacetsSection'
-import { MetadataBlockName } from '../../../metadata-block-info/domain/models/MetadataBlockInfo'
-import { MetadataBlockInfoRepository } from '../../../metadata-block-info/domain/repositories/MetadataBlockInfoRepository'
 import styles from './CollectionForm.module.scss'
 
 export const METADATA_BLOCKS_NAMES_GROUPER = 'metadataBlockNames'
@@ -23,9 +23,9 @@ export const INPUT_LEVELS_GROUPER = 'inputLevels'
 
 export interface CollectionFormProps {
   collectionRepository: CollectionRepository
-  metadataBlockInfoRepository: MetadataBlockInfoRepository
   ownerCollectionId: string
   defaultValues: CollectionFormData
+  allMetadataBlocksInfo: ReducedMetadataBlockInfo[]
 }
 
 export type CollectionFormData = {
@@ -69,9 +69,9 @@ export type CollectionFormValuesOnSubmit = Omit<CollectionFormData, 'type'> & {
 
 export const CollectionForm = ({
   collectionRepository,
-  metadataBlockInfoRepository,
   ownerCollectionId,
-  defaultValues
+  defaultValues,
+  allMetadataBlocksInfo
 }: CollectionFormProps) => {
   const formContainerRef = useRef<HTMLDivElement>(null)
   const { t } = useTranslation('createCollection')
@@ -146,7 +146,7 @@ export const CollectionForm = ({
           <Stack>
             <Card>
               <Card.Body>
-                <MetadataFieldsSection metadataBlockInfoRepository={metadataBlockInfoRepository} />
+                <MetadataFieldsSection allMetadataBlocksInfo={allMetadataBlocksInfo} />
               </Card.Body>
             </Card>
 
diff --git a/src/sections/create-collection/collection-form/CollectionFormHelper.ts b/src/sections/create-collection/collection-form/CollectionFormHelper.ts
index c4f368172..bca9673c3 100644
--- a/src/sections/create-collection/collection-form/CollectionFormHelper.ts
+++ b/src/sections/create-collection/collection-form/CollectionFormHelper.ts
@@ -1,4 +1,5 @@
 import { CollectionInputLevel } from '../../../collection/domain/models/Collection'
+import { MetadataBlockName } from '../../../metadata-block-info/domain/models/MetadataBlockInfo'
 import { ReducedMetadataBlockInfo } from '../useGetAllMetadataBlocksInfoByName'
 import { FormattedCollectionInputLevels } from './CollectionForm'
 
@@ -61,4 +62,48 @@ export class CollectionFormHelper {
     })
     return result
   }
+
+  public static separateMetadataBlocksInfoByNames(
+    allMetadataBlocksInfo: ReducedMetadataBlockInfo[]
+  ): {
+    citationBlock: ReducedMetadataBlockInfo
+    geospatialBlock: ReducedMetadataBlockInfo
+    socialScienceBlock: ReducedMetadataBlockInfo
+    astrophysicsBlock: ReducedMetadataBlockInfo
+    biomedicalBlock: ReducedMetadataBlockInfo
+    journalBlock: ReducedMetadataBlockInfo
+  } {
+    const citationBlock: ReducedMetadataBlockInfo = allMetadataBlocksInfo.find(
+      (block) => block.name === MetadataBlockName.CITATION
+    ) as ReducedMetadataBlockInfo
+
+    const geospatialBlock: ReducedMetadataBlockInfo = allMetadataBlocksInfo.find(
+      (block) => block.name === MetadataBlockName.GEOSPATIAL
+    ) as ReducedMetadataBlockInfo
+
+    const socialScienceBlock: ReducedMetadataBlockInfo = allMetadataBlocksInfo.find(
+      (block) => block.name === MetadataBlockName.SOCIAL_SCIENCE
+    ) as ReducedMetadataBlockInfo
+
+    const astrophysicsBlock: ReducedMetadataBlockInfo = allMetadataBlocksInfo.find(
+      (block) => block.name === MetadataBlockName.ASTROPHYSICS
+    ) as ReducedMetadataBlockInfo
+
+    const biomedicalBlock: ReducedMetadataBlockInfo = allMetadataBlocksInfo.find(
+      (block) => block.name === MetadataBlockName.BIOMEDICAL
+    ) as ReducedMetadataBlockInfo
+
+    const journalBlock: ReducedMetadataBlockInfo = allMetadataBlocksInfo.find(
+      (block) => block.name === MetadataBlockName.JOURNAL
+    ) as ReducedMetadataBlockInfo
+
+    return {
+      citationBlock,
+      geospatialBlock,
+      socialScienceBlock,
+      astrophysicsBlock,
+      biomedicalBlock,
+      journalBlock
+    }
+  }
 }
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx
index 2c52a3dc9..5fbfc499b 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx
@@ -1,19 +1,27 @@
 import { useTranslation } from 'react-i18next'
 import { Col, Form, Row, Stack } from '@iqss/dataverse-design-system'
+import { ReducedMetadataBlockInfo } from '../../useGetAllMetadataBlocksInfoByName'
 import { MetadataInputLevelFieldsBlock } from './metadata-input-level-fields-block/MetadataInputLevelFieldsBlock'
 import { FieldsFromRootCheckbox } from './fields-from-root-checkbox/FieldsFromRootCheckbox'
 import { MetadataBlockName } from '../../../../metadata-block-info/domain/models/MetadataBlockInfo'
-import { MetadataBlockInfoRepository } from '../../../../metadata-block-info/domain/repositories/MetadataBlockInfoRepository'
+import { CollectionFormHelper } from '../CollectionFormHelper'
 
 interface MetadataFieldsSectionProps {
-  metadataBlockInfoRepository: MetadataBlockInfoRepository
+  allMetadataBlocksInfo: ReducedMetadataBlockInfo[]
 }
 
-export const MetadataFieldsSection = ({
-  metadataBlockInfoRepository
-}: MetadataFieldsSectionProps) => {
+export const MetadataFieldsSection = ({ allMetadataBlocksInfo }: MetadataFieldsSectionProps) => {
   const { t } = useTranslation('createCollection')
 
+  const {
+    citationBlock,
+    geospatialBlock,
+    socialScienceBlock,
+    astrophysicsBlock,
+    biomedicalBlock,
+    journalBlock
+  } = CollectionFormHelper.separateMetadataBlocksInfoByNames(allMetadataBlocksInfo)
+
   return (
     <Row>
       <Col lg={3}>
@@ -28,32 +36,32 @@ export const MetadataFieldsSection = ({
             <MetadataInputLevelFieldsBlock
               blockName={MetadataBlockName.CITATION}
               blockDisplayName="Citation Metadata (Required)"
-              metadataBlockInfoRepository={metadataBlockInfoRepository}
+              reducedMetadataBlockInfo={citationBlock}
             />
             <MetadataInputLevelFieldsBlock
               blockName={MetadataBlockName.GEOSPATIAL}
               blockDisplayName="Geospatial Metadata"
-              metadataBlockInfoRepository={metadataBlockInfoRepository}
+              reducedMetadataBlockInfo={geospatialBlock}
             />
             <MetadataInputLevelFieldsBlock
               blockName={MetadataBlockName.SOCIAL_SCIENCE}
               blockDisplayName="Social Science and Humanities Metadata"
-              metadataBlockInfoRepository={metadataBlockInfoRepository}
+              reducedMetadataBlockInfo={socialScienceBlock}
             />
             <MetadataInputLevelFieldsBlock
               blockName={MetadataBlockName.ASTROPHYSICS}
               blockDisplayName="Astronomy and Astrophysics Metadata"
-              metadataBlockInfoRepository={metadataBlockInfoRepository}
+              reducedMetadataBlockInfo={astrophysicsBlock}
             />
             <MetadataInputLevelFieldsBlock
               blockName={MetadataBlockName.BIOMEDICAL}
               blockDisplayName="Life Sciences Metadata"
-              metadataBlockInfoRepository={metadataBlockInfoRepository}
+              reducedMetadataBlockInfo={biomedicalBlock}
             />
             <MetadataInputLevelFieldsBlock
               blockName={MetadataBlockName.JOURNAL}
               blockDisplayName="Journal Metadata"
-              metadataBlockInfoRepository={metadataBlockInfoRepository}
+              reducedMetadataBlockInfo={journalBlock}
             />
           </Stack>
         </Col>
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
index 6f46ffed3..fc734f6a0 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
@@ -2,23 +2,21 @@ import { useId, useState } from 'react'
 import { Controller, UseControllerProps, useFormContext, useWatch } from 'react-hook-form'
 import { Button, Form, Stack } from '@iqss/dataverse-design-system'
 import { CloseButton } from 'react-bootstrap'
-// import { CollectionInputLevel } from '../../../../../collection/domain/models/Collection'
 import { MetadataBlockName } from '../../../../../metadata-block-info/domain/models/MetadataBlockInfo'
+import { ReducedMetadataBlockInfo } from '../../../useGetAllMetadataBlocksInfoByName'
 import { METADATA_BLOCKS_NAMES_GROUPER, USE_FIELDS_FROM_PARENT } from '../../CollectionForm'
-import { MetadataBlockInfoRepository } from '../../../../../metadata-block-info/domain/repositories/MetadataBlockInfoRepository'
-import { useGetBlockMetadataInputLevelFields } from './useGetBlockMetadataInputLevelFields'
 import { InputLevelsTable } from './input-levels-table/InputLevelsTable'
 
 interface MetadataInputLevelFieldsBlockProps {
   blockName: MetadataBlockName
   blockDisplayName: string
-  metadataBlockInfoRepository: MetadataBlockInfoRepository
+  reducedMetadataBlockInfo: ReducedMetadataBlockInfo
 }
 
 export const MetadataInputLevelFieldsBlock = ({
   blockName,
   blockDisplayName,
-  metadataBlockInfoRepository
+  reducedMetadataBlockInfo
 }: MetadataInputLevelFieldsBlockProps) => {
   const checkboxID = useId()
   const { control } = useFormContext()
@@ -36,12 +34,6 @@ export const MetadataInputLevelFieldsBlock = ({
     name: metadataBlockFieldName
   }) as boolean
 
-  const {
-    blockMetadataInputLevelFields,
-    error: errorBlockMetadataFields,
-    isLoading: isLoadingBlockMetadataFields
-  } = useGetBlockMetadataInputLevelFields({ blockName, metadataBlockInfoRepository })
-
   const isCitation = blockName === MetadataBlockName.CITATION
 
   const rules: UseControllerProps['rules'] = {}
@@ -67,11 +59,6 @@ export const MetadataInputLevelFieldsBlock = ({
     })
   }
 
-  // TODO: Temporary, this will change with get all metadata blocks info use case
-  if (isLoadingBlockMetadataFields || errorBlockMetadataFields || !blockMetadataInputLevelFields) {
-    return null
-  }
-
   return (
     <Stack direction="vertical" gap={2}>
       <Stack direction="horizontal" gap={0}>
@@ -122,12 +109,12 @@ export const MetadataInputLevelFieldsBlock = ({
       <InputLevelsTable
         show={inputLevelsTableStatus.show}
         disabled={inputLevelsTableStatus.asDisabled}
-        blockMetadataInputLevelFields={blockMetadataInputLevelFields}
+        blockMetadataInputLevelFields={reducedMetadataBlockInfo}
         closeButton={
           <CloseButton
             onClick={handleHideInputLevelsTable}
             aria-label="Hide input levels table"
-            tabIndex={inputLevelsTableStatus.show ? 1 : -1}
+            tabIndex={inputLevelsTableStatus.show ? 0 : -1}
           />
         }
       />
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
index f225b4757..cde4b6847 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
@@ -2,8 +2,8 @@ import { ChangeEvent, useId } from 'react'
 import { Controller, UseControllerProps, useFormContext } from 'react-hook-form'
 import { Form, Stack } from '@iqss/dataverse-design-system'
 import { ReducedMetadataFieldInfo } from '../useGetBlockMetadataInputLevelFields'
-import styles from './InputLevelsTable.module.scss'
 import { CollectionFormInputLevelValue, INPUT_LEVELS_GROUPER } from '../../../CollectionForm'
+import styles from './InputLevelsTable.module.scss'
 
 interface InputLevelFieldRowProps {
   metadataField: ReducedMetadataFieldInfo
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.tsx
index 7016b4f41..8d962b195 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.tsx
@@ -1,15 +1,15 @@
-import { BlockMetadataInputLevelFields } from '../useGetBlockMetadataInputLevelFields'
+import { ReactNode } from 'react'
 import cn from 'classnames'
-import styles from './InputLevelsTable.module.scss'
-import React from 'react'
 import { Table } from '@iqss/dataverse-design-system'
+import { BlockMetadataInputLevelFields } from '../useGetBlockMetadataInputLevelFields'
 import { InputLevelFieldRow } from './InputLevelFieldRow'
+import styles from './InputLevelsTable.module.scss'
 
 interface InputLevelsTableProps {
   show: boolean
   disabled: boolean
   blockMetadataInputLevelFields: BlockMetadataInputLevelFields
-  closeButton: React.ReactNode
+  closeButton: ReactNode
 }
 
 export const InputLevelsTable = ({
diff --git a/src/sections/create-collection/useGetAllMetadataBlocksInfoByName.tsx b/src/sections/create-collection/useGetAllMetadataBlocksInfoByName.tsx
index c6dceab1b..c673070b4 100644
--- a/src/sections/create-collection/useGetAllMetadataBlocksInfoByName.tsx
+++ b/src/sections/create-collection/useGetAllMetadataBlocksInfoByName.tsx
@@ -6,13 +6,6 @@ import {
   MetadataField
 } from '../../metadata-block-info/domain/models/MetadataBlockInfo'
 import { getMetadataBlockInfoByNameTemporal } from '../../metadata-block-info/domain/useCases/getMetadataBlockInfoByNameTemporal'
-// import { MetadataBlockInfoRepository } from '../../../../../metadata-block-info/domain/repositories/MetadataBlockInfoRepository'
-// import {
-//   MetadataBlockInfo,
-//   MetadataBlockName,
-//   MetadataField
-// } from '../../../../../metadata-block-info/domain/models/MetadataBlockInfo'
-// import { getMetadataBlockInfoByNameTemporal } from '../../../../../metadata-block-info/domain/useCases/getMetadataBlockInfoByNameTemporal'
 
 interface Props {
   metadataBlockInfoRepository: MetadataBlockInfoRepository
@@ -100,27 +93,6 @@ export const useGetAllMetadataBlocksInfoByName = ({
           }
         )
 
-        // #region Temporal
-        // const citationBlock: MetadataBlockInfo = reducedMetadataBlocksInfo.find(
-        //   (block) => block.name === MetadataBlockName.CITATION
-        // )
-        // const geospatialBlock: MetadataBlockInfo = reducedMetadataBlocksInfo.find(
-        //   (block) => block.name === MetadataBlockName.GEOSPATIAL
-        // )
-        // const socialScienceBlock: MetadataBlockInfo = reducedMetadataBlocksInfo.find(
-        //   (block) => block.name === MetadataBlockName.SOCIAL_SCIENCE
-        // )
-        // const astrophysicsBlock: MetadataBlockInfo = reducedMetadataBlocksInfo.find(
-        //   (block) => block.name === MetadataBlockName.ASTROPHYSICS
-        // )
-        // const biomedicalBlock: MetadataBlockInfo = reducedMetadataBlocksInfo.find(
-        //   (block) => block.name === MetadataBlockName.BIOMEDICAL
-        // )
-        // const journalBlock: MetadataBlockInfo = reducedMetadataBlocksInfo.find(
-        //   (block) => block.name === MetadataBlockName.JOURNAL
-        // )
-        // #endregion
-
         setAllMetadataBlocksInfo(reducedMetadataBlocksInfo)
       } catch (err) {
         const errorMessage =

From 129acdae34a55560e258e06682eac4d6a40a8ad6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Tue, 30 Jul 2024 23:07:04 -0300
Subject: [PATCH 16/52] feat: hidden readonly radio if parent chexbox is not
 checked

---
 .../MetadataInputLevelFieldsBlock.tsx         |  2 +-
 .../input-levels-table/InputLevelFieldRow.tsx | 34 ++++++++++++++++---
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
index fc734f6a0..9119cf718 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
@@ -61,7 +61,7 @@ export const MetadataInputLevelFieldsBlock = ({
 
   return (
     <Stack direction="vertical" gap={2}>
-      <Stack direction="horizontal" gap={0}>
+      <Stack direction="horizontal" gap={1}>
         <Controller
           name={metadataBlockFieldName}
           control={control}
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
index cde4b6847..59527f8a2 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
@@ -1,5 +1,5 @@
 import { ChangeEvent, useId } from 'react'
-import { Controller, UseControllerProps, useFormContext } from 'react-hook-form'
+import { Controller, UseControllerProps, useFormContext, useWatch } from 'react-hook-form'
 import { Form, Stack } from '@iqss/dataverse-design-system'
 import { ReducedMetadataFieldInfo } from '../useGetBlockMetadataInputLevelFields'
 import { CollectionFormInputLevelValue, INPUT_LEVELS_GROUPER } from '../../../CollectionForm'
@@ -12,10 +12,17 @@ interface InputLevelFieldRowProps {
 export const InputLevelFieldRow = ({ metadataField }: InputLevelFieldRowProps) => {
   const uniqueInputLevelRowID = useId()
   const { control } = useFormContext()
+
+  const includeCheckboxValue = useWatch({
+    name: `${INPUT_LEVELS_GROUPER}.${metadataField.name}.include`
+  }) as boolean
+
   const { name, displayName, childMetadataFields } = metadataField
 
   const rules: UseControllerProps['rules'] = {}
 
+  // TODO:ME Add label "Required by Dataverse" on specific Citation fields
+
   return (
     <>
       <tr className={styles['input-level-row']}>
@@ -32,7 +39,7 @@ export const InputLevelFieldRow = ({ metadataField }: InputLevelFieldRowProps) =
                 checked={Boolean(value as boolean)}
                 isInvalid={invalid}
                 invalidFeedback={error?.message}
-                // disabled={isCitation ? true : useFieldsFromParentCheckedValue}
+                // disabled={ }
                 ref={ref}
                 data-name={`${name}`}
               />
@@ -42,8 +49,9 @@ export const InputLevelFieldRow = ({ metadataField }: InputLevelFieldRowProps) =
         <td>
           {!childMetadataFields && (
             <RequiredAndOptionalRadios
-              fieldName={`${INPUT_LEVELS_GROUPER}.${name}.optionalOrRequired`}
+              parentFieldChecked={includeCheckboxValue}
               uniqueInputLevelRowID={uniqueInputLevelRowID}
+              fieldName={`${INPUT_LEVELS_GROUPER}.${name}.optionalOrRequired`}
             />
           )}
         </td>
@@ -54,8 +62,9 @@ export const InputLevelFieldRow = ({ metadataField }: InputLevelFieldRowProps) =
             <td>{field.displayName}</td>
             <td>
               <RequiredAndOptionalRadios
-                fieldName={`${INPUT_LEVELS_GROUPER}.${field.name}.optionalOrRequired`}
+                parentFieldChecked={includeCheckboxValue}
                 uniqueInputLevelRowID={`${uniqueInputLevelRowID}-${field.name}`}
+                fieldName={`${INPUT_LEVELS_GROUPER}.${field.name}.optionalOrRequired`}
               />
             </td>
           </tr>
@@ -66,11 +75,13 @@ export const InputLevelFieldRow = ({ metadataField }: InputLevelFieldRowProps) =
 
 interface RequiredAndOptionalRadiosProps {
   fieldName: string
+  parentFieldChecked: boolean
   uniqueInputLevelRowID: string
 }
 
 const RequiredAndOptionalRadios = ({
   fieldName,
+  parentFieldChecked,
   uniqueInputLevelRowID
 }: RequiredAndOptionalRadiosProps) => {
   const { control } = useFormContext()
@@ -87,6 +98,21 @@ const RequiredAndOptionalRadios = ({
           onChange(e.target.value)
         }
 
+        if (!parentFieldChecked) {
+          return (
+            <Form.Group.Radio
+              label="Hidden"
+              checked={true}
+              value="required"
+              name={`${uniqueInputLevelRowID}-${fieldName}-hidden-radio`}
+              id={`${uniqueInputLevelRowID}-${fieldName}-hidden-radio`}
+              readOnly
+              disabled
+              ref={ref}
+            />
+          )
+        }
+
         return (
           <Stack direction="horizontal">
             <Form.Group.Radio

From 031904e8fcbb9c1322e39871316cf9b00fec54cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Tue, 30 Jul 2024 23:49:14 -0300
Subject: [PATCH 17/52] feat: disabled table input level fields

---
 .../input-levels-table/InputLevelFieldRow.tsx | 22 +++++++++++++++----
 .../InputLevelsTable.module.scss              | 10 +++++++--
 .../input-levels-table/InputLevelsTable.tsx   |  8 +++----
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
index 59527f8a2..74cd485e1 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
@@ -1,5 +1,6 @@
 import { ChangeEvent, useId } from 'react'
 import { Controller, UseControllerProps, useFormContext, useWatch } from 'react-hook-form'
+import cn from 'classnames'
 import { Form, Stack } from '@iqss/dataverse-design-system'
 import { ReducedMetadataFieldInfo } from '../useGetBlockMetadataInputLevelFields'
 import { CollectionFormInputLevelValue, INPUT_LEVELS_GROUPER } from '../../../CollectionForm'
@@ -7,9 +8,10 @@ import styles from './InputLevelsTable.module.scss'
 
 interface InputLevelFieldRowProps {
   metadataField: ReducedMetadataFieldInfo
+  disabled: boolean
 }
 
-export const InputLevelFieldRow = ({ metadataField }: InputLevelFieldRowProps) => {
+export const InputLevelFieldRow = ({ metadataField, disabled }: InputLevelFieldRowProps) => {
   const uniqueInputLevelRowID = useId()
   const { control } = useFormContext()
 
@@ -39,9 +41,8 @@ export const InputLevelFieldRow = ({ metadataField }: InputLevelFieldRowProps) =
                 checked={Boolean(value as boolean)}
                 isInvalid={invalid}
                 invalidFeedback={error?.message}
-                // disabled={ }
+                disabled={disabled}
                 ref={ref}
-                data-name={`${name}`}
               />
             )}
           />
@@ -49,6 +50,7 @@ export const InputLevelFieldRow = ({ metadataField }: InputLevelFieldRowProps) =
         <td>
           {!childMetadataFields && (
             <RequiredAndOptionalRadios
+              disabled={disabled}
               parentFieldChecked={includeCheckboxValue}
               uniqueInputLevelRowID={uniqueInputLevelRowID}
               fieldName={`${INPUT_LEVELS_GROUPER}.${name}.optionalOrRequired`}
@@ -59,9 +61,17 @@ export const InputLevelFieldRow = ({ metadataField }: InputLevelFieldRowProps) =
       {childMetadataFields &&
         Object.entries(childMetadataFields).map(([key, field]) => (
           <tr className={styles['input-level-row--child-field']} key={key}>
-            <td>{field.displayName}</td>
+            <td>
+              <label
+                className={cn({
+                  [styles['displayName-disabled']]: disabled
+                })}>
+                {field.displayName}
+              </label>
+            </td>
             <td>
               <RequiredAndOptionalRadios
+                disabled={disabled}
                 parentFieldChecked={includeCheckboxValue}
                 uniqueInputLevelRowID={`${uniqueInputLevelRowID}-${field.name}`}
                 fieldName={`${INPUT_LEVELS_GROUPER}.${field.name}.optionalOrRequired`}
@@ -74,12 +84,14 @@ export const InputLevelFieldRow = ({ metadataField }: InputLevelFieldRowProps) =
 }
 
 interface RequiredAndOptionalRadiosProps {
+  disabled: boolean
   fieldName: string
   parentFieldChecked: boolean
   uniqueInputLevelRowID: string
 }
 
 const RequiredAndOptionalRadios = ({
+  disabled,
   fieldName,
   parentFieldChecked,
   uniqueInputLevelRowID
@@ -122,6 +134,7 @@ const RequiredAndOptionalRadios = ({
               value="required"
               name={`${uniqueInputLevelRowID}-radio-group`}
               id={`${uniqueInputLevelRowID}-required-radio`}
+              disabled={disabled}
               ref={ref}
             />
             <Form.Group.Radio
@@ -131,6 +144,7 @@ const RequiredAndOptionalRadios = ({
               value="optional"
               name={`${uniqueInputLevelRowID}-radio-group`}
               id={`${uniqueInputLevelRowID}-optional-radio`}
+              disabled={disabled}
               ref={ref}
             />
           </Stack>
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.module.scss b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.module.scss
index 6a2cb6114..987486f48 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.module.scss
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.module.scss
@@ -8,7 +8,8 @@
   margin-bottom: 1rem;
   margin-left: 3rem;
   overflow-y: auto;
-  border-radius: 4px;
+  border-radius: 6px;
+  box-shadow: 4px 4px 16px 0 rgb(0 0 0 / 10%);
 
   &--show {
     display: block;
@@ -19,11 +20,12 @@
 .close-button-container {
   position: sticky;
   top: 0;
+  z-index: 1;
   display: flex;
   justify-content: flex-end;
   padding: 0.35rem 0.5rem;
   background-color: #fff;
-  border-bottom: solid 1px $dv-secondary-color;
+  border-bottom: solid 2px $dv-secondary-color;
 }
 
 .input-level-row {
@@ -32,6 +34,10 @@
   }
 
   &--child-field {
+    .displayName-disabled {
+      opacity: 0.5;
+    }
+
     td {
       padding-block: 1rem;
 
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.tsx
index 8d962b195..e9c638d0b 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.tsx
@@ -18,20 +18,18 @@ export const InputLevelsTable = ({
   blockMetadataInputLevelFields,
   closeButton
 }: InputLevelsTableProps) => {
-  // console.log(blockMetadataInputLevelFields)
-
-  // TODO:ME Disable everything if disabled
   return (
     <div
       className={cn(styles['input-levels-table-container'], {
-        [styles['input-levels-table-container--show']]: show
+        [styles['input-levels-table-container--show']]: show,
+        [styles['input-levels-table-container--disabled']]: disabled
       })}>
       <div className={styles['close-button-container']}>{closeButton}</div>
 
       <Table bordered={false}>
         <tbody>
           {Object.entries(blockMetadataInputLevelFields.metadataFields).map(([key, field]) => (
-            <InputLevelFieldRow metadataField={field} key={key} />
+            <InputLevelFieldRow metadataField={field} disabled={disabled} key={key} />
           ))}
         </tbody>
       </Table>

From d63532494b24e5539dc8c4b2335cb634f3cb0470 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Wed, 31 Jul 2024 00:34:03 -0300
Subject: [PATCH 18/52] feat: required by dataverse fields

---
 .../collection-form/CollectionForm.tsx        | 12 ++++++
 .../input-levels-table/InputLevelFieldRow.tsx | 42 +++++++++++++------
 .../InputLevelsTable.module.scss              | 17 +++++++-
 3 files changed, 57 insertions(+), 14 deletions(-)

diff --git a/src/sections/create-collection/collection-form/CollectionForm.tsx b/src/sections/create-collection/collection-form/CollectionForm.tsx
index 944a68da2..8f13eb624 100644
--- a/src/sections/create-collection/collection-form/CollectionForm.tsx
+++ b/src/sections/create-collection/collection-form/CollectionForm.tsx
@@ -20,6 +20,18 @@ import styles from './CollectionForm.module.scss'
 export const METADATA_BLOCKS_NAMES_GROUPER = 'metadataBlockNames'
 export const USE_FIELDS_FROM_PARENT = 'useFieldsFromParent'
 export const INPUT_LEVELS_GROUPER = 'inputLevels'
+export const REQUIRED_BY_DATAVERSE_FIELDS = [
+  'title',
+  'author',
+  'authorName',
+  'datasetContact',
+  'datasetContactEmail',
+  'dsDescription',
+  'dsDescriptionValue',
+  'subject'
+] as const
+
+// TODO:ME Conditionally required Producer -> Producer Name
 
 export interface CollectionFormProps {
   collectionRepository: CollectionRepository
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
index 74cd485e1..2f43fcf47 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
@@ -3,7 +3,11 @@ import { Controller, UseControllerProps, useFormContext, useWatch } from 'react-
 import cn from 'classnames'
 import { Form, Stack } from '@iqss/dataverse-design-system'
 import { ReducedMetadataFieldInfo } from '../useGetBlockMetadataInputLevelFields'
-import { CollectionFormInputLevelValue, INPUT_LEVELS_GROUPER } from '../../../CollectionForm'
+import {
+  CollectionFormInputLevelValue,
+  INPUT_LEVELS_GROUPER,
+  REQUIRED_BY_DATAVERSE_FIELDS
+} from '../../../CollectionForm'
 import styles from './InputLevelsTable.module.scss'
 
 interface InputLevelFieldRowProps {
@@ -21,6 +25,12 @@ export const InputLevelFieldRow = ({ metadataField, disabled }: InputLevelFieldR
 
   const { name, displayName, childMetadataFields } = metadataField
 
+  const isRequiredByDataverse = REQUIRED_BY_DATAVERSE_FIELDS.some((field) => field === name)
+
+  const isChildFieldRequiredByDataverse = (fieldName: string) => {
+    return REQUIRED_BY_DATAVERSE_FIELDS.some((field) => field === fieldName)
+  }
+
   const rules: UseControllerProps['rules'] = {}
 
   // TODO:ME Add label "Required by Dataverse" on specific Citation fields
@@ -41,14 +51,17 @@ export const InputLevelFieldRow = ({ metadataField, disabled }: InputLevelFieldR
                 checked={Boolean(value as boolean)}
                 isInvalid={invalid}
                 invalidFeedback={error?.message}
-                disabled={disabled}
+                disabled={disabled || isRequiredByDataverse}
                 ref={ref}
               />
             )}
           />
         </td>
         <td>
-          {!childMetadataFields && (
+          {isRequiredByDataverse && (
+            <span className={styles['required-by-dataverse-label']}>Required by Dataverse</span>
+          )}
+          {!childMetadataFields && !isRequiredByDataverse && (
             <RequiredAndOptionalRadios
               disabled={disabled}
               parentFieldChecked={includeCheckboxValue}
@@ -59,23 +72,28 @@ export const InputLevelFieldRow = ({ metadataField, disabled }: InputLevelFieldR
         </td>
       </tr>
       {childMetadataFields &&
-        Object.entries(childMetadataFields).map(([key, field]) => (
+        Object.entries(childMetadataFields).map(([key, childField]) => (
           <tr className={styles['input-level-row--child-field']} key={key}>
             <td>
               <label
                 className={cn({
-                  [styles['displayName-disabled']]: disabled
+                  [styles['displayName-disabled']]:
+                    disabled || isChildFieldRequiredByDataverse(childField.name)
                 })}>
-                {field.displayName}
+                {childField.displayName}
               </label>
             </td>
             <td>
-              <RequiredAndOptionalRadios
-                disabled={disabled}
-                parentFieldChecked={includeCheckboxValue}
-                uniqueInputLevelRowID={`${uniqueInputLevelRowID}-${field.name}`}
-                fieldName={`${INPUT_LEVELS_GROUPER}.${field.name}.optionalOrRequired`}
-              />
+              {isChildFieldRequiredByDataverse(childField.name) ? (
+                <span className={styles['required-by-dataverse-label']}>Required by Dataverse</span>
+              ) : (
+                <RequiredAndOptionalRadios
+                  disabled={disabled}
+                  parentFieldChecked={includeCheckboxValue}
+                  uniqueInputLevelRowID={`${uniqueInputLevelRowID}-${childField.name}`}
+                  fieldName={`${INPUT_LEVELS_GROUPER}.${childField.name}.optionalOrRequired`}
+                />
+              )}
             </td>
           </tr>
         ))}
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.module.scss b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.module.scss
index 987486f48..3c33011f4 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.module.scss
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.module.scss
@@ -3,10 +3,8 @@
 .input-levels-table-container {
   position: relative;
   display: none;
-  width: 70%;
   max-height: 400px;
   margin-bottom: 1rem;
-  margin-left: 3rem;
   overflow-y: auto;
   border-radius: 6px;
   box-shadow: 4px 4px 16px 0 rgb(0 0 0 / 10%);
@@ -15,6 +13,11 @@
     display: block;
     border: solid 1px $dv-secondary-color;
   }
+
+  @media (min-width: 768px) {
+    width: 70%;
+    margin-left: 3rem;
+  }
 }
 
 .close-button-container {
@@ -33,11 +36,21 @@
     width: 50%;
   }
 
+  .required-by-dataverse-label {
+    font-style: italic;
+    opacity: 0.5;
+  }
+
   &--child-field {
     .displayName-disabled {
       opacity: 0.5;
     }
 
+    .required-by-dataverse-label {
+      font-style: italic;
+      opacity: 0.5;
+    }
+
     td {
       padding-block: 1rem;
 

From 5209f648cca5d11c250d3eb3e2cf665702f1ab4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Wed, 31 Jul 2024 10:44:04 -0300
Subject: [PATCH 19/52] feat: back to default inputLevels and block names
 values when checking from parent

---
 .../create-collection/CreateCollection.tsx    | 13 ++++----
 .../collection-form/CollectionForm.tsx        | 10 +++----
 .../MetadataFieldsSection.tsx                 |  9 ++++--
 .../FieldsFromRootCheckbox.tsx                | 30 +++++++++++++++----
 .../MetadataInputLevelFieldsBlock.tsx         | 12 +++++++-
 .../input-levels-table/InputLevelFieldRow.tsx | 17 ++++-------
 6 files changed, 60 insertions(+), 31 deletions(-)

diff --git a/src/sections/create-collection/CreateCollection.tsx b/src/sections/create-collection/CreateCollection.tsx
index 758fd11cf..8212d723b 100644
--- a/src/sections/create-collection/CreateCollection.tsx
+++ b/src/sections/create-collection/CreateCollection.tsx
@@ -6,6 +6,7 @@ import { useGetCollectionMetadataBlocksNamesInfo } from './useGetCollectionMetad
 import { useGetAllMetadataBlocksInfoByName } from './useGetAllMetadataBlocksInfoByName'
 import { CollectionRepository } from '../../collection/domain/repositories/CollectionRepository'
 import { MetadataBlockInfoRepository } from '../../metadata-block-info/domain/repositories/MetadataBlockInfoRepository'
+import { MetadataBlockName } from '../../dataset/domain/models/Dataset'
 import { useLoading } from '../loading/LoadingContext'
 import { useSession } from '../session/SessionContext'
 import { CollectionFormHelper } from './collection-form/CollectionFormHelper'
@@ -70,12 +71,12 @@ export function CreateCollection({
           return acc
         },
         {
-          citation: false,
-          geospatial: false,
-          socialscience: false,
-          astrophysics: false,
-          biomedical: false,
-          journal: false
+          [MetadataBlockName.CITATION]: false,
+          [MetadataBlockName.GEOSPATIAL]: false,
+          [MetadataBlockName.SOCIAL_SCIENCE]: false,
+          [MetadataBlockName.ASTROPHYSICS]: false,
+          [MetadataBlockName.BIOMEDICAL]: false,
+          [MetadataBlockName.JOURNAL]: false
         } as CollectionFormMetadataBlocks
       ),
     [metadataBlocksNamesInfo]
diff --git a/src/sections/create-collection/collection-form/CollectionForm.tsx b/src/sections/create-collection/collection-form/CollectionForm.tsx
index 8f13eb624..f1d8bdf38 100644
--- a/src/sections/create-collection/collection-form/CollectionForm.tsx
+++ b/src/sections/create-collection/collection-form/CollectionForm.tsx
@@ -31,7 +31,7 @@ export const REQUIRED_BY_DATAVERSE_FIELDS = [
   'subject'
 ] as const
 
-// TODO:ME Conditionally required Producer -> Producer Name
+// TODO:ME Ask in channel how to handle this case with the js-dataverse use case. Conditionally required Producer -> Producer Name
 
 export interface CollectionFormProps {
   collectionRepository: CollectionRepository
@@ -102,9 +102,6 @@ export const CollectionForm = ({
 
   const { formState } = form
 
-  console.log({ defaultValues })
-  // console.log(watch('inputLevels'))
-
   const preventEnterSubmit = (e: React.KeyboardEvent<HTMLFormElement | HTMLButtonElement>) => {
     // When pressing Enter, only submit the form  if the user is focused on the submit button itself
     if (e.key !== 'Enter') return
@@ -158,7 +155,10 @@ export const CollectionForm = ({
           <Stack>
             <Card>
               <Card.Body>
-                <MetadataFieldsSection allMetadataBlocksInfo={allMetadataBlocksInfo} />
+                <MetadataFieldsSection
+                  defaultValues={defaultValues}
+                  allMetadataBlocksInfo={allMetadataBlocksInfo}
+                />
               </Card.Body>
             </Card>
 
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx
index 5fbfc499b..e968281c5 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx
@@ -5,12 +5,17 @@ import { MetadataInputLevelFieldsBlock } from './metadata-input-level-fields-blo
 import { FieldsFromRootCheckbox } from './fields-from-root-checkbox/FieldsFromRootCheckbox'
 import { MetadataBlockName } from '../../../../metadata-block-info/domain/models/MetadataBlockInfo'
 import { CollectionFormHelper } from '../CollectionFormHelper'
+import { CollectionFormData } from '../CollectionForm'
 
 interface MetadataFieldsSectionProps {
   allMetadataBlocksInfo: ReducedMetadataBlockInfo[]
+  defaultValues: CollectionFormData
 }
 
-export const MetadataFieldsSection = ({ allMetadataBlocksInfo }: MetadataFieldsSectionProps) => {
+export const MetadataFieldsSection = ({
+  allMetadataBlocksInfo,
+  defaultValues
+}: MetadataFieldsSectionProps) => {
   const { t } = useTranslation('createCollection')
 
   const {
@@ -31,7 +36,7 @@ export const MetadataFieldsSection = ({ allMetadataBlocksInfo }: MetadataFieldsS
         <Form.Group.Text>{t('fields.metadataFields.helperText')}</Form.Group.Text>
         <Col className="mt-3">
           <Stack gap={2}>
-            <FieldsFromRootCheckbox />
+            <FieldsFromRootCheckbox defaultValues={defaultValues} />
 
             <MetadataInputLevelFieldsBlock
               blockName={MetadataBlockName.CITATION}
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-root-checkbox/FieldsFromRootCheckbox.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-root-checkbox/FieldsFromRootCheckbox.tsx
index 49a411146..1af51f419 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-root-checkbox/FieldsFromRootCheckbox.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-root-checkbox/FieldsFromRootCheckbox.tsx
@@ -3,9 +3,16 @@ import { Controller, UseControllerProps, useFormContext, useWatch } from 'react-
 import { Form } from '@iqss/dataverse-design-system'
 import { MetadataBlockName } from '../../../../../metadata-block-info/domain/models/MetadataBlockInfo'
 import { ConfirmResetModificationsModal } from './ConfirmResetModificationsModal'
-import { METADATA_BLOCKS_NAMES_GROUPER, USE_FIELDS_FROM_PARENT } from '../../CollectionForm'
+import {
+  CollectionFormData,
+  CollectionFormMetadataBlocks,
+  INPUT_LEVELS_GROUPER,
+  METADATA_BLOCKS_NAMES_GROUPER,
+  USE_FIELDS_FROM_PARENT
+} from '../../CollectionForm'
 
-const ALL_INPUT_LEVEL_FIELDS_EXCEPT_CITATION = [
+const ALL_INPUT_LEVEL_FIELDS = [
+  MetadataBlockName.CITATION,
   MetadataBlockName.GEOSPATIAL,
   MetadataBlockName.SOCIAL_SCIENCE,
   MetadataBlockName.ASTROPHYSICS,
@@ -13,7 +20,11 @@ const ALL_INPUT_LEVEL_FIELDS_EXCEPT_CITATION = [
   MetadataBlockName.JOURNAL
 ]
 
-export const FieldsFromRootCheckbox = () => {
+interface FieldsFromRootCheckboxProps {
+  defaultValues: CollectionFormData
+}
+
+export const FieldsFromRootCheckbox = ({ defaultValues }: FieldsFromRootCheckboxProps) => {
   const checkboxID = useId()
   const { control, setValue } = useFormContext()
   const [showResetConfirmationModal, setShowResetConfirmationModal] = useState(false)
@@ -22,10 +33,19 @@ export const FieldsFromRootCheckbox = () => {
   const handleContinueWithReset = () => {
     setValue(USE_FIELDS_FROM_PARENT, true)
 
-    ALL_INPUT_LEVEL_FIELDS_EXCEPT_CITATION.forEach((blockName) => {
-      setValue(`${METADATA_BLOCKS_NAMES_GROUPER}.${blockName}`, false)
+    // Reset metadata block names checboxes to the inital value
+    ALL_INPUT_LEVEL_FIELDS.forEach((blockName) => {
+      const castedBlockName = blockName as keyof CollectionFormMetadataBlocks
+
+      setValue(
+        `${METADATA_BLOCKS_NAMES_GROUPER}.${blockName}`,
+        defaultValues[METADATA_BLOCKS_NAMES_GROUPER][castedBlockName]
+      )
     })
 
+    // Reset input levels to the initial value
+    setValue(INPUT_LEVELS_GROUPER, defaultValues[INPUT_LEVELS_GROUPER])
+
     closeModal()
   }
 
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
index 9119cf718..c56f8b876 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
@@ -1,4 +1,4 @@
-import { useId, useState } from 'react'
+import { useEffect, useId, useState } from 'react'
 import { Controller, UseControllerProps, useFormContext, useWatch } from 'react-hook-form'
 import { Button, Form, Stack } from '@iqss/dataverse-design-system'
 import { CloseButton } from 'react-bootstrap'
@@ -59,6 +59,16 @@ export const MetadataInputLevelFieldsBlock = ({
     })
   }
 
+  // In order to close the table when use fields from parent change from unchecked to checked
+  useEffect(() => {
+    if (useFieldsFromParentCheckedValue) {
+      setInputLevelsTableStatus({
+        show: false,
+        asDisabled: false
+      })
+    }
+  }, [useFieldsFromParentCheckedValue])
+
   return (
     <Stack direction="vertical" gap={2}>
       <Stack direction="horizontal" gap={1}>
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
index 2f43fcf47..6c2834995 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
@@ -1,4 +1,4 @@
-import { ChangeEvent, useId } from 'react'
+import { useId } from 'react'
 import { Controller, UseControllerProps, useFormContext, useWatch } from 'react-hook-form'
 import cn from 'classnames'
 import { Form, Stack } from '@iqss/dataverse-design-system'
@@ -43,14 +43,12 @@ export const InputLevelFieldRow = ({ metadataField, disabled }: InputLevelFieldR
             name={`${INPUT_LEVELS_GROUPER}.${name}.include`}
             control={control}
             rules={rules}
-            render={({ field: { onChange, ref, value }, fieldState: { invalid, error } }) => (
+            render={({ field: { onChange, ref, value } }) => (
               <Form.Group.Checkbox
                 id={`${uniqueInputLevelRowID}-checkbox`}
                 onChange={onChange}
                 label={displayName}
                 checked={Boolean(value as boolean)}
-                isInvalid={invalid}
-                invalidFeedback={error?.message}
                 disabled={disabled || isRequiredByDataverse}
                 ref={ref}
               />
@@ -120,14 +118,9 @@ const RequiredAndOptionalRadios = ({
     <Controller
       name={fieldName}
       control={control}
-      render={({ field: { onChange, ref, value }, fieldState: { invalid, error } }) => {
+      render={({ field: { onChange, ref, value } }) => {
         const castedValue = value as CollectionFormInputLevelValue
 
-        const handleChange = (e: ChangeEvent<HTMLInputElement>) => {
-          console.log(e)
-          onChange(e.target.value)
-        }
-
         if (!parentFieldChecked) {
           return (
             <Form.Group.Radio
@@ -147,7 +140,7 @@ const RequiredAndOptionalRadios = ({
           <Stack direction="horizontal">
             <Form.Group.Radio
               label="Required"
-              onChange={handleChange}
+              onChange={onChange}
               checked={castedValue === 'required'}
               value="required"
               name={`${uniqueInputLevelRowID}-radio-group`}
@@ -157,7 +150,7 @@ const RequiredAndOptionalRadios = ({
             />
             <Form.Group.Radio
               label="Optional"
-              onChange={handleChange}
+              onChange={onChange}
               checked={castedValue === 'optional'}
               value="optional"
               name={`${uniqueInputLevelRowID}-radio-group`}

From 779527b365f207d52e8aab704992391a6abc39c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Wed, 31 Jul 2024 14:55:09 -0300
Subject: [PATCH 20/52] refactor: move DynamicFieldsButtons component to shared
 folder

---
 public/locales/en/datasetMetadataForm.json    |  2 -
 public/locales/en/shared.json                 |  4 +-
 .../top-fields-section/ContactsField.tsx      | 49 +---------------
 .../Fields/ComposeFieldMultiple.tsx           |  2 +-
 .../Fields/PrimitiveMultiple.tsx              |  2 +-
 .../DynamicFieldsButtons.module.scss          |  4 --
 .../DynamicFieldsButtons.tsx                  | 30 +++++-----
 .../DatasetMetadataForm.spec.tsx              | 56 +++++++++----------
 8 files changed, 50 insertions(+), 99 deletions(-)
 delete mode 100644 src/sections/shared/form/DatasetMetadataForm/MetadataForm/MetadataBlockFormFields/dynamic-fields-buttons/DynamicFieldsButtons.module.scss
 rename src/sections/shared/form/{DatasetMetadataForm/MetadataForm/MetadataBlockFormFields/dynamic-fields-buttons => DynamicFieldsButtons}/DynamicFieldsButtons.tsx (54%)

diff --git a/public/locales/en/datasetMetadataForm.json b/public/locales/en/datasetMetadataForm.json
index 29bb4a830..e547a0894 100644
--- a/public/locales/en/datasetMetadataForm.json
+++ b/public/locales/en/datasetMetadataForm.json
@@ -28,8 +28,6 @@
     "submitting": "Form Submitting",
     "submissionSuccess": "Form submission successful"
   },
-  "addRowButton": "Add",
-  "deleteRowButton": "Delete",
   "saveButton": {
     "createMode": "Save Dataset",
     "editMode": "Save Changes"
diff --git a/public/locales/en/shared.json b/public/locales/en/shared.json
index 2d2caa7dc..55aedf5cd 100644
--- a/public/locales/en/shared.json
+++ b/public/locales/en/shared.json
@@ -1,3 +1,5 @@
 {
-  "asterisksIndicateRequiredFields": "Asterisks indicate required fields"
+  "asterisksIndicateRequiredFields": "Asterisks indicate required fields",
+  "remove": "Remove",
+  "add": "Add"
 }
diff --git a/src/sections/create-collection/collection-form/top-fields-section/ContactsField.tsx b/src/sections/create-collection/collection-form/top-fields-section/ContactsField.tsx
index 3c7c93744..6d762e751 100644
--- a/src/sections/create-collection/collection-form/top-fields-section/ContactsField.tsx
+++ b/src/sections/create-collection/collection-form/top-fields-section/ContactsField.tsx
@@ -3,11 +3,9 @@ import { useCallback, useMemo } from 'react'
 import { Controller, UseControllerProps, useFieldArray, useFormContext } from 'react-hook-form'
 import { useTranslation } from 'react-i18next'
 import cn from 'classnames'
+
 import styles from '../CollectionForm.module.scss'
-// TODO:ME This imports are only used in the DynamicFieldsButtons component (temporal)
-import { MouseEvent } from 'react'
-import { Button, Tooltip } from '@iqss/dataverse-design-system'
-import { Dash, Plus } from 'react-bootstrap-icons'
+import { DynamicFieldsButtons } from '../../../shared/form/DynamicFieldsButtons/DynamicFieldsButtons'
 
 interface ContactsFieldProps {
   rules: UseControllerProps['rules']
@@ -97,46 +95,3 @@ export const ContactsField = ({ rules }: ContactsFieldProps) => {
     </Form.Group>
   )
 }
-
-// TODO:ME Create reusable DynamicFieldsButtons component inside shared Form when merged with issue 422
-// TODO:ME This component here is temporal, it will be moved to the shared form folder
-interface DynamicFieldsButtonsProps {
-  fieldName: string
-  originalField?: boolean
-  onAddButtonClick: (event: MouseEvent<HTMLButtonElement>) => void
-  onRemoveButtonClick: (event: MouseEvent<HTMLButtonElement>) => void
-}
-
-const DynamicFieldsButtons = ({
-  fieldName,
-  originalField,
-  onAddButtonClick,
-  onRemoveButtonClick
-}: DynamicFieldsButtonsProps) => {
-  return (
-    <div style={{ display: 'flex', gap: '1rem' }}>
-      <Tooltip placement="top" overlay="Add">
-        <Button
-          type="button"
-          variant="secondary"
-          onClick={onAddButtonClick}
-          className="px-2"
-          aria-label={`Add ${fieldName}`}>
-          <Plus title="Add" size={24} />
-        </Button>
-      </Tooltip>
-      {!originalField && (
-        <Tooltip placement="top" overlay="Remove">
-          <Button
-            type="button"
-            variant="secondary"
-            onClick={onRemoveButtonClick}
-            className="px-2"
-            aria-label={`Remove ${fieldName}`}>
-            <Dash title="Delete" size={24} />
-          </Button>
-        </Tooltip>
-      )}
-    </div>
-  )
-}
diff --git a/src/sections/shared/form/DatasetMetadataForm/MetadataForm/MetadataBlockFormFields/MetadataFormField/Fields/ComposeFieldMultiple.tsx b/src/sections/shared/form/DatasetMetadataForm/MetadataForm/MetadataBlockFormFields/MetadataFormField/Fields/ComposeFieldMultiple.tsx
index babc6d8a4..a7883bb5a 100644
--- a/src/sections/shared/form/DatasetMetadataForm/MetadataForm/MetadataBlockFormFields/MetadataFormField/Fields/ComposeFieldMultiple.tsx
+++ b/src/sections/shared/form/DatasetMetadataForm/MetadataForm/MetadataBlockFormFields/MetadataFormField/Fields/ComposeFieldMultiple.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next'
 import { type MetadataField } from '../../../../../../../../metadata-block-info/domain/models/MetadataBlockInfo'
 import { MetadataFormField, type CommonFieldProps } from '..'
 import { Col, Form, Row } from '@iqss/dataverse-design-system'
-import { DynamicFieldsButtons } from '../../dynamic-fields-buttons/DynamicFieldsButtons'
+import { DynamicFieldsButtons } from '../../../../../DynamicFieldsButtons/DynamicFieldsButtons'
 import cn from 'classnames'
 import styles from '../index.module.scss'
 
diff --git a/src/sections/shared/form/DatasetMetadataForm/MetadataForm/MetadataBlockFormFields/MetadataFormField/Fields/PrimitiveMultiple.tsx b/src/sections/shared/form/DatasetMetadataForm/MetadataForm/MetadataBlockFormFields/MetadataFormField/Fields/PrimitiveMultiple.tsx
index 200023e79..88b363cf8 100644
--- a/src/sections/shared/form/DatasetMetadataForm/MetadataForm/MetadataBlockFormFields/MetadataFormField/Fields/PrimitiveMultiple.tsx
+++ b/src/sections/shared/form/DatasetMetadataForm/MetadataForm/MetadataBlockFormFields/MetadataFormField/Fields/PrimitiveMultiple.tsx
@@ -2,7 +2,7 @@ import { useCallback, useMemo } from 'react'
 import { Controller, useFieldArray, useFormContext } from 'react-hook-form'
 import { Col, Form, Row } from '@iqss/dataverse-design-system'
 import { TypeMetadataFieldOptions } from '../../../../../../../../metadata-block-info/domain/models/MetadataBlockInfo'
-import { DynamicFieldsButtons } from '../../dynamic-fields-buttons/DynamicFieldsButtons'
+import { DynamicFieldsButtons } from '../../../../../DynamicFieldsButtons/DynamicFieldsButtons'
 import { MetadataFieldsHelper } from '../../../../MetadataFieldsHelper'
 import { type CommonFieldProps } from '..'
 import cn from 'classnames'
diff --git a/src/sections/shared/form/DatasetMetadataForm/MetadataForm/MetadataBlockFormFields/dynamic-fields-buttons/DynamicFieldsButtons.module.scss b/src/sections/shared/form/DatasetMetadataForm/MetadataForm/MetadataBlockFormFields/dynamic-fields-buttons/DynamicFieldsButtons.module.scss
deleted file mode 100644
index 54423ad8c..000000000
--- a/src/sections/shared/form/DatasetMetadataForm/MetadataForm/MetadataBlockFormFields/dynamic-fields-buttons/DynamicFieldsButtons.module.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.container {
-  display: flex;
-  gap: 1rem;
-}
diff --git a/src/sections/shared/form/DatasetMetadataForm/MetadataForm/MetadataBlockFormFields/dynamic-fields-buttons/DynamicFieldsButtons.tsx b/src/sections/shared/form/DynamicFieldsButtons/DynamicFieldsButtons.tsx
similarity index 54%
rename from src/sections/shared/form/DatasetMetadataForm/MetadataForm/MetadataBlockFormFields/dynamic-fields-buttons/DynamicFieldsButtons.tsx
rename to src/sections/shared/form/DynamicFieldsButtons/DynamicFieldsButtons.tsx
index bafa1ca4f..f4a4471ac 100644
--- a/src/sections/shared/form/DatasetMetadataForm/MetadataForm/MetadataBlockFormFields/dynamic-fields-buttons/DynamicFieldsButtons.tsx
+++ b/src/sections/shared/form/DynamicFieldsButtons/DynamicFieldsButtons.tsx
@@ -1,47 +1,47 @@
 import { MouseEvent } from 'react'
-import { Button, Tooltip } from '@iqss/dataverse-design-system'
-import { Dash, Plus } from 'react-bootstrap-icons'
 import { useTranslation } from 'react-i18next'
-import styles from './DynamicFieldsButtons.module.scss'
+import { Button, Stack, Tooltip } from '@iqss/dataverse-design-system'
+import { Dash, Plus } from 'react-bootstrap-icons'
 
-interface AddFieldButtonsProps {
+interface DynamicFieldsButtonsProps {
   fieldName: string
   originalField?: boolean
   onAddButtonClick: (event: MouseEvent<HTMLButtonElement>) => void
   onRemoveButtonClick: (event: MouseEvent<HTMLButtonElement>) => void
 }
 
-export function DynamicFieldsButtons({
+export const DynamicFieldsButtons = ({
   fieldName,
   originalField,
   onAddButtonClick,
   onRemoveButtonClick
-}: AddFieldButtonsProps) {
-  const { t } = useTranslation('datasetMetadataForm')
+}: DynamicFieldsButtonsProps) => {
+  const { t } = useTranslation('shared')
+
   return (
-    <div className={styles.container}>
-      <Tooltip placement="top" overlay={t('addRowButton')}>
+    <Stack direction="horizontal" gap={3}>
+      <Tooltip placement="top" overlay={t('add')}>
         <Button
           type="button"
           variant="secondary"
           onClick={onAddButtonClick}
           className="px-2"
-          aria-label={`${t('addRowButton')} ${fieldName}`}>
-          <Plus title="Add" size={24} />
+          aria-label={`${t('add')} ${fieldName}`}>
+          <Plus title={t('add')} size={24} />
         </Button>
       </Tooltip>
       {!originalField && (
-        <Tooltip placement="top" overlay={t('deleteRowButton')}>
+        <Tooltip placement="top" overlay={t('remove')}>
           <Button
             type="button"
             variant="secondary"
             onClick={onRemoveButtonClick}
             className="px-2"
-            aria-label={`${t('deleteRowButton')} ${fieldName}`}>
-            <Dash title="Delete" size={24} />
+            aria-label={`${t('remove')} ${fieldName}`}>
+            <Dash title={t('remove')} size={24} />
           </Button>
         </Tooltip>
       )}
-    </div>
+    </Stack>
   )
 }
diff --git a/tests/component/sections/shared/dataset-metadata-form/DatasetMetadataForm.spec.tsx b/tests/component/sections/shared/dataset-metadata-form/DatasetMetadataForm.spec.tsx
index 728d708f9..f2b69b2af 100644
--- a/tests/component/sections/shared/dataset-metadata-form/DatasetMetadataForm.spec.tsx
+++ b/tests/component/sections/shared/dataset-metadata-form/DatasetMetadataForm.spec.tsx
@@ -296,7 +296,7 @@ describe('DatasetMetadataForm', () => {
               .should('have.data', 'fieldtype', TypeMetadataFieldOptions.Text)
 
             cy.findByLabelText(`Add Author`).should('exist')
-            cy.findByLabelText(`Delete Author`).should('not.exist')
+            cy.findByLabelText(`Remove Author`).should('not.exist')
           })
 
         // Composed field
@@ -320,7 +320,7 @@ describe('DatasetMetadataForm', () => {
               .should('have.data', 'fieldtype', TypeMetadataFieldOptions.Email)
 
             cy.findByLabelText(`Add Point of Contact`).should('exist')
-            cy.findByLabelText(`Delete Point of Contact`).should('not.exist')
+            cy.findByLabelText(`Remove Point of Contact`).should('not.exist')
           })
 
         // Composed field
@@ -339,7 +339,7 @@ describe('DatasetMetadataForm', () => {
               .should('have.data', 'fieldtype', TypeMetadataFieldOptions.Date)
 
             cy.findByLabelText(`Add Description`).should('exist')
-            cy.findByLabelText(`Delete Description`).should('not.exist')
+            cy.findByLabelText(`Remove Description`).should('not.exist')
           })
 
         cy.findByText('Subject')
@@ -381,7 +381,7 @@ describe('DatasetMetadataForm', () => {
               .should('have.data', 'fieldtype', TypeMetadataFieldOptions.URL)
 
             cy.findByLabelText(`Add Keyword`).should('exist')
-            cy.findByLabelText(`Delete Keyword`).should('not.exist')
+            cy.findByLabelText(`Remove Keyword`).should('not.exist')
           })
 
         // Composed field
@@ -412,7 +412,7 @@ describe('DatasetMetadataForm', () => {
               .should('have.data', 'fieldtype', TypeMetadataFieldOptions.URL)
 
             cy.findByLabelText(`Add Related Publication`).should('exist')
-            cy.findByLabelText(`Delete Related Publication`).should('not.exist')
+            cy.findByLabelText(`Remove Related Publication`).should('not.exist')
           })
 
         cy.findByText('Notes').should('exist')
@@ -542,7 +542,7 @@ describe('DatasetMetadataForm', () => {
               .should('have.data', 'fieldtype', TypeMetadataFieldOptions.Text)
 
             cy.findByLabelText(`Add Other Identifier`).should('exist')
-            cy.findByLabelText(`Delete Other Identifier`).should('not.exist')
+            cy.findByLabelText(`Remove Other Identifier`).should('not.exist')
           })
 
         // Composed field
@@ -608,9 +608,9 @@ describe('DatasetMetadataForm', () => {
               }
             )
 
-            // As we have to groups of Author fields, we should have 2 Add Author buttons and 1 Delete Author button
+            // As we have to groups of Author fields, we should have 2 Add Author buttons and 1 Remove Author button
             cy.findAllByLabelText(`Add Author`).should('have.length', 2)
-            cy.findByLabelText(`Delete Author`).should('exist')
+            cy.findByLabelText(`Remove Author`).should('exist')
           })
 
         // Composed field
@@ -636,7 +636,7 @@ describe('DatasetMetadataForm', () => {
               .should('have.data', 'fieldtype', TypeMetadataFieldOptions.Email)
 
             cy.findByLabelText(`Add Point of Contact`).should('exist')
-            cy.findByLabelText(`Delete Point of Contact`).should('not.exist')
+            cy.findByLabelText(`Remove Point of Contact`).should('not.exist')
           })
 
         // Composed field
@@ -659,7 +659,7 @@ describe('DatasetMetadataForm', () => {
               .should('have.data', 'fieldtype', TypeMetadataFieldOptions.Date)
 
             cy.findByLabelText(`Add Description`).should('exist')
-            cy.findByLabelText(`Delete Description`).should('not.exist')
+            cy.findByLabelText(`Remove Description`).should('not.exist')
           })
 
         // Subject - Select multiple field
@@ -713,7 +713,7 @@ describe('DatasetMetadataForm', () => {
               .should('have.data', 'fieldtype', TypeMetadataFieldOptions.URL)
 
             cy.findByLabelText(`Add Keyword`).should('exist')
-            cy.findByLabelText(`Delete Keyword`).should('not.exist')
+            cy.findByLabelText(`Remove Keyword`).should('not.exist')
           })
 
         // Composed field
@@ -737,7 +737,7 @@ describe('DatasetMetadataForm', () => {
               .should('have.data', 'fieldtype', TypeMetadataFieldOptions.URL)
 
             cy.findByLabelText(`Add Topic Classification`).should('exist')
-            cy.findByLabelText(`Delete Topic Classification`).should('not.exist')
+            cy.findByLabelText(`Remove Topic Classification`).should('not.exist')
           })
 
         // Composed field
@@ -768,7 +768,7 @@ describe('DatasetMetadataForm', () => {
               .should('have.data', 'fieldtype', TypeMetadataFieldOptions.URL)
 
             cy.findByLabelText(`Add Related Publication`).should('exist')
-            cy.findByLabelText(`Delete Related Publication`).should('not.exist')
+            cy.findByLabelText(`Remove Related Publication`).should('not.exist')
           })
 
         cy.findByText('Notes').should('exist')
@@ -829,7 +829,7 @@ describe('DatasetMetadataForm', () => {
               .should('have.data', 'fieldtype', TypeMetadataFieldOptions.URL)
 
             cy.findAllByLabelText(`Add Producer`).should('exist')
-            cy.findByLabelText(`Delete Producer`).should('not.exist')
+            cy.findByLabelText(`Remove Producer`).should('not.exist')
           })
 
         cy.findByText('Production Date').should('exist')
@@ -872,7 +872,7 @@ describe('DatasetMetadataForm', () => {
               .should('have.data', 'fieldtype', TypeMetadataFieldOptions.Text)
 
             cy.findAllByLabelText(`Add Contributor`).should('exist')
-            cy.findByLabelText(`Delete Contributor`).should('not.exist')
+            cy.findByLabelText(`Remove Contributor`).should('not.exist')
           })
 
         // Composed field
@@ -893,7 +893,7 @@ describe('DatasetMetadataForm', () => {
               .should('have.data', 'fieldtype', TypeMetadataFieldOptions.Text)
 
             cy.findAllByLabelText(`Add Funding Information`).should('exist')
-            cy.findByLabelText(`Delete Funding Information`).should('not.exist')
+            cy.findByLabelText(`Remove Funding Information`).should('not.exist')
           })
 
         // Composed field
@@ -932,7 +932,7 @@ describe('DatasetMetadataForm', () => {
               .should('have.data', 'fieldtype', TypeMetadataFieldOptions.URL)
 
             cy.findAllByLabelText(`Add Distributor`).should('exist')
-            cy.findByLabelText(`Delete Distributor`).should('not.exist')
+            cy.findByLabelText(`Remove Distributor`).should('not.exist')
           })
 
         cy.findByText('Distribution Date').should('exist')
@@ -974,7 +974,7 @@ describe('DatasetMetadataForm', () => {
               .should('have.data', 'fieldtype', TypeMetadataFieldOptions.Date)
 
             cy.findAllByLabelText(`Add Time Period`).should('exist')
-            cy.findByLabelText(`Delete Time Period`).should('not.exist')
+            cy.findByLabelText(`Remove Time Period`).should('not.exist')
           })
 
         // Composed field
@@ -995,7 +995,7 @@ describe('DatasetMetadataForm', () => {
               .should('have.data', 'fieldtype', TypeMetadataFieldOptions.Date)
 
             cy.findAllByLabelText(`Add Date of Collection`).should('exist')
-            cy.findByLabelText(`Delete Date of Collection`).should('not.exist')
+            cy.findByLabelText(`Remove Date of Collection`).should('not.exist')
           })
 
         // Primitive multiple
@@ -1029,7 +1029,7 @@ describe('DatasetMetadataForm', () => {
               .should('have.data', 'fieldtype', TypeMetadataFieldOptions.Textbox)
 
             cy.findAllByLabelText(`Add Series`).should('exist')
-            cy.findByLabelText(`Delete Series`).should('not.exist')
+            cy.findByLabelText(`Remove Series`).should('not.exist')
           })
 
         // Composed field
@@ -1050,7 +1050,7 @@ describe('DatasetMetadataForm', () => {
               .should('have.data', 'fieldtype', TypeMetadataFieldOptions.Text)
 
             cy.findAllByLabelText(`Add Software`).should('exist')
-            cy.findByLabelText(`Delete Software`).should('not.exist')
+            cy.findByLabelText(`Remove Software`).should('not.exist')
           })
 
         // Primitive multiple
@@ -1201,7 +1201,7 @@ describe('DatasetMetadataForm', () => {
               .should('have.data', 'fieldtype', TypeMetadataFieldOptions.Text)
 
             cy.findByLabelText(`Add Geographic Bounding Box`).should('exist')
-            cy.findByLabelText(`Delete Geographic Bounding Box`).should('not.exist')
+            cy.findByLabelText(`Remove Geographic Bounding Box`).should('not.exist')
           })
       })
     })
@@ -1739,11 +1739,11 @@ describe('DatasetMetadataForm', () => {
 
         cy.findAllByLabelText(/^Name/i).should('have.length', 2)
 
-        cy.findByLabelText(`Delete Author`).should('exist')
+        cy.findByLabelText(`Remove Author`).should('exist')
 
-        cy.findByLabelText(`Delete Author`).click()
+        cy.findByLabelText(`Remove Author`).click()
 
-        cy.findByLabelText(`Delete Author`).should('not.exist')
+        cy.findByLabelText(`Remove Author`).should('not.exist')
 
         cy.findAllByLabelText(/^Name/i).should('have.length', 1)
       })
@@ -1765,11 +1765,11 @@ describe('DatasetMetadataForm', () => {
 
     cy.findByLabelText(`Add Alternative Title`).click()
 
-    cy.findByLabelText(`Delete Alternative Title`).should('exist')
+    cy.findByLabelText(`Remove Alternative Title`).should('exist')
 
-    cy.findByLabelText(`Delete Alternative Title`).click()
+    cy.findByLabelText(`Remove Alternative Title`).click()
 
-    cy.findByLabelText(`Delete Alternative Title`).should('not.exist')
+    cy.findByLabelText(`Remove Alternative Title`).should('not.exist')
   })
 
   it('should not submit the form when pressing enter key if submit button is not focused', () => {

From c934154abae2655fb671936780f63eb65e1a9db8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Wed, 31 Jul 2024 15:04:03 -0300
Subject: [PATCH 21/52] chore: remove todos

---
 src/sections/create-collection/CreateCollection.tsx             | 2 +-
 src/sections/create-collection/CreateCollectionFactory.tsx      | 2 --
 .../create-collection/collection-form/CollectionForm.tsx        | 2 --
 .../input-levels-table/InputLevelFieldRow.tsx                   | 2 --
 .../create-collection/collection-form/useSubmitCollection.ts    | 2 --
 5 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/sections/create-collection/CreateCollection.tsx b/src/sections/create-collection/CreateCollection.tsx
index 8212d723b..074ab33be 100644
--- a/src/sections/create-collection/CreateCollection.tsx
+++ b/src/sections/create-collection/CreateCollection.tsx
@@ -98,7 +98,7 @@ export function CreateCollection({
     setIsLoading
   ])
 
-  // TODO:ME Instead show error of parent collection not found.
+  // TODO:ME Instead show error of "Parent collection not found" maybe?
   if (!isLoadingCollection && !collection) {
     return <PageNotFound />
   }
diff --git a/src/sections/create-collection/CreateCollectionFactory.tsx b/src/sections/create-collection/CreateCollectionFactory.tsx
index c9aa326d5..cbeee6180 100644
--- a/src/sections/create-collection/CreateCollectionFactory.tsx
+++ b/src/sections/create-collection/CreateCollectionFactory.tsx
@@ -16,8 +16,6 @@ export class CreateCollectionFactory {
 function CreateCollectionWithParams() {
   const { ownerCollectionId = 'root' } = useParams<{ ownerCollectionId: string }>()
 
-  // TODO:ME What roles can create a collection, what checks to do?
-
   return (
     <CreateCollection
       ownerCollectionId={ownerCollectionId}
diff --git a/src/sections/create-collection/collection-form/CollectionForm.tsx b/src/sections/create-collection/collection-form/CollectionForm.tsx
index f1d8bdf38..c36fe756f 100644
--- a/src/sections/create-collection/collection-form/CollectionForm.tsx
+++ b/src/sections/create-collection/collection-form/CollectionForm.tsx
@@ -31,8 +31,6 @@ export const REQUIRED_BY_DATAVERSE_FIELDS = [
   'subject'
 ] as const
 
-// TODO:ME Ask in channel how to handle this case with the js-dataverse use case. Conditionally required Producer -> Producer Name
-
 export interface CollectionFormProps {
   collectionRepository: CollectionRepository
   ownerCollectionId: string
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
index 6c2834995..49e3f9934 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
@@ -33,8 +33,6 @@ export const InputLevelFieldRow = ({ metadataField, disabled }: InputLevelFieldR
 
   const rules: UseControllerProps['rules'] = {}
 
-  // TODO:ME Add label "Required by Dataverse" on specific Citation fields
-
   return (
     <>
       <tr className={styles['input-level-row']}>
diff --git a/src/sections/create-collection/collection-form/useSubmitCollection.ts b/src/sections/create-collection/collection-form/useSubmitCollection.ts
index 629bae01d..21026da2d 100644
--- a/src/sections/create-collection/collection-form/useSubmitCollection.ts
+++ b/src/sections/create-collection/collection-form/useSubmitCollection.ts
@@ -45,8 +45,6 @@ export function useSubmitCollection(
   const submitForm = (formData: CollectionFormValuesOnSubmit): void => {
     setSubmissionStatus(SubmissionStatus.IsSubmitting)
 
-    // TODO:ME js-dataverse cannot read properties of undefined (reading 'map')
-
     const newCollection: CollectionDTO = {
       name: formData.name,
       alias: formData.alias,

From c4e64dbd55f2ad748113a77d90d4a6ed61af9ee2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Wed, 31 Jul 2024 17:27:03 -0300
Subject: [PATCH 22/52] feat: remove inputLevels from not selected blocks

---
 .../create-collection/CreateCollection.tsx    | 19 ++--
 .../collection-form/CollectionForm.tsx        | 19 +++-
 .../collection-form/CollectionFormHelper.ts   | 94 ++++++++++++++++++-
 .../collection-form/useSubmitCollection.ts    | 59 +++++++-----
 4 files changed, 153 insertions(+), 38 deletions(-)

diff --git a/src/sections/create-collection/CreateCollection.tsx b/src/sections/create-collection/CreateCollection.tsx
index 074ab33be..f270def64 100644
--- a/src/sections/create-collection/CreateCollection.tsx
+++ b/src/sections/create-collection/CreateCollection.tsx
@@ -15,6 +15,7 @@ import {
   CollectionFormData,
   CollectionFormMetadataBlocks,
   FormattedCollectionInputLevels,
+  FormattedCollectionInputLevelsWithoutParentBlockName,
   METADATA_BLOCKS_NAMES_GROUPER,
   USE_FIELDS_FROM_PARENT
 } from './collection-form/CollectionForm'
@@ -59,9 +60,10 @@ export function CreateCollection({
     return CollectionFormHelper.defineBaseInputLevels(allMetadataBlocksInfo)
   }, [allMetadataBlocksInfo])
 
-  const formDefaultInputLevels: FormattedCollectionInputLevels = useDeepCompareMemo(() => {
-    return CollectionFormHelper.formatCollectiontInputLevels(collection?.inputLevels)
-  }, [collection?.inputLevels])
+  const formDefaultInputLevels: FormattedCollectionInputLevelsWithoutParentBlockName =
+    useDeepCompareMemo(() => {
+      return CollectionFormHelper.formatCollectiontInputLevels(collection?.inputLevels)
+    }, [collection?.inputLevels])
 
   const defaultBlocksNames = useDeepCompareMemo(
     () =>
@@ -112,6 +114,12 @@ export function CreateCollection({
     return <CreateCollectionSkeleton />
   }
 
+  // TODO:ME use memo for this also?¿
+  const mergedInputLevels = CollectionFormHelper.mergeBaseAndDefaultInputLevels(
+    formBaseInputLevels,
+    formDefaultInputLevels
+  )
+
   const formDefaultValues: CollectionFormData = {
     hostCollection: collection.name,
     name: user?.displayName ? `${user?.displayName} Collection` : '',
@@ -123,10 +131,7 @@ export function CreateCollection({
     description: '',
     [USE_FIELDS_FROM_PARENT]: true,
     [METADATA_BLOCKS_NAMES_GROUPER]: defaultBlocksNames,
-    inputLevels: {
-      ...formBaseInputLevels,
-      ...formDefaultInputLevels
-    }
+    inputLevels: mergedInputLevels
   }
 
   return (
diff --git a/src/sections/create-collection/collection-form/CollectionForm.tsx b/src/sections/create-collection/collection-form/CollectionForm.tsx
index c36fe756f..cd999d61b 100644
--- a/src/sections/create-collection/collection-form/CollectionForm.tsx
+++ b/src/sections/create-collection/collection-form/CollectionForm.tsx
@@ -49,21 +49,30 @@ export type CollectionFormData = {
   contacts: { value: string }[]
   [USE_FIELDS_FROM_PARENT]: boolean
   [METADATA_BLOCKS_NAMES_GROUPER]: CollectionFormMetadataBlocks
-  [INPUT_LEVELS_GROUPER]?: FormattedCollectionInputLevels
+  [INPUT_LEVELS_GROUPER]: FormattedCollectionInputLevels
 }
-
-export type CollectionFormMetadataBlocks = Omit<
-  Record<MetadataBlockName, boolean>,
-  'codeMeta20' | 'computationalworkflow'
+export type CollectionFormMetadataBlock = Exclude<
+  MetadataBlockName,
+  MetadataBlockName.CODE_META | MetadataBlockName.COMPUTATIONAL_WORKFLOW
 >
 
+export type CollectionFormMetadataBlocks = Record<CollectionFormMetadataBlock, boolean>
+
 export type FormattedCollectionInputLevels = {
   [key: string]: {
     include: boolean
     optionalOrRequired: CollectionFormInputLevelValue
+    parentBlockName: CollectionFormMetadataBlock
   }
 }
 
+export type FormattedCollectionInputLevelsWithoutParentBlockName = {
+  [K in keyof FormattedCollectionInputLevels]: Omit<
+    FormattedCollectionInputLevels[K],
+    'parentBlockName'
+  >
+}
+
 export const CollectionFormInputLevelOptions = {
   OPTIONAL: 'optional',
   REQUIRED: 'required'
diff --git a/src/sections/create-collection/collection-form/CollectionFormHelper.ts b/src/sections/create-collection/collection-form/CollectionFormHelper.ts
index bca9673c3..917e9d774 100644
--- a/src/sections/create-collection/collection-form/CollectionFormHelper.ts
+++ b/src/sections/create-collection/collection-form/CollectionFormHelper.ts
@@ -1,7 +1,16 @@
 import { CollectionInputLevel } from '../../../collection/domain/models/Collection'
+import {
+  CollectionDTO,
+  CollectionInputLevelDTO
+} from '../../../collection/domain/useCases/DTOs/CollectionDTO'
 import { MetadataBlockName } from '../../../metadata-block-info/domain/models/MetadataBlockInfo'
 import { ReducedMetadataBlockInfo } from '../useGetAllMetadataBlocksInfoByName'
-import { FormattedCollectionInputLevels } from './CollectionForm'
+import {
+  CollectionFormMetadataBlock,
+  CollectionFormMetadataBlocks,
+  FormattedCollectionInputLevels,
+  FormattedCollectionInputLevelsWithoutParentBlockName
+} from './CollectionForm'
 
 export class CollectionFormHelper {
   public static replaceDotWithSlash = (str: string) => str.replace(/\./g, '/')
@@ -20,7 +29,8 @@ export class CollectionFormHelper {
 
         fields[normalizedFieldName] = {
           include: true,
-          optionalOrRequired: 'optional'
+          optionalOrRequired: 'optional',
+          parentBlockName: block.name as CollectionFormMetadataBlock
         }
 
         if (field.childMetadataFields) {
@@ -28,7 +38,8 @@ export class CollectionFormHelper {
             const normalizedFieldName = this.replaceDotWithSlash(childField.name)
             childFields[normalizedFieldName] = {
               include: true,
-              optionalOrRequired: 'optional'
+              optionalOrRequired: 'optional',
+              parentBlockName: block.name as CollectionFormMetadataBlock
             }
           })
         }
@@ -43,8 +54,8 @@ export class CollectionFormHelper {
 
   public static formatCollectiontInputLevels(
     collectionInputLevels: CollectionInputLevel[] | undefined
-  ): FormattedCollectionInputLevels {
-    const result: FormattedCollectionInputLevels = {}
+  ): FormattedCollectionInputLevelsWithoutParentBlockName {
+    const result: FormattedCollectionInputLevelsWithoutParentBlockName = {}
 
     if (!collectionInputLevels) {
       return result
@@ -63,6 +74,28 @@ export class CollectionFormHelper {
     return result
   }
 
+  public static mergeBaseAndDefaultInputLevels(
+    baseInputLevels: FormattedCollectionInputLevels,
+    defaultInputLevels: FormattedCollectionInputLevelsWithoutParentBlockName
+  ): FormattedCollectionInputLevels {
+    const result: FormattedCollectionInputLevels = { ...baseInputLevels }
+
+    for (const key in defaultInputLevels) {
+      if (baseInputLevels[key]) {
+        result[key] = {
+          ...baseInputLevels[key],
+          ...defaultInputLevels[key],
+          parentBlockName: baseInputLevels[key].parentBlockName
+        }
+      } else {
+        // TODO:ME Fix this ts error
+        result[key] = { ...defaultInputLevels[key] }
+      }
+    }
+
+    return result
+  }
+
   public static separateMetadataBlocksInfoByNames(
     allMetadataBlocksInfo: ReducedMetadataBlockInfo[]
   ): {
@@ -106,4 +139,55 @@ export class CollectionFormHelper {
       journalBlock
     }
   }
+
+  public static formatFormMetadataBlockNamesToMetadataBlockNamesDTO(
+    formMetadataBlockNames: CollectionFormMetadataBlocks
+  ): string[] {
+    const result: CollectionDTO['metadataBlockNames'] = []
+
+    Object.entries(formMetadataBlockNames).forEach(([key, value]) => {
+      if (value) {
+        result.push(key)
+      }
+    })
+
+    return result
+  }
+
+  public static formatFormInputLevelsToInputLevelsDTO(
+    metadataBlockNamesSelected: string[],
+    formCollectionInputLevels: FormattedCollectionInputLevels
+  ): CollectionInputLevelDTO[] {
+    const normalizedInputLevels =
+      this.replaceSlashBackToDotsFromInputLevels(formCollectionInputLevels)
+
+    const result: CollectionInputLevelDTO[] = []
+
+    Object.entries(normalizedInputLevels).forEach(([key, value]) => {
+      if (metadataBlockNamesSelected.includes(value.parentBlockName)) {
+        result.push({
+          datasetFieldName: key,
+          include: value.include,
+          required: value.optionalOrRequired === 'required'
+        })
+      }
+    })
+
+    return result
+  }
+
+  private static replaceSlashBackToDotsFromInputLevels(
+    inputLevels: FormattedCollectionInputLevels
+  ): FormattedCollectionInputLevels {
+    const result: FormattedCollectionInputLevels = {}
+
+    Object.entries(inputLevels).forEach(([key, value]) => {
+      const replaceSlashWithDot = (str: string) => str.replace(/\//g, '.')
+      const normalizedFieldName = replaceSlashWithDot(key)
+
+      result[normalizedFieldName] = value
+    })
+
+    return result
+  }
 }
diff --git a/src/sections/create-collection/collection-form/useSubmitCollection.ts b/src/sections/create-collection/collection-form/useSubmitCollection.ts
index 21026da2d..1d40485d4 100644
--- a/src/sections/create-collection/collection-form/useSubmitCollection.ts
+++ b/src/sections/create-collection/collection-form/useSubmitCollection.ts
@@ -4,9 +4,15 @@ import { WriteError } from '@iqss/dataverse-client-javascript'
 import { createCollection } from '../../../collection/domain/useCases/createCollection'
 import { CollectionRepository } from '../../../collection/domain/repositories/CollectionRepository'
 import { CollectionDTO } from '../../../collection/domain/useCases/DTOs/CollectionDTO'
-import { CollectionFormData, CollectionFormValuesOnSubmit } from './CollectionForm'
+import {
+  CollectionFormData,
+  CollectionFormValuesOnSubmit,
+  INPUT_LEVELS_GROUPER,
+  METADATA_BLOCKS_NAMES_GROUPER
+} from './CollectionForm'
 import { Route } from '../../Route.enum'
 import { JSDataverseWriteErrorHandler } from '../../../shared/helpers/JSDataverseWriteErrorHandler'
+import { CollectionFormHelper } from './CollectionFormHelper'
 
 export enum SubmissionStatus {
   NotSubmitted = 'NotSubmitted',
@@ -45,37 +51,48 @@ export function useSubmitCollection(
   const submitForm = (formData: CollectionFormValuesOnSubmit): void => {
     setSubmissionStatus(SubmissionStatus.IsSubmitting)
 
+    const contactsDTO = formData.contacts.map((contact) => contact.value)
+
+    const metadataBlockNamesDTO =
+      CollectionFormHelper.formatFormMetadataBlockNamesToMetadataBlockNamesDTO(
+        formData[METADATA_BLOCKS_NAMES_GROUPER]
+      )
+
+    const inputLevelsDTO = CollectionFormHelper.formatFormInputLevelsToInputLevelsDTO(
+      metadataBlockNamesDTO,
+      formData[INPUT_LEVELS_GROUPER]
+    )
+
     const newCollection: CollectionDTO = {
       name: formData.name,
       alias: formData.alias,
       type: formData.type,
       affiliation: formData.affiliation,
       description: formData.description,
-      contacts: formData.contacts.map((contact) => contact.value),
-      inputLevels: []
+      contacts: contactsDTO,
+      metadataBlockNames: metadataBlockNamesDTO,
+      inputLevels: inputLevelsDTO
     }
 
-    console.log({ newCollection })
-
     // TODO: We can't send the hostCollection name, but we should send the hostCollection alias
     // So in a next iteration we should get the hostCollection alias from the hostCollection name selected
 
-    // createCollection(collectionRepository, newCollection, ownerCollectionId)
-    //   .then(() => {
-    //     setSubmitError(null)
-    //     setSubmissionStatus(SubmissionStatus.SubmitComplete)
-    //     navigate(`${Route.COLLECTIONS}?id=${newCollection.alias}`, {
-    //       state: { created: true }
-    //     })
-    //     return
-    //   })
-    //   .catch((err: WriteError) => {
-    //     const error = new JSDataverseWriteErrorHandler(err)
-    //     const formattedError = error.getReasonWithoutStatusCode() ?? error.getErrorMessage()
-    //     setSubmitError(formattedError)
-    //     setSubmissionStatus(SubmissionStatus.Errored)
-    //     onSubmitErrorCallback()
-    //   })
+    createCollection(collectionRepository, newCollection, ownerCollectionId)
+      .then(() => {
+        setSubmitError(null)
+        setSubmissionStatus(SubmissionStatus.SubmitComplete)
+        navigate(`${Route.COLLECTIONS}?id=${newCollection.alias}`, {
+          state: { created: true }
+        })
+        return
+      })
+      .catch((err: WriteError) => {
+        const error = new JSDataverseWriteErrorHandler(err)
+        const formattedError = error.getReasonWithoutStatusCode() ?? error.getErrorMessage()
+        setSubmitError(formattedError)
+        setSubmissionStatus(SubmissionStatus.Errored)
+        onSubmitErrorCallback()
+      })
   }
 
   return {

From 6634a7727652ee4318da15dc29b3fc79cf01e55b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Thu, 1 Aug 2024 10:53:29 -0300
Subject: [PATCH 23/52] feat: merge input levels for default values

---
 .../create-collection/CreateCollection.tsx    | 19 ++++++++++---------
 .../collection-form/CollectionFormHelper.ts   |  9 +++------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/sections/create-collection/CreateCollection.tsx b/src/sections/create-collection/CreateCollection.tsx
index f270def64..dac92491e 100644
--- a/src/sections/create-collection/CreateCollection.tsx
+++ b/src/sections/create-collection/CreateCollection.tsx
@@ -56,15 +56,22 @@ export function CreateCollection({
   const { allMetadataBlocksInfo, isLoading: isLoadingAllMetadataBlocksInfo } =
     useGetAllMetadataBlocksInfoByName({ metadataBlockInfoRepository })
 
-  const formBaseInputLevels: FormattedCollectionInputLevels = useDeepCompareMemo(() => {
+  const baseInputLevels: FormattedCollectionInputLevels = useDeepCompareMemo(() => {
     return CollectionFormHelper.defineBaseInputLevels(allMetadataBlocksInfo)
   }, [allMetadataBlocksInfo])
 
-  const formDefaultInputLevels: FormattedCollectionInputLevelsWithoutParentBlockName =
+  const formattedCollectionInputLevels: FormattedCollectionInputLevelsWithoutParentBlockName =
     useDeepCompareMemo(() => {
       return CollectionFormHelper.formatCollectiontInputLevels(collection?.inputLevels)
     }, [collection?.inputLevels])
 
+  const mergedInputLevels = useDeepCompareMemo(() => {
+    return CollectionFormHelper.mergeBaseAndDefaultInputLevels(
+      baseInputLevels,
+      formattedCollectionInputLevels
+    )
+  }, [baseInputLevels, formattedCollectionInputLevels])
+
   const defaultBlocksNames = useDeepCompareMemo(
     () =>
       metadataBlocksNamesInfo.reduce(
@@ -79,7 +86,7 @@ export function CreateCollection({
           [MetadataBlockName.ASTROPHYSICS]: false,
           [MetadataBlockName.BIOMEDICAL]: false,
           [MetadataBlockName.JOURNAL]: false
-        } as CollectionFormMetadataBlocks
+        }
       ),
     [metadataBlocksNamesInfo]
   )
@@ -114,12 +121,6 @@ export function CreateCollection({
     return <CreateCollectionSkeleton />
   }
 
-  // TODO:ME use memo for this also?¿
-  const mergedInputLevels = CollectionFormHelper.mergeBaseAndDefaultInputLevels(
-    formBaseInputLevels,
-    formDefaultInputLevels
-  )
-
   const formDefaultValues: CollectionFormData = {
     hostCollection: collection.name,
     name: user?.displayName ? `${user?.displayName} Collection` : '',
diff --git a/src/sections/create-collection/collection-form/CollectionFormHelper.ts b/src/sections/create-collection/collection-form/CollectionFormHelper.ts
index 917e9d774..a9ff6e4a1 100644
--- a/src/sections/create-collection/collection-form/CollectionFormHelper.ts
+++ b/src/sections/create-collection/collection-form/CollectionFormHelper.ts
@@ -76,20 +76,17 @@ export class CollectionFormHelper {
 
   public static mergeBaseAndDefaultInputLevels(
     baseInputLevels: FormattedCollectionInputLevels,
-    defaultInputLevels: FormattedCollectionInputLevelsWithoutParentBlockName
+    formattedCollectionInputLevels: FormattedCollectionInputLevelsWithoutParentBlockName
   ): FormattedCollectionInputLevels {
     const result: FormattedCollectionInputLevels = { ...baseInputLevels }
 
-    for (const key in defaultInputLevels) {
+    for (const key in formattedCollectionInputLevels) {
       if (baseInputLevels[key]) {
         result[key] = {
           ...baseInputLevels[key],
-          ...defaultInputLevels[key],
+          ...formattedCollectionInputLevels[key],
           parentBlockName: baseInputLevels[key].parentBlockName
         }
-      } else {
-        // TODO:ME Fix this ts error
-        result[key] = { ...defaultInputLevels[key] }
       }
     }
 

From 02dd1acd63d010d2851081ad21cb9decdf5010e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Thu, 1 Aug 2024 11:22:22 -0300
Subject: [PATCH 24/52] feat: if field is not included, back to optional

---
 .../input-levels-table/InputLevelFieldRow.tsx | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
index 49e3f9934..60a409d08 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
@@ -1,4 +1,4 @@
-import { useId } from 'react'
+import { ChangeEvent, useId } from 'react'
 import { Controller, UseControllerProps, useFormContext, useWatch } from 'react-hook-form'
 import cn from 'classnames'
 import { Form, Stack } from '@iqss/dataverse-design-system'
@@ -17,7 +17,7 @@ interface InputLevelFieldRowProps {
 
 export const InputLevelFieldRow = ({ metadataField, disabled }: InputLevelFieldRowProps) => {
   const uniqueInputLevelRowID = useId()
-  const { control } = useFormContext()
+  const { control, setValue } = useFormContext()
 
   const includeCheckboxValue = useWatch({
     name: `${INPUT_LEVELS_GROUPER}.${metadataField.name}.include`
@@ -33,6 +33,25 @@ export const InputLevelFieldRow = ({ metadataField, disabled }: InputLevelFieldR
 
   const rules: UseControllerProps['rules'] = {}
 
+  const handleIncludeChange = (
+    e: ChangeEvent<HTMLInputElement>,
+    formOnChange: (...event: unknown[]) => void
+  ) => {
+    if (e.target.checked === false) {
+      // If include is set to false, then optionalOrRequired should back to 'optional'
+      if (!childMetadataFields) {
+        setValue(`${INPUT_LEVELS_GROUPER}.${name}.optionalOrRequired`, 'optional')
+      } else {
+        Object.values(childMetadataFields).forEach(({ name }) => {
+          setValue(`${INPUT_LEVELS_GROUPER}.${name}.optionalOrRequired`, 'optional')
+        })
+      }
+      formOnChange(e)
+    } else {
+      formOnChange(e)
+    }
+  }
+
   return (
     <>
       <tr className={styles['input-level-row']}>
@@ -44,7 +63,7 @@ export const InputLevelFieldRow = ({ metadataField, disabled }: InputLevelFieldR
             render={({ field: { onChange, ref, value } }) => (
               <Form.Group.Checkbox
                 id={`${uniqueInputLevelRowID}-checkbox`}
-                onChange={onChange}
+                onChange={(e) => handleIncludeChange(e, onChange)}
                 label={displayName}
                 checked={Boolean(value as boolean)}
                 disabled={disabled || isRequiredByDataverse}

From 7a612f030d31823a6d11e71e3b387732cb18b0d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Thu, 1 Aug 2024 12:42:00 -0300
Subject: [PATCH 25/52] feat: change input levels table disable status

---
 .../MetadataInputLevelFieldsBlock.tsx         | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
index c56f8b876..a759e9d7f 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useId, useState } from 'react'
+import { ChangeEvent, useEffect, useId, useState } from 'react'
 import { Controller, UseControllerProps, useFormContext, useWatch } from 'react-hook-form'
 import { Button, Form, Stack } from '@iqss/dataverse-design-system'
 import { CloseButton } from 'react-bootstrap'
@@ -20,6 +20,7 @@ export const MetadataInputLevelFieldsBlock = ({
 }: MetadataInputLevelFieldsBlockProps) => {
   const checkboxID = useId()
   const { control } = useFormContext()
+
   const [inputLevelsTableStatus, setInputLevelsTableStatus] = useState({
     show: false,
     asDisabled: false
@@ -59,6 +60,21 @@ export const MetadataInputLevelFieldsBlock = ({
     })
   }
 
+  const handleIncludeBlockChange = (
+    e: ChangeEvent<HTMLInputElement>,
+    formOnChange: (...event: unknown[]) => void
+  ) => {
+    // If input levels table is open, change the disabled status according to the block checked status
+    if (inputLevelsTableStatus.show) {
+      setInputLevelsTableStatus((currentStatus) => ({
+        ...currentStatus,
+        asDisabled: !e.target.checked
+      }))
+    }
+
+    formOnChange(e)
+  }
+
   // In order to close the table when use fields from parent change from unchecked to checked
   useEffect(() => {
     if (useFieldsFromParentCheckedValue) {
@@ -79,7 +95,7 @@ export const MetadataInputLevelFieldsBlock = ({
           render={({ field: { onChange, ref, value }, fieldState: { invalid, error } }) => (
             <Form.Group.Checkbox
               id={checkboxID}
-              onChange={onChange}
+              onChange={(e) => handleIncludeBlockChange(e, onChange)}
               name={metadataBlockFieldName}
               label={blockDisplayName}
               checked={value as boolean}

From efa4e86b00dc4d207ac08f2b880638c2d93e060e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Thu, 1 Aug 2024 19:20:07 -0300
Subject: [PATCH 26/52] feat: make composed parent field required if all sub
 fields are required

---
 .../create-collection/CreateCollection.tsx    |   4 +-
 .../collection-form/CollectionFormHelper.ts   |  17 ++-
 .../input-levels-table/InputLevelFieldRow.tsx |  94 +++-----------
 .../input-levels-table/InputLevelsTable.tsx   |   4 +-
 .../RequiredOptionalRadios.tsx                | 118 ++++++++++++++++++
 .../useGetBlockMetadataInputLevelFields.tsx   | 104 ---------------
 .../useGetAllMetadataBlocksInfoByName.tsx     |   6 +-
 7 files changed, 159 insertions(+), 188 deletions(-)
 create mode 100644 src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/RequiredOptionalRadios.tsx
 delete mode 100644 src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/useGetBlockMetadataInputLevelFields.tsx

diff --git a/src/sections/create-collection/CreateCollection.tsx b/src/sections/create-collection/CreateCollection.tsx
index dac92491e..edfec7fb5 100644
--- a/src/sections/create-collection/CreateCollection.tsx
+++ b/src/sections/create-collection/CreateCollection.tsx
@@ -45,8 +45,7 @@ export function CreateCollection({
     ownerCollectionId
   )
 
-  // TODO:ME Maybe in edit mode collection id should not be on the owner but on the collection itself, but this can perhaps be differentiated by page.
-  // That is to say, in this create page, it is good to get on the parent, in the edit page on the same collection.
+  // TODO:ME In edit mode, collection id should not be from the collection owner but from the collection being edited, but this can perhaps be differentiated by page.
   const { metadataBlocksNamesInfo, isLoading: isLoadingMetadataBlocksNamesInfo } =
     useGetCollectionMetadataBlocksNamesInfo({
       collectionId: ownerCollectionId,
@@ -107,7 +106,6 @@ export function CreateCollection({
     setIsLoading
   ])
 
-  // TODO:ME Instead show error of "Parent collection not found" maybe?
   if (!isLoadingCollection && !collection) {
     return <PageNotFound />
   }
diff --git a/src/sections/create-collection/collection-form/CollectionFormHelper.ts b/src/sections/create-collection/collection-form/CollectionFormHelper.ts
index a9ff6e4a1..9f2469d5d 100644
--- a/src/sections/create-collection/collection-form/CollectionFormHelper.ts
+++ b/src/sections/create-collection/collection-form/CollectionFormHelper.ts
@@ -4,7 +4,10 @@ import {
   CollectionInputLevelDTO
 } from '../../../collection/domain/useCases/DTOs/CollectionDTO'
 import { MetadataBlockName } from '../../../metadata-block-info/domain/models/MetadataBlockInfo'
-import { ReducedMetadataBlockInfo } from '../useGetAllMetadataBlocksInfoByName'
+import {
+  ReducedMetadataBlockInfo,
+  ReducedMetadataFieldInfo
+} from '../useGetAllMetadataBlocksInfoByName'
 import {
   CollectionFormMetadataBlock,
   CollectionFormMetadataBlocks,
@@ -187,4 +190,16 @@ export class CollectionFormHelper {
 
     return result
   }
+
+  public static getChildFieldSiblings = (
+    childMetadataFields: Record<string, ReducedMetadataFieldInfo>,
+    targetChildFieldName: string
+  ): Record<string, ReducedMetadataFieldInfo> => {
+    return Object.entries(childMetadataFields)
+      .filter(([_key, { name }]) => name !== targetChildFieldName)
+      .reduce((acc, [key, field]) => {
+        acc[key] = field
+        return acc
+      }, {} as Record<string, ReducedMetadataFieldInfo>)
+  }
 }
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
index 60a409d08..480ef77b7 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
@@ -1,14 +1,12 @@
 import { ChangeEvent, useId } from 'react'
 import { Controller, UseControllerProps, useFormContext, useWatch } from 'react-hook-form'
 import cn from 'classnames'
-import { Form, Stack } from '@iqss/dataverse-design-system'
-import { ReducedMetadataFieldInfo } from '../useGetBlockMetadataInputLevelFields'
-import {
-  CollectionFormInputLevelValue,
-  INPUT_LEVELS_GROUPER,
-  REQUIRED_BY_DATAVERSE_FIELDS
-} from '../../../CollectionForm'
+import { Form } from '@iqss/dataverse-design-system'
+import { ReducedMetadataFieldInfo } from '../../../../useGetAllMetadataBlocksInfoByName'
+import { INPUT_LEVELS_GROUPER, REQUIRED_BY_DATAVERSE_FIELDS } from '../../../CollectionForm'
 import styles from './InputLevelsTable.module.scss'
+import { CollectionFormHelper } from '../../../CollectionFormHelper'
+import { RequiredOptionalRadios } from './RequiredOptionalRadios'
 
 interface InputLevelFieldRowProps {
   metadataField: ReducedMetadataFieldInfo
@@ -38,11 +36,14 @@ export const InputLevelFieldRow = ({ metadataField, disabled }: InputLevelFieldR
     formOnChange: (...event: unknown[]) => void
   ) => {
     if (e.target.checked === false) {
-      // If include is set to false, then optionalOrRequired should back to 'optional'
+      // If include is set to false, then field and child fields should be set to optional and include false
       if (!childMetadataFields) {
         setValue(`${INPUT_LEVELS_GROUPER}.${name}.optionalOrRequired`, 'optional')
       } else {
+        setValue(`${INPUT_LEVELS_GROUPER}.${name}.optionalOrRequired`, 'optional')
+
         Object.values(childMetadataFields).forEach(({ name }) => {
+          setValue(`${INPUT_LEVELS_GROUPER}.${name}.include`, false)
           setValue(`${INPUT_LEVELS_GROUPER}.${name}.optionalOrRequired`, 'optional')
         })
       }
@@ -77,8 +78,9 @@ export const InputLevelFieldRow = ({ metadataField, disabled }: InputLevelFieldR
             <span className={styles['required-by-dataverse-label']}>Required by Dataverse</span>
           )}
           {!childMetadataFields && !isRequiredByDataverse && (
-            <RequiredAndOptionalRadios
+            <RequiredOptionalRadios
               disabled={disabled}
+              isForChildField={false}
               parentFieldChecked={includeCheckboxValue}
               uniqueInputLevelRowID={uniqueInputLevelRowID}
               fieldName={`${INPUT_LEVELS_GROUPER}.${name}.optionalOrRequired`}
@@ -102,8 +104,14 @@ export const InputLevelFieldRow = ({ metadataField, disabled }: InputLevelFieldR
               {isChildFieldRequiredByDataverse(childField.name) ? (
                 <span className={styles['required-by-dataverse-label']}>Required by Dataverse</span>
               ) : (
-                <RequiredAndOptionalRadios
+                <RequiredOptionalRadios
                   disabled={disabled}
+                  isForChildField={true}
+                  siblingChildFields={CollectionFormHelper.getChildFieldSiblings(
+                    childMetadataFields,
+                    childField.name
+                  )}
+                  parentIncludeName={name}
                   parentFieldChecked={includeCheckboxValue}
                   uniqueInputLevelRowID={`${uniqueInputLevelRowID}-${childField.name}`}
                   fieldName={`${INPUT_LEVELS_GROUPER}.${childField.name}.optionalOrRequired`}
@@ -115,69 +123,3 @@ export const InputLevelFieldRow = ({ metadataField, disabled }: InputLevelFieldR
     </>
   )
 }
-
-interface RequiredAndOptionalRadiosProps {
-  disabled: boolean
-  fieldName: string
-  parentFieldChecked: boolean
-  uniqueInputLevelRowID: string
-}
-
-const RequiredAndOptionalRadios = ({
-  disabled,
-  fieldName,
-  parentFieldChecked,
-  uniqueInputLevelRowID
-}: RequiredAndOptionalRadiosProps) => {
-  const { control } = useFormContext()
-
-  return (
-    <Controller
-      name={fieldName}
-      control={control}
-      render={({ field: { onChange, ref, value } }) => {
-        const castedValue = value as CollectionFormInputLevelValue
-
-        if (!parentFieldChecked) {
-          return (
-            <Form.Group.Radio
-              label="Hidden"
-              checked={true}
-              value="required"
-              name={`${uniqueInputLevelRowID}-${fieldName}-hidden-radio`}
-              id={`${uniqueInputLevelRowID}-${fieldName}-hidden-radio`}
-              readOnly
-              disabled
-              ref={ref}
-            />
-          )
-        }
-
-        return (
-          <Stack direction="horizontal">
-            <Form.Group.Radio
-              label="Required"
-              onChange={onChange}
-              checked={castedValue === 'required'}
-              value="required"
-              name={`${uniqueInputLevelRowID}-radio-group`}
-              id={`${uniqueInputLevelRowID}-required-radio`}
-              disabled={disabled}
-              ref={ref}
-            />
-            <Form.Group.Radio
-              label="Optional"
-              onChange={onChange}
-              checked={castedValue === 'optional'}
-              value="optional"
-              name={`${uniqueInputLevelRowID}-radio-group`}
-              id={`${uniqueInputLevelRowID}-optional-radio`}
-              disabled={disabled}
-              ref={ref}
-            />
-          </Stack>
-        )
-      }}
-    />
-  )
-}
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.tsx
index e9c638d0b..b7f0ad490 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.tsx
@@ -1,14 +1,14 @@
 import { ReactNode } from 'react'
 import cn from 'classnames'
 import { Table } from '@iqss/dataverse-design-system'
-import { BlockMetadataInputLevelFields } from '../useGetBlockMetadataInputLevelFields'
+import { ReducedMetadataBlockInfo } from '../../../../useGetAllMetadataBlocksInfoByName'
 import { InputLevelFieldRow } from './InputLevelFieldRow'
 import styles from './InputLevelsTable.module.scss'
 
 interface InputLevelsTableProps {
   show: boolean
   disabled: boolean
-  blockMetadataInputLevelFields: BlockMetadataInputLevelFields
+  blockMetadataInputLevelFields: ReducedMetadataBlockInfo
   closeButton: ReactNode
 }
 
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/RequiredOptionalRadios.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/RequiredOptionalRadios.tsx
new file mode 100644
index 000000000..f8d836266
--- /dev/null
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/RequiredOptionalRadios.tsx
@@ -0,0 +1,118 @@
+import { ChangeEvent } from 'react'
+import { Form, Stack } from '@iqss/dataverse-design-system'
+import { Controller, useFormContext, useWatch } from 'react-hook-form'
+import { ReducedMetadataFieldInfo } from '../../../../useGetAllMetadataBlocksInfoByName'
+import { CollectionFormInputLevelValue, INPUT_LEVELS_GROUPER } from '../../../CollectionForm'
+
+type RequiredOptionalRadiosProps =
+  | {
+      disabled: boolean
+      fieldName: string
+      isForChildField: true
+      siblingChildFields: Record<string, ReducedMetadataFieldInfo>
+      parentIncludeName: string
+      parentFieldChecked: boolean
+      uniqueInputLevelRowID: string
+    }
+  | {
+      disabled: boolean
+      fieldName: string
+      isForChildField?: false
+      siblingChildFields?: never
+      parentIncludeName?: never
+      parentFieldChecked: boolean
+      uniqueInputLevelRowID: string
+    }
+
+export const RequiredOptionalRadios = ({
+  disabled,
+  fieldName,
+  isForChildField,
+  siblingChildFields,
+  parentIncludeName,
+  parentFieldChecked,
+  uniqueInputLevelRowID
+}: RequiredOptionalRadiosProps) => {
+  const { control, setValue } = useFormContext()
+
+  const siblingChildFieldsNames = Object.values(siblingChildFields || {})
+    .map((field) => field.name)
+    .map((field) => `${INPUT_LEVELS_GROUPER}.${field}.optionalOrRequired`)
+
+  const siblingChildFieldsValues = useWatch({
+    name: siblingChildFieldsNames
+  }) as CollectionFormInputLevelValue[] | undefined[]
+
+  const handleOptionalOrRequiredChange = (
+    e: ChangeEvent<HTMLInputElement>,
+    formOnChange: (...event: unknown[]) => void
+  ) => {
+    // Check if all siblingChildFields are required then set parent to required also
+    if (isForChildField) {
+      if (e.target.value === 'required') {
+        const allSiblingsRequired = (
+          siblingChildFieldsValues as CollectionFormInputLevelValue[]
+        ).every((value) => value === 'required')
+
+        if (allSiblingsRequired) {
+          setValue(`${INPUT_LEVELS_GROUPER}.${parentIncludeName}.optionalOrRequired`, 'required')
+        }
+      }
+
+      if (e.target.value === 'optional') {
+        setValue(`${INPUT_LEVELS_GROUPER}.${parentIncludeName}.optionalOrRequired`, 'optional')
+      }
+    }
+    formOnChange(e)
+  }
+
+  return (
+    <Controller
+      name={fieldName}
+      control={control}
+      render={({ field: { onChange, ref, value } }) => {
+        const castedValue = value as CollectionFormInputLevelValue
+
+        if (!parentFieldChecked) {
+          return (
+            <Form.Group.Radio
+              label="Hidden"
+              checked={true}
+              value="required"
+              name={`${uniqueInputLevelRowID}-${fieldName}-hidden-radio`}
+              id={`${uniqueInputLevelRowID}-${fieldName}-hidden-radio`}
+              readOnly
+              disabled
+              ref={ref}
+            />
+          )
+        }
+
+        return (
+          <Stack direction="horizontal">
+            <Form.Group.Radio
+              label="Required"
+              onChange={(e) => handleOptionalOrRequiredChange(e, onChange)}
+              checked={castedValue === 'required'}
+              value="required"
+              name={`${uniqueInputLevelRowID}-radio-group`}
+              id={`${uniqueInputLevelRowID}-required-radio`}
+              disabled={disabled}
+              ref={ref}
+            />
+            <Form.Group.Radio
+              label="Optional"
+              onChange={(e) => handleOptionalOrRequiredChange(e, onChange)}
+              checked={castedValue === 'optional'}
+              value="optional"
+              name={`${uniqueInputLevelRowID}-radio-group`}
+              id={`${uniqueInputLevelRowID}-optional-radio`}
+              disabled={disabled}
+              ref={ref}
+            />
+          </Stack>
+        )
+      }}
+    />
+  )
+}
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/useGetBlockMetadataInputLevelFields.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/useGetBlockMetadataInputLevelFields.tsx
deleted file mode 100644
index 82554b73f..000000000
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/useGetBlockMetadataInputLevelFields.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-import { useEffect, useState } from 'react'
-import { MetadataBlockInfoRepository } from '../../../../../metadata-block-info/domain/repositories/MetadataBlockInfoRepository'
-import {
-  MetadataBlockInfo,
-  MetadataBlockName,
-  MetadataField
-} from '../../../../../metadata-block-info/domain/models/MetadataBlockInfo'
-import { getMetadataBlockInfoByNameTemporal } from '../../../../../metadata-block-info/domain/useCases/getMetadataBlockInfoByNameTemporal'
-
-interface Props {
-  blockName: MetadataBlockName
-  metadataBlockInfoRepository: MetadataBlockInfoRepository
-}
-
-interface UseGetBlockMetadataInputLevelsFieldsReturn {
-  blockMetadataInputLevelFields: BlockMetadataInputLevelFields | undefined
-  error: string | null
-  isLoading: boolean
-}
-
-export interface BlockMetadataInputLevelFields {
-  id: MetadataBlockInfo['id']
-  name: MetadataBlockInfo['name']
-  displayName: MetadataBlockInfo['displayName']
-  metadataFields: Record<string, ReducedMetadataFieldInfo>
-}
-
-export type ReducedMetadataFieldInfo = Pick<MetadataField, 'name' | 'displayName'> & {
-  childMetadataFields?: Record<string, Pick<MetadataField, 'name' | 'displayName'>>
-}
-
-export const useGetBlockMetadataInputLevelFields = ({
-  blockName,
-  metadataBlockInfoRepository
-}: Props): UseGetBlockMetadataInputLevelsFieldsReturn => {
-  const [blockMetadataInputLevelFields, setBlockMetadataInputLevelFields] = useState<
-    BlockMetadataInputLevelFields | undefined
-  >()
-  const [isLoading, setIsLoading] = useState<boolean>(true)
-  const [error, setError] = useState<string | null>(null)
-
-  useEffect(() => {
-    const handleGetInfo = async () => {
-      setIsLoading(true)
-      try {
-        const blockInfo = await getMetadataBlockInfoByNameTemporal(
-          metadataBlockInfoRepository,
-          blockName
-        )
-
-        const formattedMetadataFields: BlockMetadataInputLevelFields['metadataFields'] =
-          Object.entries(blockInfo.metadataFields).reduce((acc, [key, value]) => {
-            const { name, displayName, childMetadataFields } = value
-            const replaceDotWithSlash = (str: string) => str.replace(/\./g, '/')
-            const normalizedName = replaceDotWithSlash(name)
-
-            acc[key] = {
-              name: normalizedName,
-              displayName,
-              childMetadataFields: childMetadataFields
-                ? Object.entries(childMetadataFields).reduce((acc, [key, value]) => {
-                    const { name, displayName } = value
-
-                    const normalizedChildfieldName = replaceDotWithSlash(name)
-
-                    acc[key] = {
-                      name: normalizedChildfieldName,
-                      displayName
-                    }
-                    return acc
-                  }, {} as Record<string, Pick<MetadataField, 'name' | 'displayName'>>)
-                : undefined
-            }
-            return acc
-          }, {} as Record<string, ReducedMetadataFieldInfo>)
-
-        const formattedBlockInfo: BlockMetadataInputLevelFields = {
-          id: blockInfo.id,
-          name: blockInfo.name,
-          displayName: blockInfo.displayName,
-          metadataFields: formattedMetadataFields
-        }
-
-        setBlockMetadataInputLevelFields(formattedBlockInfo)
-      } catch (err) {
-        const errorMessage =
-          err instanceof Error && err.message
-            ? err.message
-            : 'Something went wrong getting the information from the metadata blocks. Try again later.'
-        setError(errorMessage)
-      } finally {
-        setIsLoading(false)
-      }
-    }
-
-    void handleGetInfo()
-  }, [metadataBlockInfoRepository, blockName])
-
-  return {
-    blockMetadataInputLevelFields,
-    error,
-    isLoading
-  }
-}
diff --git a/src/sections/create-collection/useGetAllMetadataBlocksInfoByName.tsx b/src/sections/create-collection/useGetAllMetadataBlocksInfoByName.tsx
index c673070b4..336262989 100644
--- a/src/sections/create-collection/useGetAllMetadataBlocksInfoByName.tsx
+++ b/src/sections/create-collection/useGetAllMetadataBlocksInfoByName.tsx
@@ -24,8 +24,10 @@ export interface ReducedMetadataBlockInfo {
   metadataFields: Record<string, ReducedMetadataFieldInfo>
 }
 
-export type ReducedMetadataFieldInfo = Pick<MetadataField, 'name' | 'displayName'> & {
-  childMetadataFields?: Record<string, Pick<MetadataField, 'name' | 'displayName'>>
+export type ReducedMetadataFieldsAndChildsInfo = Pick<MetadataField, 'name' | 'displayName'>
+
+export type ReducedMetadataFieldInfo = ReducedMetadataFieldsAndChildsInfo & {
+  childMetadataFields?: Record<string, ReducedMetadataFieldsAndChildsInfo>
 }
 
 const blocksNames: MetadataBlockName[] = [

From 2427fb7ce484970ec0b2483ae8b060a742e27323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Fri, 2 Aug 2024 09:54:23 -0300
Subject: [PATCH 27/52] chore: update js-dv version

---
 dev-env/.env      | 2 +-
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-env/.env b/dev-env/.env
index 05d4bebe8..af9cd824e 100644
--- a/dev-env/.env
+++ b/dev-env/.env
@@ -1,4 +1,4 @@
 POSTGRES_VERSION=13
 DATAVERSE_DB_USER=dataverse
 SOLR_VERSION=9.3.0
-REGISTRY=docker.io
+REGISTRY=ghcr.io
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index afd8a93e9..de5a9febe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.1.0",
       "dependencies": {
         "@faker-js/faker": "7.6.0",
-        "@iqss/dataverse-client-javascript": "2.0.0-pr162.eee6302",
+        "@iqss/dataverse-client-javascript": "2.0.0-pr169.5c26a1e",
         "@iqss/dataverse-design-system": "*",
         "@istanbuljs/nyc-config-typescript": "1.0.2",
         "@tanstack/react-table": "8.9.2",
@@ -3610,9 +3610,9 @@
     },
     "node_modules/@iqss/dataverse-client-javascript": {
       "name": "@IQSS/dataverse-client-javascript",
-      "version": "2.0.0-pr162.eee6302",
-      "resolved": "https://npm.pkg.github.com/download/@IQSS/dataverse-client-javascript/2.0.0-pr162.eee6302/42f7a97a7234421be7a6a7ac56b9216d288681d0",
-      "integrity": "sha512-YRSvzuP/zyvBS0kh4HIMYqK+r5IetEkmQB14tAKyTL+BrlOLTYQLju1ZHVrYie/hRUpTcM8WbqE4B67FlX2h7g==",
+      "version": "2.0.0-pr169.5c26a1e",
+      "resolved": "https://npm.pkg.github.com/download/@IQSS/dataverse-client-javascript/2.0.0-pr169.5c26a1e/65bb7f674264c1e93ed46b8f9ce527f2f73dbaaf",
+      "integrity": "sha512-r+37oyOj6qCsWYSvNdZHvK2/aHX60TyUTnbqrkK97AAaToAraEMf83b8Bd7hMCEwF7T25+3u7l0bI+PnAFIxvw==",
       "license": "MIT",
       "dependencies": {
         "@types/node": "^18.15.11",
diff --git a/package.json b/package.json
index f9f4c68c8..4982deefc 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@faker-js/faker": "7.6.0",
-    "@iqss/dataverse-client-javascript": "2.0.0-pr162.eee6302",
+    "@iqss/dataverse-client-javascript": "2.0.0-pr169.5c26a1e",
     "@iqss/dataverse-design-system": "*",
     "@istanbuljs/nyc-config-typescript": "1.0.2",
     "@tanstack/react-table": "8.9.2",

From 5a0e2e1c84b5b908cc4499dff89ccd60b7d4d05b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Fri, 2 Aug 2024 10:46:46 -0300
Subject: [PATCH 28/52]  feat: refactor temporal get all blocks info

---
 .../repositories/MetadataBlockInfoRepository.ts   |  2 +-
 ...ral.ts => getAllMetadataBlocksInfoTemporal.ts} |  8 ++++----
 .../MetadataBlockInfoJSDataverseRepository.ts     |  9 +++++----
 .../create-collection/CreateCollection.tsx        |  4 ++--
 .../collection-form/CollectionForm.tsx            |  2 +-
 .../collection-form/CollectionFormHelper.ts       |  5 +----
 .../MetadataFieldsSection.tsx                     |  2 +-
 .../MetadataInputLevelFieldsBlock.tsx             |  2 +-
 .../input-levels-table/InputLevelFieldRow.tsx     |  2 +-
 .../input-levels-table/InputLevelsTable.tsx       |  2 +-
 .../input-levels-table/RequiredOptionalRadios.tsx |  2 +-
 ...ByName.tsx => useGetAllMetadataBlocksInfo.tsx} | 15 ++++++++-------
 12 files changed, 27 insertions(+), 28 deletions(-)
 rename src/metadata-block-info/domain/useCases/{getMetadataBlockInfoByNameTemporal.ts => getAllMetadataBlocksInfoTemporal.ts} (57%)
 rename src/sections/create-collection/{useGetAllMetadataBlocksInfoByName.tsx => useGetAllMetadataBlocksInfo.tsx} (88%)

diff --git a/src/metadata-block-info/domain/repositories/MetadataBlockInfoRepository.ts b/src/metadata-block-info/domain/repositories/MetadataBlockInfoRepository.ts
index 140c5cfc3..76b7dc1a7 100644
--- a/src/metadata-block-info/domain/repositories/MetadataBlockInfoRepository.ts
+++ b/src/metadata-block-info/domain/repositories/MetadataBlockInfoRepository.ts
@@ -2,7 +2,7 @@ import { MetadataBlockInfoDisplayFormat, MetadataBlockInfo } from '../models/Met
 
 export interface MetadataBlockInfoRepository {
   getByName: (name: string) => Promise<MetadataBlockInfoDisplayFormat | undefined>
-  getByNameTemporal: (name: string) => Promise<MetadataBlockInfo>
+  getAllTemporal: (names: string[]) => Promise<MetadataBlockInfo[]>
   getDisplayedOnCreateByCollectionId: (
     collectionId: number | string
   ) => Promise<MetadataBlockInfo[]>
diff --git a/src/metadata-block-info/domain/useCases/getMetadataBlockInfoByNameTemporal.ts b/src/metadata-block-info/domain/useCases/getAllMetadataBlocksInfoTemporal.ts
similarity index 57%
rename from src/metadata-block-info/domain/useCases/getMetadataBlockInfoByNameTemporal.ts
rename to src/metadata-block-info/domain/useCases/getAllMetadataBlocksInfoTemporal.ts
index 82bf9f3ec..03ebd4611 100644
--- a/src/metadata-block-info/domain/useCases/getMetadataBlockInfoByNameTemporal.ts
+++ b/src/metadata-block-info/domain/useCases/getAllMetadataBlocksInfoTemporal.ts
@@ -1,11 +1,11 @@
 import { MetadataBlockInfoRepository } from '../repositories/MetadataBlockInfoRepository'
 import { MetadataBlockInfo } from '../models/MetadataBlockInfo'
 
-export async function getMetadataBlockInfoByNameTemporal(
+export async function getAllMetadataBlocksInfoTemporal(
   metadataBlockInfoRepository: MetadataBlockInfoRepository,
-  name: string
-): Promise<MetadataBlockInfo> {
-  return metadataBlockInfoRepository.getByNameTemporal(name).catch((error: Error) => {
+  names: string[]
+): Promise<MetadataBlockInfo[]> {
+  return metadataBlockInfoRepository.getAllTemporal(names).catch((error: Error) => {
     throw new Error(error.message)
   })
 }
diff --git a/src/metadata-block-info/infrastructure/repositories/MetadataBlockInfoJSDataverseRepository.ts b/src/metadata-block-info/infrastructure/repositories/MetadataBlockInfoJSDataverseRepository.ts
index 32b1e04b2..6726f568c 100644
--- a/src/metadata-block-info/infrastructure/repositories/MetadataBlockInfoJSDataverseRepository.ts
+++ b/src/metadata-block-info/infrastructure/repositories/MetadataBlockInfoJSDataverseRepository.ts
@@ -24,10 +24,11 @@ export class MetadataBlockInfoJSDataverseRepository implements MetadataBlockInfo
   }
 
   // TODO: This will be replaced to a new use case that will return all metadata blocks info
-  getByNameTemporal(name: string): Promise<MetadataBlockInfo> {
-    return getMetadataBlockByName
-      .execute(name)
-      .then((jsMetadataBlockInfo: JSMetadataBlockInfo) => {
+  getAllTemporal(names: string[]): Promise<MetadataBlockInfo[]> {
+    const blockPromises = names.map((name) => getMetadataBlockByName.execute(name))
+
+    return Promise.all(blockPromises)
+      .then((jsMetadataBlockInfo: JSMetadataBlockInfo[]) => {
         return jsMetadataBlockInfo
       })
       .catch((error: ReadError) => {
diff --git a/src/sections/create-collection/CreateCollection.tsx b/src/sections/create-collection/CreateCollection.tsx
index edfec7fb5..8fe73a38f 100644
--- a/src/sections/create-collection/CreateCollection.tsx
+++ b/src/sections/create-collection/CreateCollection.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next'
 import { useDeepCompareMemo } from 'use-deep-compare'
 import { useCollection } from '../collection/useCollection'
 import { useGetCollectionMetadataBlocksNamesInfo } from './useGetCollectionMetadataBlocksNamesInfo'
-import { useGetAllMetadataBlocksInfoByName } from './useGetAllMetadataBlocksInfoByName'
+import { useGetAllMetadataBlocksInfo } from './useGetAllMetadataBlocksInfo'
 import { CollectionRepository } from '../../collection/domain/repositories/CollectionRepository'
 import { MetadataBlockInfoRepository } from '../../metadata-block-info/domain/repositories/MetadataBlockInfoRepository'
 import { MetadataBlockName } from '../../dataset/domain/models/Dataset'
@@ -53,7 +53,7 @@ export function CreateCollection({
     })
 
   const { allMetadataBlocksInfo, isLoading: isLoadingAllMetadataBlocksInfo } =
-    useGetAllMetadataBlocksInfoByName({ metadataBlockInfoRepository })
+    useGetAllMetadataBlocksInfo({ metadataBlockInfoRepository })
 
   const baseInputLevels: FormattedCollectionInputLevels = useDeepCompareMemo(() => {
     return CollectionFormHelper.defineBaseInputLevels(allMetadataBlocksInfo)
diff --git a/src/sections/create-collection/collection-form/CollectionForm.tsx b/src/sections/create-collection/collection-form/CollectionForm.tsx
index cd999d61b..4c2108b96 100644
--- a/src/sections/create-collection/collection-form/CollectionForm.tsx
+++ b/src/sections/create-collection/collection-form/CollectionForm.tsx
@@ -9,7 +9,7 @@ import {
   CollectionStorage
 } from '../../../collection/domain/useCases/DTOs/CollectionDTO'
 import { SubmissionStatus, useSubmitCollection } from './useSubmitCollection'
-import { ReducedMetadataBlockInfo } from '../useGetAllMetadataBlocksInfoByName'
+import { ReducedMetadataBlockInfo } from '../useGetAllMetadataBlocksInfo'
 import { MetadataBlockName } from '../../../metadata-block-info/domain/models/MetadataBlockInfo'
 import { SeparationLine } from '../../shared/layout/SeparationLine/SeparationLine'
 import { TopFieldsSection } from './top-fields-section/TopFieldsSection'
diff --git a/src/sections/create-collection/collection-form/CollectionFormHelper.ts b/src/sections/create-collection/collection-form/CollectionFormHelper.ts
index 9f2469d5d..5585a5738 100644
--- a/src/sections/create-collection/collection-form/CollectionFormHelper.ts
+++ b/src/sections/create-collection/collection-form/CollectionFormHelper.ts
@@ -4,10 +4,7 @@ import {
   CollectionInputLevelDTO
 } from '../../../collection/domain/useCases/DTOs/CollectionDTO'
 import { MetadataBlockName } from '../../../metadata-block-info/domain/models/MetadataBlockInfo'
-import {
-  ReducedMetadataBlockInfo,
-  ReducedMetadataFieldInfo
-} from '../useGetAllMetadataBlocksInfoByName'
+import { ReducedMetadataBlockInfo, ReducedMetadataFieldInfo } from '../useGetAllMetadataBlocksInfo'
 import {
   CollectionFormMetadataBlock,
   CollectionFormMetadataBlocks,
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx
index e968281c5..7c2806761 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx
@@ -1,6 +1,6 @@
 import { useTranslation } from 'react-i18next'
 import { Col, Form, Row, Stack } from '@iqss/dataverse-design-system'
-import { ReducedMetadataBlockInfo } from '../../useGetAllMetadataBlocksInfoByName'
+import { ReducedMetadataBlockInfo } from '../../useGetAllMetadataBlocksInfo'
 import { MetadataInputLevelFieldsBlock } from './metadata-input-level-fields-block/MetadataInputLevelFieldsBlock'
 import { FieldsFromRootCheckbox } from './fields-from-root-checkbox/FieldsFromRootCheckbox'
 import { MetadataBlockName } from '../../../../metadata-block-info/domain/models/MetadataBlockInfo'
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
index a759e9d7f..bcd21eeb8 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
@@ -3,7 +3,7 @@ import { Controller, UseControllerProps, useFormContext, useWatch } from 'react-
 import { Button, Form, Stack } from '@iqss/dataverse-design-system'
 import { CloseButton } from 'react-bootstrap'
 import { MetadataBlockName } from '../../../../../metadata-block-info/domain/models/MetadataBlockInfo'
-import { ReducedMetadataBlockInfo } from '../../../useGetAllMetadataBlocksInfoByName'
+import { ReducedMetadataBlockInfo } from '../../../useGetAllMetadataBlocksInfo'
 import { METADATA_BLOCKS_NAMES_GROUPER, USE_FIELDS_FROM_PARENT } from '../../CollectionForm'
 import { InputLevelsTable } from './input-levels-table/InputLevelsTable'
 
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
index 480ef77b7..92c831df3 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
@@ -2,7 +2,7 @@ import { ChangeEvent, useId } from 'react'
 import { Controller, UseControllerProps, useFormContext, useWatch } from 'react-hook-form'
 import cn from 'classnames'
 import { Form } from '@iqss/dataverse-design-system'
-import { ReducedMetadataFieldInfo } from '../../../../useGetAllMetadataBlocksInfoByName'
+import { ReducedMetadataFieldInfo } from '../../../../useGetAllMetadataBlocksInfo'
 import { INPUT_LEVELS_GROUPER, REQUIRED_BY_DATAVERSE_FIELDS } from '../../../CollectionForm'
 import styles from './InputLevelsTable.module.scss'
 import { CollectionFormHelper } from '../../../CollectionFormHelper'
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.tsx
index b7f0ad490..3f18c5cf1 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelsTable.tsx
@@ -1,7 +1,7 @@
 import { ReactNode } from 'react'
 import cn from 'classnames'
 import { Table } from '@iqss/dataverse-design-system'
-import { ReducedMetadataBlockInfo } from '../../../../useGetAllMetadataBlocksInfoByName'
+import { ReducedMetadataBlockInfo } from '../../../../useGetAllMetadataBlocksInfo'
 import { InputLevelFieldRow } from './InputLevelFieldRow'
 import styles from './InputLevelsTable.module.scss'
 
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/RequiredOptionalRadios.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/RequiredOptionalRadios.tsx
index f8d836266..da995ffca 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/RequiredOptionalRadios.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/RequiredOptionalRadios.tsx
@@ -1,7 +1,7 @@
 import { ChangeEvent } from 'react'
 import { Form, Stack } from '@iqss/dataverse-design-system'
 import { Controller, useFormContext, useWatch } from 'react-hook-form'
-import { ReducedMetadataFieldInfo } from '../../../../useGetAllMetadataBlocksInfoByName'
+import { ReducedMetadataFieldInfo } from '../../../../useGetAllMetadataBlocksInfo'
 import { CollectionFormInputLevelValue, INPUT_LEVELS_GROUPER } from '../../../CollectionForm'
 
 type RequiredOptionalRadiosProps =
diff --git a/src/sections/create-collection/useGetAllMetadataBlocksInfoByName.tsx b/src/sections/create-collection/useGetAllMetadataBlocksInfo.tsx
similarity index 88%
rename from src/sections/create-collection/useGetAllMetadataBlocksInfoByName.tsx
rename to src/sections/create-collection/useGetAllMetadataBlocksInfo.tsx
index 336262989..21d6f18a0 100644
--- a/src/sections/create-collection/useGetAllMetadataBlocksInfoByName.tsx
+++ b/src/sections/create-collection/useGetAllMetadataBlocksInfo.tsx
@@ -5,13 +5,13 @@ import {
   MetadataBlockName,
   MetadataField
 } from '../../metadata-block-info/domain/models/MetadataBlockInfo'
-import { getMetadataBlockInfoByNameTemporal } from '../../metadata-block-info/domain/useCases/getMetadataBlockInfoByNameTemporal'
+import { getAllMetadataBlocksInfoTemporal } from '../../metadata-block-info/domain/useCases/getAllMetadataBlocksInfoTemporal'
 
 interface Props {
   metadataBlockInfoRepository: MetadataBlockInfoRepository
 }
 
-interface UseGetAllMetadataBlocksInfoByName {
+interface UseGetAllMetadataBlocksInfo {
   allMetadataBlocksInfo: ReducedMetadataBlockInfo[]
   error: string | null
   isLoading: boolean
@@ -39,9 +39,9 @@ const blocksNames: MetadataBlockName[] = [
   MetadataBlockName.JOURNAL
 ]
 
-export const useGetAllMetadataBlocksInfoByName = ({
+export const useGetAllMetadataBlocksInfo = ({
   metadataBlockInfoRepository
-}: Props): UseGetAllMetadataBlocksInfoByName => {
+}: Props): UseGetAllMetadataBlocksInfo => {
   const [allMetadataBlocksInfo, setAllMetadataBlocksInfo] = useState<ReducedMetadataBlockInfo[]>([])
   const [isLoading, setIsLoading] = useState<boolean>(true)
   const [error, setError] = useState<string | null>(null)
@@ -50,11 +50,12 @@ export const useGetAllMetadataBlocksInfoByName = ({
     const handleGetInfo = async () => {
       setIsLoading(true)
       try {
-        const promises = blocksNames.map((blockName) =>
-          getMetadataBlockInfoByNameTemporal(metadataBlockInfoRepository, blockName)
+        const blocksInfo = await getAllMetadataBlocksInfoTemporal(
+          metadataBlockInfoRepository,
+          blocksNames
         )
 
-        const blocksInfo = await Promise.all(promises)
+        console.log(blocksInfo)
 
         const reducedMetadataBlocksInfo: ReducedMetadataBlockInfo[] = blocksInfo.map(
           (blockInfo) => {

From bacd125581f5a209d347c44e5a5bf542f99a7c1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Fri, 2 Aug 2024 11:27:12 -0300
Subject: [PATCH 29/52] feat: update mock repositories and stories

---
 .../CreateCollectionSkeleton.tsx              |    4 +-
 .../CreateCollection.stories.tsx              |    6 +
 .../MetadataBlockInfoMockErrorRepository.ts   |    8 +
 .../MetadataBlockInfoMockLoadingRepository.ts |    4 +
 .../MetadataBlockInfoMockRepository.ts        |   15 +
 .../AstrophysicsMetadataBlockInfoMother.ts    |  447 +++++
 .../BiomedicalMetadataBlockInfoMother.ts      |  513 ++++++
 .../models/CitationMetadataBlockInfoMother.ts | 1522 +++++++++++++++++
 .../GeospatialMetadataBlockInfoMother.ts      |  443 +++++
 .../models/JournalMetadataBlockInfoMother.ts  |  130 ++
 .../domain/models/MetadataBlockInfoMother.ts  |   31 +
 .../SocialScienceMetadataBlockInfoMother.ts   |  426 +++++
 12 files changed, 3547 insertions(+), 2 deletions(-)
 create mode 100644 tests/component/metadata-block-info/domain/models/AstrophysicsMetadataBlockInfoMother.ts
 create mode 100644 tests/component/metadata-block-info/domain/models/BiomedicalMetadataBlockInfoMother.ts
 create mode 100644 tests/component/metadata-block-info/domain/models/CitationMetadataBlockInfoMother.ts
 create mode 100644 tests/component/metadata-block-info/domain/models/GeospatialMetadataBlockInfoMother.ts
 create mode 100644 tests/component/metadata-block-info/domain/models/JournalMetadataBlockInfoMother.ts
 create mode 100644 tests/component/metadata-block-info/domain/models/SocialScienceMetadataBlockInfoMother.ts

diff --git a/src/sections/create-collection/CreateCollectionSkeleton.tsx b/src/sections/create-collection/CreateCollectionSkeleton.tsx
index 6dfe6a60e..b3fd3ef4a 100644
--- a/src/sections/create-collection/CreateCollectionSkeleton.tsx
+++ b/src/sections/create-collection/CreateCollectionSkeleton.tsx
@@ -69,8 +69,8 @@ export const CreateCollectionSkeleton = () => (
 
       <SeparationLine />
 
-      <Skeleton height={145} width="100%" style={{ marginBottom: 16 }} />
-      <Skeleton height={145} width="100%" style={{ marginBottom: 16 }} />
+      <Skeleton height={325} width="100%" style={{ marginBottom: 16 }} />
+      <Skeleton height={325} width="100%" style={{ marginBottom: 16 }} />
 
       <Stack direction="horizontal" className="pt-3">
         <Skeleton width={120} height={38} />
diff --git a/src/stories/create-collection/CreateCollection.stories.tsx b/src/stories/create-collection/CreateCollection.stories.tsx
index 44258c24d..5421221b4 100644
--- a/src/stories/create-collection/CreateCollection.stories.tsx
+++ b/src/stories/create-collection/CreateCollection.stories.tsx
@@ -6,6 +6,9 @@ import { WithLoggedInUser } from '../WithLoggedInUser'
 import { CollectionMockRepository } from '../collection/CollectionMockRepository'
 import { CollectionLoadingMockRepository } from '../collection/CollectionLoadingMockRepository'
 import { NoCollectionMockRepository } from '../collection/NoCollectionMockRepository'
+import { MetadataBlockInfoMockRepository } from '../shared-mock-repositories/metadata-block-info/MetadataBlockInfoMockRepository'
+import { MetadataBlockInfoMockLoadingRepository } from '../shared-mock-repositories/metadata-block-info/MetadataBlockInfoMockLoadingRepository'
+import { MetadataBlockInfoMockErrorRepository } from '../shared-mock-repositories/metadata-block-info/MetadataBlockInfoMockErrorRepository'
 
 const meta: Meta<typeof CreateCollection> = {
   title: 'Pages/Create Collection',
@@ -23,6 +26,7 @@ export const Default: Story = {
   render: () => (
     <CreateCollection
       collectionRepository={new CollectionMockRepository()}
+      metadataBlockInfoRepository={new MetadataBlockInfoMockRepository()}
       ownerCollectionId="root"
     />
   )
@@ -31,6 +35,7 @@ export const Loading: Story = {
   render: () => (
     <CreateCollection
       collectionRepository={new CollectionLoadingMockRepository()}
+      metadataBlockInfoRepository={new MetadataBlockInfoMockLoadingRepository()}
       ownerCollectionId="root"
     />
   )
@@ -40,6 +45,7 @@ export const OwnerCollectionNotFound: Story = {
   render: () => (
     <CreateCollection
       collectionRepository={new NoCollectionMockRepository()}
+      metadataBlockInfoRepository={new MetadataBlockInfoMockErrorRepository()}
       ownerCollectionId="root"
     />
   )
diff --git a/src/stories/shared-mock-repositories/metadata-block-info/MetadataBlockInfoMockErrorRepository.ts b/src/stories/shared-mock-repositories/metadata-block-info/MetadataBlockInfoMockErrorRepository.ts
index 69f32d3b5..b71ad86c0 100644
--- a/src/stories/shared-mock-repositories/metadata-block-info/MetadataBlockInfoMockErrorRepository.ts
+++ b/src/stories/shared-mock-repositories/metadata-block-info/MetadataBlockInfoMockErrorRepository.ts
@@ -28,4 +28,12 @@ export class MetadataBlockInfoMockErrorRepository implements MetadataBlockInfoMo
       }, 1000)
     })
   }
+
+  getAllTemporal(_names: string[]): Promise<MetadataBlockInfo[]> {
+    return new Promise((_resolve, reject) => {
+      setTimeout(() => {
+        reject('Error thrown from mock')
+      }, 1000)
+    })
+  }
 }
diff --git a/src/stories/shared-mock-repositories/metadata-block-info/MetadataBlockInfoMockLoadingRepository.ts b/src/stories/shared-mock-repositories/metadata-block-info/MetadataBlockInfoMockLoadingRepository.ts
index 3ff8742eb..fb3eb4076 100644
--- a/src/stories/shared-mock-repositories/metadata-block-info/MetadataBlockInfoMockLoadingRepository.ts
+++ b/src/stories/shared-mock-repositories/metadata-block-info/MetadataBlockInfoMockLoadingRepository.ts
@@ -16,4 +16,8 @@ export class MetadataBlockInfoMockLoadingRepository implements MetadataBlockInfo
   getDisplayedOnCreateByCollectionId(_collectionId: number | string): Promise<MetadataBlockInfo[]> {
     return new Promise(() => {})
   }
+
+  getAllTemporal(_names: string[]): Promise<MetadataBlockInfo[]> {
+    return new Promise(() => {})
+  }
 }
diff --git a/src/stories/shared-mock-repositories/metadata-block-info/MetadataBlockInfoMockRepository.ts b/src/stories/shared-mock-repositories/metadata-block-info/MetadataBlockInfoMockRepository.ts
index 0d3e1e7c5..eeee978e5 100644
--- a/src/stories/shared-mock-repositories/metadata-block-info/MetadataBlockInfoMockRepository.ts
+++ b/src/stories/shared-mock-repositories/metadata-block-info/MetadataBlockInfoMockRepository.ts
@@ -29,4 +29,19 @@ export class MetadataBlockInfoMockRepository implements MetadataBlockInfoReposit
       }, 1_000)
     })
   }
+
+  getAllTemporal(_names: string[]): Promise<MetadataBlockInfo[]> {
+    return new Promise((resolve) => {
+      setTimeout(() => {
+        resolve([
+          MetadataBlockInfoMother.getCitationBlock(),
+          MetadataBlockInfoMother.getGeospatialBlock(),
+          MetadataBlockInfoMother.getAstrophysicsBlock(),
+          MetadataBlockInfoMother.getBiomedicalBlock(),
+          MetadataBlockInfoMother.getJournalBlock(),
+          MetadataBlockInfoMother.getSocialScienceBlock()
+        ])
+      }, 1_000)
+    })
+  }
 }
diff --git a/tests/component/metadata-block-info/domain/models/AstrophysicsMetadataBlockInfoMother.ts b/tests/component/metadata-block-info/domain/models/AstrophysicsMetadataBlockInfoMother.ts
new file mode 100644
index 000000000..591dd855f
--- /dev/null
+++ b/tests/component/metadata-block-info/domain/models/AstrophysicsMetadataBlockInfoMother.ts
@@ -0,0 +1,447 @@
+import { MetadataBlockInfo } from '../../../../../src/metadata-block-info/domain/models/MetadataBlockInfo'
+
+export class AstrophysicsMetadataBlockInfoMother {
+  static get(): MetadataBlockInfo {
+    return {
+      id: 4,
+      name: 'astrophysics',
+      displayName: 'Astronomy and Astrophysics Metadata',
+      displayOnCreate: false,
+      metadataFields: {
+        astroType: {
+          name: 'astroType',
+          displayName: 'Type',
+          title: 'Type',
+          type: 'TEXT',
+          watermark: '',
+          description: 'The nature or genre of the content of the files in the dataset.',
+          multiple: true,
+          isControlledVocabulary: true,
+          controlledVocabularyValues: [
+            'Image',
+            'Mosaic',
+            'EventList',
+            'Spectrum',
+            'Cube',
+            'Table',
+            'Catalog',
+            'LightCurve',
+            'Simulation',
+            'Figure',
+            'Artwork',
+            'Animation',
+            'PrettyPicture',
+            'Documentation',
+            'Other',
+            'Library',
+            'Press Release',
+            'Facsimile',
+            'Historical',
+            'Observation',
+            'Object',
+            'Value',
+            'ValuePair',
+            'Survey'
+          ],
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 0,
+          typeClass: 'controlledVocabulary',
+          displayOnCreate: false
+        },
+        astroFacility: {
+          name: 'astroFacility',
+          displayName: 'Facility',
+          title: 'Facility',
+          type: 'TEXT',
+          watermark: '',
+          description: 'The observatory or facility where the data was obtained. ',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 1,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        astroInstrument: {
+          name: 'astroInstrument',
+          displayName: 'Instrument',
+          title: 'Instrument',
+          type: 'TEXT',
+          watermark: '',
+          description: 'The instrument used to collect the data.',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 2,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        astroObject: {
+          name: 'astroObject',
+          displayName: 'Object',
+          title: 'Object',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'Astronomical Objects represented in the data (Given as SIMBAD recognizable names preferred).',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 3,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        'resolution.Spatial': {
+          name: 'resolution.Spatial',
+          displayName: 'Spatial Resolution',
+          title: 'Spatial Resolution',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'The spatial (angular) resolution that is typical of the observations, in decimal degrees.',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 4,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        'resolution.Spectral': {
+          name: 'resolution.Spectral',
+          displayName: 'Spectral Resolution',
+          title: 'Spectral Resolution',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'The spectral resolution that is typical of the observations, given as the ratio \\u03bb/\\u0394\\u03bb.',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 5,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        'resolution.Temporal': {
+          name: 'resolution.Temporal',
+          displayName: 'Time Resolution',
+          title: 'Time Resolution',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'The temporal resolution that is typical of the observations, given in seconds.',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 6,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        'coverage.Spectral.Bandpass': {
+          name: 'coverage.Spectral.Bandpass',
+          displayName: 'Bandpass',
+          title: 'Bandpass',
+          type: 'TEXT',
+          watermark: '',
+          description: 'Conventional bandpass name',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 7,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        'coverage.Spectral.CentralWavelength': {
+          name: 'coverage.Spectral.CentralWavelength',
+          displayName: 'Central Wavelength (m)',
+          title: 'Central Wavelength (m)',
+          type: 'FLOAT',
+          watermark: 'Enter a floating-point number.',
+          description: 'The central wavelength of the spectral bandpass, in meters.',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 8,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        'coverage.Spectral.Wavelength': {
+          name: 'coverage.Spectral.Wavelength',
+          displayName: 'Wavelength Range',
+          title: 'Wavelength Range',
+          type: 'NONE',
+          watermark: 'Enter a floating-point number.',
+          description: 'The minimum and maximum wavelength of the spectral bandpass.',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 9,
+          typeClass: 'compound',
+          displayOnCreate: false,
+          childMetadataFields: {
+            'coverage.Spectral.MinimumWavelength': {
+              name: 'coverage.Spectral.MinimumWavelength',
+              displayName: 'Wavelength Range Minimum (m)',
+              title: 'Minimum (m)',
+              type: 'FLOAT',
+              watermark: 'Enter a floating-point number.',
+              description: 'The minimum wavelength of the spectral bandpass, in meters.',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '',
+              isRequired: false,
+              displayOrder: 10,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            'coverage.Spectral.MaximumWavelength': {
+              name: 'coverage.Spectral.MaximumWavelength',
+              displayName: 'Wavelength Range Maximum (m)',
+              title: 'Maximum (m)',
+              type: 'FLOAT',
+              watermark: 'Enter a floating-point number.',
+              description: 'The maximum wavelength of the spectral bandpass, in meters.',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '',
+              isRequired: false,
+              displayOrder: 11,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            }
+          }
+        },
+        'coverage.Temporal': {
+          name: 'coverage.Temporal',
+          displayName: 'Dataset Date Range',
+          title: 'Dataset Date Range',
+          type: 'NONE',
+          watermark: '',
+          description: ' Time period covered by the data.',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 12,
+          typeClass: 'compound',
+          displayOnCreate: false,
+          childMetadataFields: {
+            'coverage.Temporal.StartTime': {
+              name: 'coverage.Temporal.StartTime',
+              displayName: 'Dataset Date Range Start',
+              title: 'Start',
+              type: 'DATE',
+              watermark: 'YYYY-MM-DD',
+              description: 'Dataset Start Date',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '',
+              isRequired: false,
+              displayOrder: 13,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            'coverage.Temporal.StopTime': {
+              name: 'coverage.Temporal.StopTime',
+              displayName: 'Dataset Date Range End',
+              title: 'End',
+              type: 'DATE',
+              watermark: 'YYYY-MM-DD',
+              description: 'Dataset End Date',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '',
+              isRequired: false,
+              displayOrder: 14,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            }
+          }
+        },
+        'coverage.Spatial': {
+          name: 'coverage.Spatial',
+          displayName: 'Sky Coverage',
+          title: 'Sky Coverage',
+          type: 'TEXT',
+          watermark: '',
+          description: 'The sky coverage of the data object.',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 15,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        'coverage.Depth': {
+          name: 'coverage.Depth',
+          displayName: 'Depth Coverage',
+          title: 'Depth Coverage',
+          type: 'FLOAT',
+          watermark: 'Enter a floating-point number.',
+          description: 'The (typical) depth coverage, or sensitivity, of the data object in Jy.',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 16,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        'coverage.ObjectDensity': {
+          name: 'coverage.ObjectDensity',
+          displayName: 'Object Density',
+          title: 'Object Density',
+          type: 'FLOAT',
+          watermark: 'Enter a floating-point number.',
+          description:
+            'The (typical) density of objects, catalog entries, telescope pointings, etc., on the sky, in number per square degree.',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 17,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        'coverage.ObjectCount': {
+          name: 'coverage.ObjectCount',
+          displayName: 'Object Count',
+          title: 'Object Count',
+          type: 'INT',
+          watermark: 'Enter an integer.',
+          description: 'The total number of objects, catalog entries, etc., in the data object.',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 18,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        'coverage.SkyFraction': {
+          name: 'coverage.SkyFraction',
+          displayName: 'Fraction of Sky',
+          title: 'Fraction of Sky',
+          type: 'FLOAT',
+          watermark: 'Enter a floating-point number.',
+          description:
+            'The fraction of the sky represented in the observations, ranging from 0 to 1.',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 19,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        'coverage.Polarization': {
+          name: 'coverage.Polarization',
+          displayName: 'Polarization',
+          title: 'Polarization',
+          type: 'TEXT',
+          watermark: '',
+          description: 'The polarization coverage',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 20,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        redshiftType: {
+          name: 'redshiftType',
+          displayName: 'RedshiftType',
+          title: 'RedshiftType',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'RedshiftType string C "Redshift"; or "Optical" or "Radio" definitions of Doppler velocity used in the data object.',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 21,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        'resolution.Redshift': {
+          name: 'resolution.Redshift',
+          displayName: 'Redshift Resolution',
+          title: 'Redshift Resolution',
+          type: 'FLOAT',
+          watermark: 'Enter a floating-point number.',
+          description:
+            'The resolution in redshift (unitless) or Doppler velocity (km/s) in the data object.',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 22,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        'coverage.RedshiftValue': {
+          name: 'coverage.RedshiftValue',
+          displayName: 'Redshift Value',
+          title: 'Redshift Value',
+          type: 'FLOAT',
+          watermark: 'Enter a floating-point number.',
+          description:
+            'The value of the redshift (unitless) or Doppler velocity (km/s in the data object.',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 23,
+          typeClass: 'compound',
+          displayOnCreate: false,
+          childMetadataFields: {
+            'coverage.Redshift.MinimumValue': {
+              name: 'coverage.Redshift.MinimumValue',
+              displayName: 'Redshift Value Minimum',
+              title: 'Minimum',
+              type: 'FLOAT',
+              watermark: 'Enter a floating-point number.',
+              description:
+                'The minimum value of the redshift (unitless) or Doppler velocity (km/s in the data object.',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '',
+              isRequired: false,
+              displayOrder: 24,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            'coverage.Redshift.MaximumValue': {
+              name: 'coverage.Redshift.MaximumValue',
+              displayName: 'Redshift Value Maximum',
+              title: 'Maximum',
+              type: 'FLOAT',
+              watermark: 'Enter a floating-point number.',
+              description:
+                'The maximum value of the redshift (unitless) or Doppler velocity (km/s in the data object.',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '',
+              isRequired: false,
+              displayOrder: 25,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/tests/component/metadata-block-info/domain/models/BiomedicalMetadataBlockInfoMother.ts b/tests/component/metadata-block-info/domain/models/BiomedicalMetadataBlockInfoMother.ts
new file mode 100644
index 000000000..a96367f1e
--- /dev/null
+++ b/tests/component/metadata-block-info/domain/models/BiomedicalMetadataBlockInfoMother.ts
@@ -0,0 +1,513 @@
+import { MetadataBlockInfo } from '../../../../../src/metadata-block-info/domain/models/MetadataBlockInfo'
+
+export class BiomedicalMetadataBlockInfoMother {
+  static get(): MetadataBlockInfo {
+    return {
+      id: 5,
+      name: 'biomedical',
+      displayName: 'Life Sciences Metadata',
+      displayOnCreate: false,
+      metadataFields: {
+        studyDesignType: {
+          name: 'studyDesignType',
+          displayName: 'Design Type',
+          title: 'Design Type',
+          type: 'TEXT',
+          watermark: '',
+          description: 'Design types that are based on the overall experimental design.',
+          multiple: true,
+          isControlledVocabulary: true,
+          controlledVocabularyValues: [
+            'Case Control',
+            'Cross Sectional',
+            'Cohort Study',
+            'Nested Case Control Design',
+            'Not Specified',
+            'Parallel Group Design',
+            'Perturbation Design',
+            'Randomized Controlled Trial',
+            'Technological Design',
+            'Other'
+          ],
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 0,
+          typeClass: 'controlledVocabulary',
+          displayOnCreate: false
+        },
+        studyOtherDesignType: {
+          name: 'studyOtherDesignType',
+          displayName: 'Other Design Type',
+          title: 'Other Design Type',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'If Other was selected in Design Type, list any other design types that were used in this Dataset.',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 1,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        studyFactorType: {
+          name: 'studyFactorType',
+          displayName: 'Factor Type',
+          title: 'Factor Type',
+          type: 'TEXT',
+          watermark: '',
+          description: 'Factors used in the Dataset.',
+          multiple: true,
+          isControlledVocabulary: true,
+          controlledVocabularyValues: [
+            'Age',
+            'Biomarkers',
+            'Cell Surface Markers',
+            'Cell Type/Cell Line',
+            'Developmental Stage',
+            'Disease State',
+            'Drug Susceptibility',
+            'Extract Molecule',
+            'Genetic Characteristics',
+            'Immunoprecipitation Antibody',
+            'Organism',
+            'Passages',
+            'Platform',
+            'Sex',
+            'Strain',
+            'Time Point',
+            'Tissue Type',
+            'Treatment Compound',
+            'Treatment Type',
+            'Other'
+          ],
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 2,
+          typeClass: 'controlledVocabulary',
+          displayOnCreate: false
+        },
+        studyOtherFactorType: {
+          name: 'studyOtherFactorType',
+          displayName: 'Other Factor Type',
+          title: 'Other Factor Type',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'If Other was selected in Factor Type, list any other factor types that were used in this Dataset.',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 3,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        studyAssayOrganism: {
+          name: 'studyAssayOrganism',
+          displayName: 'Organism',
+          title: 'Organism',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'The taxonomic name of the organism used in the Dataset or from which the  starting biological material derives.',
+          multiple: true,
+          isControlledVocabulary: true,
+          controlledVocabularyValues: [
+            'Arabidopsis thaliana',
+            'Bos taurus',
+            'Caenorhabditis elegans',
+            'Chlamydomonas reinhardtii',
+            'Danio rerio (zebrafish)',
+            'Dictyostelium discoideum',
+            'Drosophila melanogaster',
+            'Escherichia coli',
+            'Hepatitis C virus',
+            'Homo sapiens',
+            'Mus musculus',
+            'Mycobacterium africanum',
+            'Mycobacterium canetti',
+            'Mycobacterium tuberculosis',
+            'Mycoplasma pneumoniae',
+            'Oryza sativa',
+            'Plasmodium falciparum',
+            'Pneumocystis carinii',
+            'Rattus norvegicus',
+            "Saccharomyces cerevisiae (brewer's yeast)",
+            'Schizosaccharomyces pombe',
+            'Takifugu rubripes',
+            'Xenopus laevis',
+            'Zea mays',
+            'Other'
+          ],
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 4,
+          typeClass: 'controlledVocabulary',
+          displayOnCreate: false
+        },
+        studyAssayOtherOrganism: {
+          name: 'studyAssayOtherOrganism',
+          displayName: 'Other Organism',
+          title: 'Other Organism',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'If Other was selected in Organism, list any other organisms that were used in this Dataset. Terms from the NCBI Taxonomy are recommended.',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 5,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        studyAssayMeasurementType: {
+          name: 'studyAssayMeasurementType',
+          displayName: 'Measurement Type',
+          title: 'Measurement Type',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'A term to qualify the endpoint, or what is being measured (e.g. gene expression profiling; protein identification).',
+          multiple: true,
+          isControlledVocabulary: true,
+          controlledVocabularyValues: [
+            'cell counting',
+            'cell sorting',
+            'clinical chemistry analysis',
+            'copy number variation profiling',
+            'DNA methylation profiling',
+            'DNA methylation profiling (Bisulfite-Seq)',
+            'DNA methylation profiling (MeDIP-Seq)',
+            'drug susceptibility',
+            'environmental gene survey',
+            'genome sequencing',
+            'hematology',
+            'histology',
+            'Histone Modification (ChIP-Seq)',
+            'loss of heterozygosity profiling',
+            'metabolite profiling',
+            'metagenome sequencing',
+            'protein expression profiling',
+            'protein identification',
+            'protein-DNA binding site identification',
+            'protein-protein interaction detection',
+            'protein-RNA binding (RIP-Seq)',
+            'SNP analysis',
+            'targeted sequencing',
+            'transcription factor binding (ChIP-Seq)',
+            'transcription factor binding site identification',
+            'transcription profiling',
+            'transcription profiling (Microarray)',
+            'transcription profiling (RNA-Seq)',
+            'TRAP translational profiling',
+            'Other'
+          ],
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 6,
+          typeClass: 'controlledVocabulary',
+          displayOnCreate: false
+        },
+        studyAssayOtherMeasurmentType: {
+          name: 'studyAssayOtherMeasurmentType',
+          displayName: 'Other Measurement Type',
+          title: 'Other Measurement Type',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'If Other was selected in Measurement Type, list any other measurement types that were used. Terms from NCBO Bioportal are recommended.',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 7,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        studyAssayTechnologyType: {
+          name: 'studyAssayTechnologyType',
+          displayName: 'Technology Type',
+          title: 'Technology Type',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'A term to identify the technology used to perform the measurement (e.g. DNA microarray; mass spectrometry).',
+          multiple: true,
+          isControlledVocabulary: true,
+          controlledVocabularyValues: [
+            'culture based drug susceptibility testing, single concentration',
+            'culture based drug susceptibility testing, two concentrations',
+            'culture based drug susceptibility testing, three or more concentrations (minimium inhibitory concentration measurement)',
+            'DNA microarray',
+            'flow cytometry',
+            'gel electrophoresis',
+            'mass spectrometry',
+            'NMR spectroscopy',
+            'nucleotide sequencing',
+            'protein microarray',
+            'real time PCR',
+            'no technology required',
+            'Other'
+          ],
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 8,
+          typeClass: 'controlledVocabulary',
+          displayOnCreate: false
+        },
+        studyAssayOtherTechnologyType: {
+          name: 'studyAssayOtherTechnologyType',
+          displayName: 'Other Technology Type',
+          title: 'Other Technology Type',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'If Other was selected in Technology Type, list any other technology types that were used in this Dataset.',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 9,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        studyAssayPlatform: {
+          name: 'studyAssayPlatform',
+          displayName: 'Technology Platform',
+          title: 'Technology Platform',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'The manufacturer and name of the technology platform used in the assay (e.g. Bruker AVANCE).',
+          multiple: true,
+          isControlledVocabulary: true,
+          controlledVocabularyValues: [
+            '210-MS GC Ion Trap (Varian)',
+            '220-MS GC Ion Trap (Varian)',
+            '225-MS GC Ion Trap (Varian)',
+            '240-MS GC Ion Trap (Varian)',
+            '300-MS quadrupole GC/MS (Varian)',
+            '320-MS LC/MS (Varian)',
+            '325-MS LC/MS (Varian)',
+            '320-MS GC/MS (Varian)',
+            '500-MS LC/MS (Varian)',
+            '800D (Jeol)',
+            '910-MS TQ-FT (Varian)',
+            '920-MS TQ-FT (Varian)',
+            '3100 Mass Detector (Waters)',
+            '6110 Quadrupole LC/MS (Agilent)',
+            '6120 Quadrupole LC/MS (Agilent)',
+            '6130 Quadrupole LC/MS (Agilent)',
+            '6140 Quadrupole LC/MS (Agilent)',
+            '6310 Ion Trap LC/MS (Agilent)',
+            '6320 Ion Trap LC/MS (Agilent)',
+            '6330 Ion Trap LC/MS (Agilent)',
+            '6340 Ion Trap LC/MS (Agilent)',
+            '6410 Triple Quadrupole LC/MS (Agilent)',
+            '6430 Triple Quadrupole LC/MS (Agilent)',
+            '6460 Triple Quadrupole LC/MS (Agilent)',
+            '6490 Triple Quadrupole LC/MS (Agilent)',
+            '6530 Q-TOF LC/MS (Agilent)',
+            '6540 Q-TOF LC/MS (Agilent)',
+            '6210 TOF LC/MS (Agilent)',
+            '6220 TOF LC/MS (Agilent)',
+            '6230 TOF LC/MS (Agilent)',
+            '7000B Triple Quadrupole GC/MS (Agilent)',
+            'AccuTO DART (Jeol)',
+            'AccuTOF GC (Jeol)',
+            'AccuTOF LC (Jeol)',
+            'ACQUITY SQD (Waters)',
+            'ACQUITY TQD (Waters)',
+            'Agilent',
+            'Agilent 5975E GC/MSD (Agilent)',
+            'Agilent 5975T LTM GC/MSD (Agilent)',
+            '5975C Series GC/MSD (Agilent)',
+            'Affymetrix',
+            'amaZon ETD ESI Ion Trap (Bruker)',
+            'amaZon X ESI Ion Trap (Bruker)',
+            'apex-ultra hybrid Qq-FTMS (Bruker)',
+            'API 2000 (AB Sciex)',
+            'API 3200 (AB Sciex)',
+            'API 3200 QTRAP (AB Sciex)',
+            'API 4000 (AB Sciex)',
+            'API 4000 QTRAP (AB Sciex)',
+            'API 5000 (AB Sciex)',
+            'API 5500 (AB Sciex)',
+            'API 5500 QTRAP (AB Sciex)',
+            'Applied Biosystems Group (ABI)',
+            'AQI Biosciences',
+            'Atmospheric Pressure GC (Waters)',
+            'autoflex III MALDI-TOF MS (Bruker)',
+            'autoflex speed(Bruker)',
+            'AutoSpec Premier (Waters)',
+            'AXIMA Mega TOF (Shimadzu)',
+            'AXIMA Performance MALDI TOF/TOF (Shimadzu)',
+            'A-10 Analyzer (Apogee)',
+            'A-40-MiniFCM (Apogee)',
+            'Bactiflow (Chemunex SA)',
+            'Base4innovation',
+            'BD BACTEC MGIT 320',
+            'BD BACTEC MGIT 960',
+            'BD Radiometric BACTEC 460TB',
+            'BioNanomatrix',
+            'Cell Lab Quanta SC (Becman Coulter)',
+            'Clarus 560 D GC/MS (PerkinElmer)',
+            'Clarus 560 S GC/MS (PerkinElmer)',
+            'Clarus 600 GC/MS (PerkinElmer)',
+            'Complete Genomics',
+            'Cyan (Dako Cytomation)',
+            'CyFlow ML (Partec)',
+            'Cyow SL (Partec)',
+            'CyFlow SL3 (Partec)',
+            'CytoBuoy (Cyto Buoy Inc)',
+            'CytoSence (Cyto Buoy Inc)',
+            'CytoSub (Cyto Buoy Inc)',
+            'Danaher',
+            'DFS (Thermo Scientific)',
+            'Exactive(Thermo Scientific)',
+            'FACS Canto (Becton Dickinson)',
+            'FACS Canto2 (Becton Dickinson)',
+            'FACS Scan (Becton Dickinson)',
+            'FC 500 (Becman Coulter)',
+            'GCmate II GC/MS (Jeol)',
+            'GCMS-QP2010 Plus (Shimadzu)',
+            'GCMS-QP2010S Plus (Shimadzu)',
+            'GCT Premier (Waters)',
+            'GENEQ',
+            'Genome Corp.',
+            'GenoVoxx',
+            'GnuBio',
+            'Guava EasyCyte Mini (Millipore)',
+            'Guava EasyCyte Plus (Millipore)',
+            'Guava Personal Cell Analysis (Millipore)',
+            'Guava Personal Cell Analysis-96 (Millipore)',
+            'Helicos BioSciences',
+            'Illumina',
+            'Indirect proportion method on LJ medium',
+            'Indirect proportion method on Middlebrook Agar 7H9',
+            'Indirect proportion method on Middlebrook Agar 7H10',
+            'Indirect proportion method on Middlebrook Agar 7H11',
+            'inFlux Analyzer (Cytopeia)',
+            'Intelligent Bio-Systems',
+            'ITQ 700 (Thermo Scientific)',
+            'ITQ 900 (Thermo Scientific)',
+            'ITQ 1100 (Thermo Scientific)',
+            'JMS-53000 SpiralTOF (Jeol)',
+            'LaserGen',
+            'LCMS-2020 (Shimadzu)',
+            'LCMS-2010EV (Shimadzu)',
+            'LCMS-IT-TOF (Shimadzu)',
+            'Li-Cor',
+            'Life Tech',
+            'LightSpeed Genomics',
+            'LCT Premier XE (Waters)',
+            'LCQ Deca XP MAX (Thermo Scientific)',
+            'LCQ Fleet (Thermo Scientific)',
+            'LXQ (Thermo Scientific)',
+            'LTQ Classic (Thermo Scientific)',
+            'LTQ XL (Thermo Scientific)',
+            'LTQ Velos (Thermo Scientific)',
+            'LTQ Orbitrap Classic (Thermo Scientific)',
+            'LTQ Orbitrap XL (Thermo Scientific)',
+            'LTQ Orbitrap Discovery (Thermo Scientific)',
+            'LTQ Orbitrap Velos (Thermo Scientific)',
+            'Luminex 100 (Luminex)',
+            'Luminex 200 (Luminex)',
+            'MACS Quant (Miltenyi)',
+            'MALDI SYNAPT G2 HDMS (Waters)',
+            'MALDI SYNAPT G2 MS (Waters)',
+            'MALDI SYNAPT HDMS (Waters)',
+            'MALDI SYNAPT MS (Waters)',
+            'MALDI micro MX (Waters)',
+            'maXis (Bruker)',
+            'maXis G4 (Bruker)',
+            'microflex LT MALDI-TOF MS (Bruker)',
+            'microflex LRF MALDI-TOF MS (Bruker)',
+            'microflex III MALDI-TOF MS (Bruker)',
+            'micrOTOF II ESI TOF (Bruker)',
+            'micrOTOF-Q II ESI-Qq-TOF (Bruker)',
+            'microplate Alamar Blue (resazurin) colorimetric method',
+            'Mstation (Jeol)',
+            'MSQ Plus (Thermo Scientific)',
+            'NABsys',
+            'Nanophotonics Biosciences',
+            'Network Biosystems',
+            'Nimblegen',
+            'Oxford Nanopore Technologies',
+            'Pacific Biosciences',
+            'Population Genetics Technologies',
+            'Q1000GC UltraQuad (Jeol)',
+            'Quattro micro API (Waters)',
+            'Quattro micro GC (Waters)',
+            'Quattro Premier XE (Waters)',
+            'QSTAR (AB Sciex)',
+            'Reveo',
+            'Roche',
+            'Seirad',
+            'solariX hybrid Qq-FTMS (Bruker)',
+            'Somacount (Bently Instruments)',
+            'SomaScope (Bently Instruments)',
+            'SYNAPT G2 HDMS (Waters)',
+            'SYNAPT G2 MS (Waters)',
+            'SYNAPT HDMS (Waters)',
+            'SYNAPT MS (Waters)',
+            'TripleTOF 5600 (AB Sciex)',
+            'TSQ Quantum Ultra (Thermo Scientific)',
+            'TSQ Quantum Access (Thermo Scientific)',
+            'TSQ Quantum Access MAX (Thermo Scientific)',
+            'TSQ Quantum Discovery MAX (Thermo Scientific)',
+            'TSQ Quantum GC (Thermo Scientific)',
+            'TSQ Quantum XLS (Thermo Scientific)',
+            'TSQ Vantage (Thermo Scientific)',
+            'ultrafleXtreme MALDI-TOF MS (Bruker)',
+            'VisiGen Biotechnologies',
+            'Xevo G2 QTOF (Waters)',
+            'Xevo QTof MS (Waters)',
+            'Xevo TQ MS (Waters)',
+            'Xevo TQ-S (Waters)',
+            'Other'
+          ],
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 10,
+          typeClass: 'controlledVocabulary',
+          displayOnCreate: false
+        },
+        studyAssayOtherPlatform: {
+          name: 'studyAssayOtherPlatform',
+          displayName: 'Other Technology Platform',
+          title: 'Other Technology Platform',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'If Other was selected in Technology Platform, list any other technology platforms that were used in this Dataset.',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 11,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        studyAssayCellType: {
+          name: 'studyAssayCellType',
+          displayName: 'Cell Type',
+          title: 'Cell Type',
+          type: 'TEXT',
+          watermark: '',
+          description: 'The name of the cell line from which the source or sample derives.',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 12,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        }
+      }
+    }
+  }
+}
diff --git a/tests/component/metadata-block-info/domain/models/CitationMetadataBlockInfoMother.ts b/tests/component/metadata-block-info/domain/models/CitationMetadataBlockInfoMother.ts
new file mode 100644
index 000000000..ca16f7369
--- /dev/null
+++ b/tests/component/metadata-block-info/domain/models/CitationMetadataBlockInfoMother.ts
@@ -0,0 +1,1522 @@
+import { MetadataBlockInfo } from '../../../../../src/metadata-block-info/domain/models/MetadataBlockInfo'
+
+export class CitationMetadataBlockInfoMother {
+  static get(): MetadataBlockInfo {
+    return {
+      id: 1,
+      name: 'citation',
+      displayName: 'Citation Metadata',
+      displayOnCreate: true,
+      metadataFields: {
+        title: {
+          name: 'title',
+          displayName: 'Title',
+          title: 'Title',
+          type: 'TEXT',
+          watermark: '',
+          description: 'The main title of the Dataset',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: true,
+          displayOrder: 0,
+          typeClass: 'primitive',
+          displayOnCreate: true
+        },
+        subtitle: {
+          name: 'subtitle',
+          displayName: 'Subtitle',
+          title: 'Subtitle',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'A secondary title that amplifies or states certain limitations on the main title',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 1,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        alternativeTitle: {
+          name: 'alternativeTitle',
+          displayName: 'Alternative Title',
+          title: 'Alternative Title',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'Either 1) a title commonly used to refer to the Dataset or 2) an abbreviation of the main title',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 2,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        alternativeURL: {
+          name: 'alternativeURL',
+          displayName: 'Alternative URL',
+          title: 'Alternative URL',
+          type: 'URL',
+          watermark: 'https://',
+          description:
+            'Another URL where one can view or access the data in the Dataset, e.g. a project or personal webpage',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '<a href="#VALUE" target="_blank">#VALUE</a>',
+          isRequired: false,
+          displayOrder: 3,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        otherId: {
+          name: 'otherId',
+          displayName: 'Other Identifier',
+          title: 'Other Identifier',
+          type: 'NONE',
+          watermark: '',
+          description:
+            "Another unique identifier for the Dataset (e.g. producer's or another repository's identifier)",
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: ':',
+          isRequired: false,
+          displayOrder: 4,
+          typeClass: 'compound',
+          displayOnCreate: false,
+          childMetadataFields: {
+            otherIdAgency: {
+              name: 'otherIdAgency',
+              displayName: 'Other Identifier Agency',
+              title: 'Agency',
+              type: 'TEXT',
+              watermark: '',
+              description: 'The name of the agency that generated the other identifier',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '#VALUE',
+              isRequired: false,
+              displayOrder: 5,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            otherIdValue: {
+              name: 'otherIdValue',
+              displayName: 'Other Identifier Identifier',
+              title: 'Identifier',
+              type: 'TEXT',
+              watermark: '',
+              description: 'Another identifier uniquely identifies the Dataset',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '#VALUE',
+              isRequired: false,
+              displayOrder: 6,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            }
+          }
+        },
+        author: {
+          name: 'author',
+          displayName: 'Author',
+          title: 'Author',
+          type: 'NONE',
+          watermark: '',
+          description: 'The entity, e.g. a person or organization, that created the Dataset',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: true,
+          displayOrder: 7,
+          typeClass: 'compound',
+          displayOnCreate: true,
+          childMetadataFields: {
+            authorName: {
+              name: 'authorName',
+              displayName: 'Author Name',
+              title: 'Name',
+              type: 'TEXT',
+              watermark: '1) Family Name, Given Name or 2) Organization XYZ',
+              description:
+                "The name of the author, such as the person's name or the name of an organization",
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '#VALUE',
+              isRequired: true,
+              displayOrder: 8,
+              typeClass: 'primitive',
+              displayOnCreate: true
+            },
+            authorAffiliation: {
+              name: 'authorAffiliation',
+              displayName: 'Author Affiliation',
+              title: 'Affiliation',
+              type: 'TEXT',
+              watermark: 'Organization XYZ',
+              description:
+                "The name of the entity affiliated with the author, e.g. an organization's name",
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '(#VALUE)',
+              isRequired: false,
+              displayOrder: 9,
+              typeClass: 'primitive',
+              displayOnCreate: true
+            },
+            authorIdentifierScheme: {
+              name: 'authorIdentifierScheme',
+              displayName: 'Author Identifier Type',
+              title: 'Identifier Type',
+              type: 'TEXT',
+              watermark: '',
+              description:
+                'The type of identifier that uniquely identifies the author (e.g. ORCID, ISNI)',
+              multiple: false,
+              isControlledVocabulary: true,
+              controlledVocabularyValues: [
+                'ORCID',
+                'ISNI',
+                'LCNA',
+                'VIAF',
+                'GND',
+                'DAI',
+                'ResearcherID',
+                'ScopusID'
+              ],
+              displayFormat: '- #VALUE:',
+              isRequired: false,
+              displayOrder: 10,
+              typeClass: 'controlledVocabulary',
+              displayOnCreate: true
+            },
+            authorIdentifier: {
+              name: 'authorIdentifier',
+              displayName: 'Author Identifier',
+              title: 'Identifier',
+              type: 'TEXT',
+              watermark: '',
+              description: 'Uniquely identifies the author when paired with an identifier type',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '#VALUE',
+              isRequired: false,
+              displayOrder: 11,
+              typeClass: 'primitive',
+              displayOnCreate: true
+            }
+          }
+        },
+        datasetContact: {
+          name: 'datasetContact',
+          displayName: 'Point of Contact',
+          title: 'Point of Contact',
+          type: 'NONE',
+          watermark: '',
+          description:
+            'The entity, e.g. a person or organization, that users of the Dataset can contact with questions',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: true,
+          displayOrder: 12,
+          typeClass: 'compound',
+          displayOnCreate: true,
+          childMetadataFields: {
+            datasetContactName: {
+              name: 'datasetContactName',
+              displayName: 'Point of Contact Name',
+              title: 'Name',
+              type: 'TEXT',
+              watermark: '1) FamilyName, GivenName or 2) Organization',
+              description:
+                "The name of the point of contact, e.g. the person's name or the name of an organization",
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '#VALUE',
+              isRequired: false,
+              displayOrder: 13,
+              typeClass: 'primitive',
+              displayOnCreate: true
+            },
+            datasetContactAffiliation: {
+              name: 'datasetContactAffiliation',
+              displayName: 'Point of Contact Affiliation',
+              title: 'Affiliation',
+              type: 'TEXT',
+              watermark: 'Organization XYZ',
+              description:
+                "The name of the entity affiliated with the point of contact, e.g. an organization's name",
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '(#VALUE)',
+              isRequired: false,
+              displayOrder: 14,
+              typeClass: 'primitive',
+              displayOnCreate: true
+            },
+            datasetContactEmail: {
+              name: 'datasetContactEmail',
+              displayName: 'Point of Contact E-mail',
+              title: 'E-mail',
+              type: 'EMAIL',
+              watermark: 'name@email.xyz',
+              description: "The point of contact's email address",
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '#EMAIL',
+              isRequired: true,
+              displayOrder: 15,
+              typeClass: 'primitive',
+              displayOnCreate: true
+            }
+          }
+        },
+        dsDescription: {
+          name: 'dsDescription',
+          displayName: 'Description',
+          title: 'Description',
+          type: 'NONE',
+          watermark: '',
+          description: 'A summary describing the purpose, nature, and scope of the Dataset',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: true,
+          displayOrder: 16,
+          typeClass: 'compound',
+          displayOnCreate: true,
+          childMetadataFields: {
+            dsDescriptionValue: {
+              name: 'dsDescriptionValue',
+              displayName: 'Description Text',
+              title: 'Text',
+              type: 'TEXTBOX',
+              watermark: '',
+              description: 'A summary describing the purpose, nature, and scope of the Dataset',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '#VALUE',
+              isRequired: true,
+              displayOrder: 17,
+              typeClass: 'primitive',
+              displayOnCreate: true
+            },
+            dsDescriptionDate: {
+              name: 'dsDescriptionDate',
+              displayName: 'Description Date',
+              title: 'Date',
+              type: 'DATE',
+              watermark: 'YYYY-MM-DD',
+              description:
+                'The date when the description was added to the Dataset. If the Dataset contains more than one description, e.g. the data producer supplied one description and the data repository supplied another, this date is used to distinguish between the descriptions',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '(#VALUE)',
+              isRequired: false,
+              displayOrder: 18,
+              typeClass: 'primitive',
+              displayOnCreate: true
+            }
+          }
+        },
+        subject: {
+          name: 'subject',
+          displayName: 'Subject',
+          title: 'Subject',
+          type: 'TEXT',
+          watermark: '',
+          description: 'The area of study relevant to the Dataset',
+          multiple: true,
+          isControlledVocabulary: true,
+          controlledVocabularyValues: [
+            'Agricultural Sciences',
+            'Arts and Humanities',
+            'Astronomy and Astrophysics',
+            'Business and Management',
+            'Chemistry',
+            'Computer and Information Science',
+            'Earth and Environmental Sciences',
+            'Engineering',
+            'Law',
+            'Mathematical Sciences',
+            'Medicine, Health and Life Sciences',
+            'Physics',
+            'Social Sciences',
+            'Other'
+          ],
+          displayFormat: '',
+          isRequired: true,
+          displayOrder: 19,
+          typeClass: 'controlledVocabulary',
+          displayOnCreate: true
+        },
+        keyword: {
+          name: 'keyword',
+          displayName: 'Keyword',
+          title: 'Keyword',
+          type: 'NONE',
+          watermark: '',
+          description:
+            'A key term that describes an important aspect of the Dataset and information about any controlled vocabulary used',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 20,
+          typeClass: 'compound',
+          displayOnCreate: true,
+          childMetadataFields: {
+            keywordValue: {
+              name: 'keywordValue',
+              displayName: 'Keyword Term',
+              title: 'Term',
+              type: 'TEXT',
+              watermark: '',
+              description: 'A key term that describes important aspects of the Dataset',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '#VALUE',
+              isRequired: false,
+              displayOrder: 21,
+              typeClass: 'primitive',
+              displayOnCreate: true
+            },
+            keywordTermURI: {
+              name: 'keywordTermURI',
+              displayName: 'Keyword Term URI',
+              title: 'Term URI',
+              type: 'URL',
+              watermark: 'https://',
+              description: 'A URI that points to the web presence of the Keyword Term',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '<a href="#VALUE" target="_blank" rel="noopener">#VALUE</a>',
+              isRequired: false,
+              displayOrder: 22,
+              typeClass: 'primitive',
+              displayOnCreate: true
+            },
+            keywordVocabulary: {
+              name: 'keywordVocabulary',
+              displayName: 'Keyword Controlled Vocabulary Name',
+              title: 'Controlled Vocabulary Name',
+              type: 'TEXT',
+              watermark: '',
+              description: 'The controlled vocabulary used for the keyword term (e.g. LCSH, MeSH)',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '(#VALUE)',
+              isRequired: false,
+              displayOrder: 23,
+              typeClass: 'primitive',
+              displayOnCreate: true
+            },
+            keywordVocabularyURI: {
+              name: 'keywordVocabularyURI',
+              displayName: 'Keyword Controlled Vocabulary URL',
+              title: 'Controlled Vocabulary URL',
+              type: 'URL',
+              watermark: 'https://',
+              description:
+                "The URL where one can access information about the term's controlled vocabulary",
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '<a href="#VALUE" target="_blank" rel="noopener">#VALUE</a>',
+              isRequired: false,
+              displayOrder: 24,
+              typeClass: 'primitive',
+              displayOnCreate: true
+            }
+          }
+        },
+        topicClassification: {
+          name: 'topicClassification',
+          displayName: 'Topic Classification',
+          title: 'Topic Classification',
+          type: 'NONE',
+          watermark: '',
+          description:
+            'Indicates a broad, important topic or subject that the Dataset covers and information about any controlled vocabulary used',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 25,
+          typeClass: 'compound',
+          displayOnCreate: false,
+          childMetadataFields: {
+            topicClassValue: {
+              name: 'topicClassValue',
+              displayName: 'Topic Classification Term',
+              title: 'Term',
+              type: 'TEXT',
+              watermark: '',
+              description: 'A topic or subject term',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '#VALUE',
+              isRequired: false,
+              displayOrder: 26,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            topicClassVocab: {
+              name: 'topicClassVocab',
+              displayName: 'Topic Classification Controlled Vocabulary Name',
+              title: 'Controlled Vocabulary Name',
+              type: 'TEXT',
+              watermark: '',
+              description: 'The controlled vocabulary used for the keyword term (e.g. LCSH, MeSH)',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '(#VALUE)',
+              isRequired: false,
+              displayOrder: 27,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            topicClassVocabURI: {
+              name: 'topicClassVocabURI',
+              displayName: 'Topic Classification Controlled Vocabulary URL',
+              title: 'Controlled Vocabulary URL',
+              type: 'URL',
+              watermark: 'https://',
+              description:
+                "The URL where one can access information about the term's controlled vocabulary",
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '<a href="#VALUE" target="_blank" rel="noopener">#VALUE</a>',
+              isRequired: false,
+              displayOrder: 28,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            }
+          }
+        },
+        publication: {
+          name: 'publication',
+          displayName: 'Related Publication',
+          title: 'Related Publication',
+          type: 'NONE',
+          watermark: '',
+          description:
+            'The article or report that uses the data in the Dataset. The full list of related publications will be displayed on the metadata tab',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 29,
+          typeClass: 'compound',
+          displayOnCreate: true,
+          childMetadataFields: {
+            publicationCitation: {
+              name: 'publicationCitation',
+              displayName: 'Related Publication Citation',
+              title: 'Citation',
+              type: 'TEXTBOX',
+              watermark: '',
+              description: 'The full bibliographic citation for the related publication',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '#VALUE',
+              isRequired: false,
+              displayOrder: 30,
+              typeClass: 'primitive',
+              displayOnCreate: true
+            },
+            publicationIDType: {
+              name: 'publicationIDType',
+              displayName: 'Related Publication Identifier Type',
+              title: 'Identifier Type',
+              type: 'TEXT',
+              watermark: '',
+              description: 'The type of identifier that uniquely identifies a related publication',
+              multiple: false,
+              isControlledVocabulary: true,
+              controlledVocabularyValues: [
+                'ark',
+                'arXiv',
+                'bibcode',
+                'cstr',
+                'doi',
+                'ean13',
+                'eissn',
+                'handle',
+                'isbn',
+                'issn',
+                'istc',
+                'lissn',
+                'lsid',
+                'pmid',
+                'purl',
+                'upc',
+                'url',
+                'urn',
+                'DASH-NRS'
+              ],
+              displayFormat: '#VALUE: ',
+              isRequired: false,
+              displayOrder: 31,
+              typeClass: 'controlledVocabulary',
+              displayOnCreate: true
+            },
+            publicationIDNumber: {
+              name: 'publicationIDNumber',
+              displayName: 'Related Publication Identifier',
+              title: 'Identifier',
+              type: 'TEXT',
+              watermark: '',
+              description: 'The identifier for a related publication',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '#VALUE',
+              isRequired: false,
+              displayOrder: 32,
+              typeClass: 'primitive',
+              displayOnCreate: true
+            },
+            publicationURL: {
+              name: 'publicationURL',
+              displayName: 'Related Publication URL',
+              title: 'URL',
+              type: 'URL',
+              watermark: 'https://',
+              description:
+                'The URL form of the identifier entered in the Identifier field, e.g. the DOI URL if a DOI was entered in the Identifier field. Used to display what was entered in the ID Type and ID Number fields as a link. If what was entered in the Identifier field has no URL form, the URL of the publication webpage is used, e.g. a journal article webpage',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '<a href="#VALUE" target="_blank" rel="noopener">#VALUE</a>',
+              isRequired: false,
+              displayOrder: 33,
+              typeClass: 'primitive',
+              displayOnCreate: true
+            }
+          }
+        },
+        notesText: {
+          name: 'notesText',
+          displayName: 'Notes',
+          title: 'Notes',
+          type: 'TEXTBOX',
+          watermark: '',
+          description: 'Additional information about the Dataset',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 34,
+          typeClass: 'primitive',
+          displayOnCreate: true
+        },
+        language: {
+          name: 'language',
+          displayName: 'Language',
+          title: 'Language',
+          type: 'TEXT',
+          watermark: '',
+          description: "A language that the Dataset's files is written in",
+          multiple: true,
+          isControlledVocabulary: true,
+          controlledVocabularyValues: [
+            'Abkhaz',
+            'Afar',
+            'Afrikaans',
+            'Akan',
+            'Albanian',
+            'Amharic',
+            'Arabic',
+            'Aragonese',
+            'Armenian',
+            'Assamese',
+            'Avaric',
+            'Avestan',
+            'Aymara',
+            'Azerbaijani',
+            'Bambara',
+            'Bashkir',
+            'Basque',
+            'Belarusian',
+            'Bengali, Bangla',
+            'Bihari',
+            'Bislama',
+            'Bosnian',
+            'Breton',
+            'Bulgarian',
+            'Burmese',
+            'Catalan,Valencian',
+            'Chamorro',
+            'Chechen',
+            'Chichewa, Chewa, Nyanja',
+            'Chinese',
+            'Chuvash',
+            'Cornish',
+            'Corsican',
+            'Cree',
+            'Croatian',
+            'Czech',
+            'Danish',
+            'Divehi, Dhivehi, Maldivian',
+            'Dutch',
+            'Dzongkha',
+            'English',
+            'Esperanto',
+            'Estonian',
+            'Ewe',
+            'Faroese',
+            'Fijian',
+            'Finnish',
+            'French',
+            'Fula, Fulah, Pulaar, Pular',
+            'Galician',
+            'Georgian',
+            'German',
+            'Greek (modern)',
+            'Guaraní',
+            'Gujarati',
+            'Haitian, Haitian Creole',
+            'Hausa',
+            'Hebrew (modern)',
+            'Herero',
+            'Hindi',
+            'Hiri Motu',
+            'Hungarian',
+            'Interlingua',
+            'Indonesian',
+            'Interlingue',
+            'Irish',
+            'Igbo',
+            'Inupiaq',
+            'Ido',
+            'Icelandic',
+            'Italian',
+            'Inuktitut',
+            'Japanese',
+            'Javanese',
+            'Kalaallisut, Greenlandic',
+            'Kannada',
+            'Kanuri',
+            'Kashmiri',
+            'Kazakh',
+            'Khmer',
+            'Kikuyu, Gikuyu',
+            'Kinyarwanda',
+            'Kyrgyz',
+            'Komi',
+            'Kongo',
+            'Korean',
+            'Kurdish',
+            'Kwanyama, Kuanyama',
+            'Latin',
+            'Luxembourgish, Letzeburgesch',
+            'Ganda',
+            'Limburgish, Limburgan, Limburger',
+            'Lingala',
+            'Lao',
+            'Lithuanian',
+            'Luba-Katanga',
+            'Latvian',
+            'Manx',
+            'Macedonian',
+            'Malagasy',
+            'Malay',
+            'Malayalam',
+            'Maltese',
+            'Māori',
+            'Marathi (Marāṭhī)',
+            'Marshallese',
+            'Mixtepec Mixtec',
+            'Mongolian',
+            'Nauru',
+            'Navajo, Navaho',
+            'Northern Ndebele',
+            'Nepali',
+            'Ndonga',
+            'Norwegian Bokmål',
+            'Norwegian Nynorsk',
+            'Norwegian',
+            'Nuosu',
+            'Southern Ndebele',
+            'Occitan',
+            'Ojibwe, Ojibwa',
+            'Old Church Slavonic,Church Slavonic,Old Bulgarian',
+            'Oromo',
+            'Oriya',
+            'Ossetian, Ossetic',
+            'Panjabi, Punjabi',
+            'Pāli',
+            'Persian (Farsi)',
+            'Polish',
+            'Pashto, Pushto',
+            'Portuguese',
+            'Quechua',
+            'Romansh',
+            'Kirundi',
+            'Romanian',
+            'Russian',
+            'Sanskrit (Saṁskṛta)',
+            'Sardinian',
+            'Sindhi',
+            'Northern Sami',
+            'Samoan',
+            'Sango',
+            'Serbian',
+            'Scottish Gaelic, Gaelic',
+            'Shona',
+            'Sinhala, Sinhalese',
+            'Slovak',
+            'Slovene',
+            'Somali',
+            'Southern Sotho',
+            'Spanish, Castilian',
+            'Sundanese',
+            'Swahili',
+            'Swati',
+            'Swedish',
+            'Tamil',
+            'Telugu',
+            'Tajik',
+            'Thai',
+            'Tigrinya',
+            'Tibetan Standard, Tibetan, Central',
+            'Turkmen',
+            'Tagalog',
+            'Tswana',
+            'Tonga (Tonga Islands)',
+            'Turkish',
+            'Tsonga',
+            'Tatar',
+            'Twi',
+            'Tahitian',
+            'Uyghur, Uighur',
+            'Ukrainian',
+            'Urdu',
+            'Uzbek',
+            'Venda',
+            'Vietnamese',
+            'Volapük',
+            'Walloon',
+            'Welsh',
+            'Wolof',
+            'Western Frisian',
+            'Xhosa',
+            'Yiddish',
+            'Yoruba',
+            'Zhuang, Chuang',
+            'Zulu',
+            'Not applicable'
+          ],
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 35,
+          typeClass: 'controlledVocabulary',
+          displayOnCreate: false
+        },
+        producer: {
+          name: 'producer',
+          displayName: 'Producer',
+          title: 'Producer',
+          type: 'NONE',
+          watermark: '',
+          description:
+            'The entity, such a person or organization, managing the finances or other administrative processes involved in the creation of the Dataset',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 36,
+          typeClass: 'compound',
+          displayOnCreate: false,
+          childMetadataFields: {
+            producerName: {
+              name: 'producerName',
+              displayName: 'Producer Name',
+              title: 'Name',
+              type: 'TEXT',
+              watermark: '1) FamilyName, GivenName or 2) Organization',
+              description:
+                "The name of the entity, e.g. the person's name or the name of an organization",
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '#VALUE',
+              isRequired: true,
+              displayOrder: 37,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            producerAffiliation: {
+              name: 'producerAffiliation',
+              displayName: 'Producer Affiliation',
+              title: 'Affiliation',
+              type: 'TEXT',
+              watermark: 'Organization XYZ',
+              description:
+                "The name of the entity affiliated with the producer, e.g. an organization's name",
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '(#VALUE)',
+              isRequired: false,
+              displayOrder: 38,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            producerAbbreviation: {
+              name: 'producerAbbreviation',
+              displayName: 'Producer Abbreviated Name',
+              title: 'Abbreviated Name',
+              type: 'TEXT',
+              watermark: '',
+              description: "The producer's abbreviated name (e.g. IQSS, ICPSR)",
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '(#VALUE)',
+              isRequired: false,
+              displayOrder: 39,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            producerURL: {
+              name: 'producerURL',
+              displayName: 'Producer URL',
+              title: 'URL',
+              type: 'URL',
+              watermark: 'https://',
+              description: "The URL of the producer's website",
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '<a href="#VALUE" target="_blank" rel="noopener">#VALUE</a>',
+              isRequired: false,
+              displayOrder: 40,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            producerLogoURL: {
+              name: 'producerLogoURL',
+              displayName: 'Producer Logo URL',
+              title: 'Logo URL',
+              type: 'URL',
+              watermark: 'https://',
+              description: "The URL of the producer's logo",
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '<img src="#VALUE" alt="#NAME" class="metadata-logo"/><br/>',
+              isRequired: false,
+              displayOrder: 41,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            }
+          }
+        },
+        productionDate: {
+          name: 'productionDate',
+          displayName: 'Production Date',
+          title: 'Production Date',
+          type: 'DATE',
+          watermark: 'YYYY-MM-DD',
+          description:
+            'The date when the data were produced (not distributed, published, or archived)',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 42,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        productionPlace: {
+          name: 'productionPlace',
+          displayName: 'Production Location',
+          title: 'Production Location',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'The location where the data and any related materials were produced or collected',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 43,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        contributor: {
+          name: 'contributor',
+          displayName: 'Contributor',
+          title: 'Contributor',
+          type: 'NONE',
+          watermark: '',
+          description:
+            'The entity, such as a person or organization, responsible for collecting, managing, or otherwise contributing to the development of the Dataset',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: ':',
+          isRequired: false,
+          displayOrder: 44,
+          typeClass: 'compound',
+          displayOnCreate: false,
+          childMetadataFields: {
+            contributorType: {
+              name: 'contributorType',
+              displayName: 'Contributor Type',
+              title: 'Type',
+              type: 'TEXT',
+              watermark: '',
+              description: 'Indicates the type of contribution made to the dataset',
+              multiple: false,
+              isControlledVocabulary: true,
+              controlledVocabularyValues: [
+                'Data Collector',
+                'Data Curator',
+                'Data Manager',
+                'Editor',
+                'Funder',
+                'Hosting Institution',
+                'Project Leader',
+                'Project Manager',
+                'Project Member',
+                'Related Person',
+                'Researcher',
+                'Research Group',
+                'Rights Holder',
+                'Sponsor',
+                'Supervisor',
+                'Work Package Leader',
+                'Other'
+              ],
+              displayFormat: '#VALUE ',
+              isRequired: false,
+              displayOrder: 45,
+              typeClass: 'controlledVocabulary',
+              displayOnCreate: false
+            },
+            contributorName: {
+              name: 'contributorName',
+              displayName: 'Contributor Name',
+              title: 'Name',
+              type: 'TEXT',
+              watermark: '1) FamilyName, GivenName or 2) Organization',
+              description:
+                "The name of the contributor, e.g. the person's name or the name of an organization",
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '#VALUE',
+              isRequired: false,
+              displayOrder: 46,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            }
+          }
+        },
+        grantNumber: {
+          name: 'grantNumber',
+          displayName: 'Funding Information',
+          title: 'Funding Information',
+          type: 'NONE',
+          watermark: '',
+          description: "Information about the Dataset's financial support",
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: ':',
+          isRequired: false,
+          displayOrder: 47,
+          typeClass: 'compound',
+          displayOnCreate: false,
+          childMetadataFields: {
+            grantNumberAgency: {
+              name: 'grantNumberAgency',
+              displayName: 'Funding Information Agency',
+              title: 'Agency',
+              type: 'TEXT',
+              watermark: 'Organization XYZ',
+              description: 'The agency that provided financial support for the Dataset',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '#VALUE',
+              isRequired: false,
+              displayOrder: 48,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            grantNumberValue: {
+              name: 'grantNumberValue',
+              displayName: 'Funding Information Identifier',
+              title: 'Identifier',
+              type: 'TEXT',
+              watermark: '',
+              description:
+                'The grant identifier or contract identifier of the agency that provided financial support for the Dataset',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '#VALUE',
+              isRequired: false,
+              displayOrder: 49,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            }
+          }
+        },
+        distributor: {
+          name: 'distributor',
+          displayName: 'Distributor',
+          title: 'Distributor',
+          type: 'NONE',
+          watermark: '',
+          description:
+            'The entity, such as a person or organization, designated to generate copies of the Dataset, including any editions or revisions',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 50,
+          typeClass: 'compound',
+          displayOnCreate: false,
+          childMetadataFields: {
+            distributorName: {
+              name: 'distributorName',
+              displayName: 'Distributor Name',
+              title: 'Name',
+              type: 'TEXT',
+              watermark: '1) FamilyName, GivenName or 2) Organization',
+              description:
+                "The name of the entity, e.g. the person's name or the name of an organization",
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '#VALUE',
+              isRequired: false,
+              displayOrder: 51,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            distributorAffiliation: {
+              name: 'distributorAffiliation',
+              displayName: 'Distributor Affiliation',
+              title: 'Affiliation',
+              type: 'TEXT',
+              watermark: 'Organization XYZ',
+              description:
+                "The name of the entity affiliated with the distributor, e.g. an organization's name",
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '(#VALUE)',
+              isRequired: false,
+              displayOrder: 52,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            distributorAbbreviation: {
+              name: 'distributorAbbreviation',
+              displayName: 'Distributor Abbreviated Name',
+              title: 'Abbreviated Name',
+              type: 'TEXT',
+              watermark: '',
+              description: "The distributor's abbreviated name (e.g. IQSS, ICPSR)",
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '(#VALUE)',
+              isRequired: false,
+              displayOrder: 53,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            distributorURL: {
+              name: 'distributorURL',
+              displayName: 'Distributor URL',
+              title: 'URL',
+              type: 'URL',
+              watermark: 'https://',
+              description: "The URL of the distributor's webpage",
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '<a href="#VALUE" target="_blank" rel="noopener">#VALUE</a>',
+              isRequired: false,
+              displayOrder: 54,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            distributorLogoURL: {
+              name: 'distributorLogoURL',
+              displayName: 'Distributor Logo URL',
+              title: 'Logo URL',
+              type: 'URL',
+              watermark: 'https://',
+              description:
+                "The URL of the distributor's logo image, used to show the image on the Dataset's page",
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '<img src="#VALUE" alt="#NAME" class="metadata-logo"/><br/>',
+              isRequired: false,
+              displayOrder: 55,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            }
+          }
+        },
+        distributionDate: {
+          name: 'distributionDate',
+          displayName: 'Distribution Date',
+          title: 'Distribution Date',
+          type: 'DATE',
+          watermark: 'YYYY-MM-DD',
+          description: 'The date when the Dataset was made available for distribution/presentation',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 56,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        depositor: {
+          name: 'depositor',
+          displayName: 'Depositor',
+          title: 'Depositor',
+          type: 'TEXT',
+          watermark: '1) FamilyName, GivenName or 2) Organization',
+          description:
+            'The entity, such as a person or organization, that deposited the Dataset in the repository',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 57,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        dateOfDeposit: {
+          name: 'dateOfDeposit',
+          displayName: 'Deposit Date',
+          title: 'Deposit Date',
+          type: 'DATE',
+          watermark: 'YYYY-MM-DD',
+          description: 'The date when the Dataset was deposited into the repository',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 58,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        timePeriodCovered: {
+          name: 'timePeriodCovered',
+          displayName: 'Time Period',
+          title: 'Time Period',
+          type: 'NONE',
+          watermark: '',
+          description:
+            'The time period that the data refer to. Also known as span. This is the time period covered by the data, not the dates of coding, collecting data, or making documents machine-readable',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: ';',
+          isRequired: false,
+          displayOrder: 59,
+          typeClass: 'compound',
+          displayOnCreate: false,
+          childMetadataFields: {
+            timePeriodCoveredStart: {
+              name: 'timePeriodCoveredStart',
+              displayName: 'Time Period Start Date',
+              title: 'Start Date',
+              type: 'DATE',
+              watermark: 'YYYY-MM-DD',
+              description: 'The start date of the time period that the data refer to',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '#NAME: #VALUE ',
+              isRequired: false,
+              displayOrder: 60,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            timePeriodCoveredEnd: {
+              name: 'timePeriodCoveredEnd',
+              displayName: 'Time Period End Date',
+              title: 'End Date',
+              type: 'DATE',
+              watermark: 'YYYY-MM-DD',
+              description: 'The end date of the time period that the data refer to',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '#NAME: #VALUE ',
+              isRequired: false,
+              displayOrder: 61,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            }
+          }
+        },
+        dateOfCollection: {
+          name: 'dateOfCollection',
+          displayName: 'Date of Collection',
+          title: 'Date of Collection',
+          type: 'NONE',
+          watermark: '',
+          description: 'The dates when the data were collected or generated',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: ';',
+          isRequired: false,
+          displayOrder: 62,
+          typeClass: 'compound',
+          displayOnCreate: false,
+          childMetadataFields: {
+            dateOfCollectionStart: {
+              name: 'dateOfCollectionStart',
+              displayName: 'Date of Collection Start Date',
+              title: 'Start Date',
+              type: 'DATE',
+              watermark: 'YYYY-MM-DD',
+              description: 'The date when the data collection started',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '#NAME: #VALUE ',
+              isRequired: false,
+              displayOrder: 63,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            dateOfCollectionEnd: {
+              name: 'dateOfCollectionEnd',
+              displayName: 'Date of Collection End Date',
+              title: 'End Date',
+              type: 'DATE',
+              watermark: 'YYYY-MM-DD',
+              description: 'The date when the data collection ended',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '#NAME: #VALUE ',
+              isRequired: false,
+              displayOrder: 64,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            }
+          }
+        },
+        kindOfData: {
+          name: 'kindOfData',
+          displayName: 'Data Type',
+          title: 'Data Type',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'The type of data included in the files (e.g. survey data, clinical data, or machine-readable text)',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 65,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        series: {
+          name: 'series',
+          displayName: 'Series',
+          title: 'Series',
+          type: 'NONE',
+          watermark: '',
+          description: 'Information about the dataset series to which the Dataset belong',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: ':',
+          isRequired: false,
+          displayOrder: 66,
+          typeClass: 'compound',
+          displayOnCreate: false,
+          childMetadataFields: {
+            seriesName: {
+              name: 'seriesName',
+              displayName: 'Series Name',
+              title: 'Name',
+              type: 'TEXT',
+              watermark: '',
+              description: 'The name of the dataset series',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '#VALUE',
+              isRequired: false,
+              displayOrder: 67,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            seriesInformation: {
+              name: 'seriesInformation',
+              displayName: 'Series Information',
+              title: 'Information',
+              type: 'TEXTBOX',
+              watermark: '',
+              description:
+                'Can include 1) a history of the series and 2) a summary of features that apply to the series',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '#VALUE',
+              isRequired: false,
+              displayOrder: 68,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            }
+          }
+        },
+        software: {
+          name: 'software',
+          displayName: 'Software',
+          title: 'Software',
+          type: 'NONE',
+          watermark: '',
+          description: 'Information about the software used to generate the Dataset',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: ',',
+          isRequired: false,
+          displayOrder: 69,
+          typeClass: 'compound',
+          displayOnCreate: false,
+          childMetadataFields: {
+            softwareName: {
+              name: 'softwareName',
+              displayName: 'Software Name',
+              title: 'Name',
+              type: 'TEXT',
+              watermark: '',
+              description: 'The name of software used to generate the Dataset',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '#VALUE',
+              isRequired: false,
+              displayOrder: 70,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            softwareVersion: {
+              name: 'softwareVersion',
+              displayName: 'Software Version',
+              title: 'Version',
+              type: 'TEXT',
+              watermark: '',
+              description: 'The version of the software used to generate the Dataset, e.g. 4.11',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '#NAME: #VALUE',
+              isRequired: false,
+              displayOrder: 71,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            }
+          }
+        },
+        relatedMaterial: {
+          name: 'relatedMaterial',
+          displayName: 'Related Material',
+          title: 'Related Material',
+          type: 'TEXTBOX',
+          watermark: '',
+          description:
+            'Information, such as a persistent ID or citation, about the material related to the Dataset, such as appendices or sampling information available outside of the Dataset',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 72,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        relatedDatasets: {
+          name: 'relatedDatasets',
+          displayName: 'Related Dataset',
+          title: 'Related Dataset',
+          type: 'TEXTBOX',
+          watermark: '',
+          description:
+            "Information, such as a persistent ID or citation, about a related dataset, such as previous research on the Dataset's subject",
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 73,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        otherReferences: {
+          name: 'otherReferences',
+          displayName: 'Other Reference',
+          title: 'Other Reference',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'Information, such as a persistent ID or citation, about another type of resource that provides background or supporting material to the Dataset',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 74,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        dataSources: {
+          name: 'dataSources',
+          displayName: 'Data Source',
+          title: 'Data Source',
+          type: 'TEXTBOX',
+          watermark: '',
+          description:
+            'Information, such as a persistent ID or citation, about sources of the Dataset (e.g. a book, article, serial, or machine-readable data file)',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 75,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        originOfSources: {
+          name: 'originOfSources',
+          displayName: 'Origin of Historical Sources',
+          title: 'Origin of Historical Sources',
+          type: 'TEXTBOX',
+          watermark: '',
+          description:
+            'For historical sources, the origin and any rules followed in establishing them as sources',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 76,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        characteristicOfSources: {
+          name: 'characteristicOfSources',
+          displayName: 'Characteristic of Sources',
+          title: 'Characteristic of Sources',
+          type: 'TEXTBOX',
+          watermark: '',
+          description: 'Characteristics not already noted elsewhere',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 77,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        accessToSources: {
+          name: 'accessToSources',
+          displayName: 'Documentation and Access to Sources',
+          title: 'Documentation and Access to Sources',
+          type: 'TEXTBOX',
+          watermark: '',
+          description:
+            '1) Methods or procedures for accessing data sources and 2) any special permissions needed for access',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 78,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        }
+      }
+    }
+  }
+}
diff --git a/tests/component/metadata-block-info/domain/models/GeospatialMetadataBlockInfoMother.ts b/tests/component/metadata-block-info/domain/models/GeospatialMetadataBlockInfoMother.ts
new file mode 100644
index 000000000..0ffaada44
--- /dev/null
+++ b/tests/component/metadata-block-info/domain/models/GeospatialMetadataBlockInfoMother.ts
@@ -0,0 +1,443 @@
+import { MetadataBlockInfo } from '../../../../../src/metadata-block-info/domain/models/MetadataBlockInfo'
+
+export class GeospatialMetadataBlockInfoMother {
+  static get(): MetadataBlockInfo {
+    return {
+      id: 2,
+      name: 'geospatial',
+      displayName: 'Geospatial Metadata',
+      displayOnCreate: false,
+      metadataFields: {
+        geographicCoverage: {
+          name: 'geographicCoverage',
+          displayName: 'Geographic Coverage',
+          title: 'Geographic Coverage',
+          type: 'NONE',
+          watermark: '',
+          description:
+            'Information on the geographic coverage of the data. Includes the total geographic scope of the data.',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 0,
+          typeClass: 'compound',
+          displayOnCreate: false,
+          childMetadataFields: {
+            country: {
+              name: 'country',
+              displayName: 'Geographic Coverage Country / Nation',
+              title: 'Country / Nation',
+              type: 'TEXT',
+              watermark: '',
+              description: 'The country or nation that the Dataset is about.',
+              multiple: false,
+              isControlledVocabulary: true,
+              controlledVocabularyValues: [
+                'Afghanistan',
+                'Albania',
+                'Algeria',
+                'American Samoa',
+                'Andorra',
+                'Angola',
+                'Anguilla',
+                'Antarctica',
+                'Antigua and Barbuda',
+                'Argentina',
+                'Armenia',
+                'Aruba',
+                'Australia',
+                'Austria',
+                'Azerbaijan',
+                'Bahamas',
+                'Bahrain',
+                'Bangladesh',
+                'Barbados',
+                'Belarus',
+                'Belgium',
+                'Belize',
+                'Benin',
+                'Bermuda',
+                'Bhutan',
+                'Bolivia, Plurinational State of',
+                'Bonaire, Sint Eustatius and Saba',
+                'Bosnia and Herzegovina',
+                'Botswana',
+                'Bouvet Island',
+                'Brazil',
+                'British Indian Ocean Territory',
+                'Brunei Darussalam',
+                'Bulgaria',
+                'Burkina Faso',
+                'Burundi',
+                'Cambodia',
+                'Cameroon',
+                'Canada',
+                'Cape Verde',
+                'Cayman Islands',
+                'Central African Republic',
+                'Chad',
+                'Chile',
+                'China',
+                'Christmas Island',
+                'Cocos (Keeling) Islands',
+                'Colombia',
+                'Comoros',
+                'Congo',
+                'Congo, the Democratic Republic of the',
+                'Cook Islands',
+                'Costa Rica',
+                'Croatia',
+                'Cuba',
+                'Curaçao',
+                'Cyprus',
+                'Czech Republic',
+                "Côte d'Ivoire",
+                'Denmark',
+                'Djibouti',
+                'Dominica',
+                'Dominican Republic',
+                'Ecuador',
+                'Egypt',
+                'El Salvador',
+                'Equatorial Guinea',
+                'Eritrea',
+                'Estonia',
+                'Ethiopia',
+                'Falkland Islands (Malvinas)',
+                'Faroe Islands',
+                'Fiji',
+                'Finland',
+                'France',
+                'French Guiana',
+                'French Polynesia',
+                'French Southern Territories',
+                'Gabon',
+                'Gambia',
+                'Georgia',
+                'Germany',
+                'Ghana',
+                'Gibraltar',
+                'Greece',
+                'Greenland',
+                'Grenada',
+                'Guadeloupe',
+                'Guam',
+                'Guatemala',
+                'Guernsey',
+                'Guinea',
+                'Guinea-Bissau',
+                'Guyana',
+                'Haiti',
+                'Heard Island and Mcdonald Islands',
+                'Holy See (Vatican City State)',
+                'Honduras',
+                'Hong Kong',
+                'Hungary',
+                'Iceland',
+                'India',
+                'Indonesia',
+                'Iran, Islamic Republic of',
+                'Iraq',
+                'Ireland',
+                'Isle of Man',
+                'Israel',
+                'Italy',
+                'Jamaica',
+                'Japan',
+                'Jersey',
+                'Jordan',
+                'Kazakhstan',
+                'Kenya',
+                'Kiribati',
+                "Korea, Democratic People's Republic of",
+                'Korea, Republic of',
+                'Kuwait',
+                'Kyrgyzstan',
+                "Lao People's Democratic Republic",
+                'Latvia',
+                'Lebanon',
+                'Lesotho',
+                'Liberia',
+                'Libya',
+                'Liechtenstein',
+                'Lithuania',
+                'Luxembourg',
+                'Macao',
+                'Macedonia, the Former Yugoslav Republic of',
+                'Madagascar',
+                'Malawi',
+                'Malaysia',
+                'Maldives',
+                'Mali',
+                'Malta',
+                'Marshall Islands',
+                'Martinique',
+                'Mauritania',
+                'Mauritius',
+                'Mayotte',
+                'Mexico',
+                'Micronesia, Federated States of',
+                'Moldova, Republic of',
+                'Monaco',
+                'Mongolia',
+                'Montenegro',
+                'Montserrat',
+                'Morocco',
+                'Mozambique',
+                'Myanmar',
+                'Namibia',
+                'Nauru',
+                'Nepal',
+                'Netherlands',
+                'New Caledonia',
+                'New Zealand',
+                'Nicaragua',
+                'Niger',
+                'Nigeria',
+                'Niue',
+                'Norfolk Island',
+                'Northern Mariana Islands',
+                'Norway',
+                'Oman',
+                'Pakistan',
+                'Palau',
+                'Palestine, State of',
+                'Panama',
+                'Papua New Guinea',
+                'Paraguay',
+                'Peru',
+                'Philippines',
+                'Pitcairn',
+                'Poland',
+                'Portugal',
+                'Puerto Rico',
+                'Qatar',
+                'Romania',
+                'Russian Federation',
+                'Rwanda',
+                'Réunion',
+                'Saint Barthélemy',
+                'Saint Helena, Ascension and Tristan da Cunha',
+                'Saint Kitts and Nevis',
+                'Saint Lucia',
+                'Saint Martin (French part)',
+                'Saint Pierre and Miquelon',
+                'Saint Vincent and the Grenadines',
+                'Samoa',
+                'San Marino',
+                'Sao Tome and Principe',
+                'Saudi Arabia',
+                'Senegal',
+                'Serbia',
+                'Seychelles',
+                'Sierra Leone',
+                'Singapore',
+                'Sint Maarten (Dutch part)',
+                'Slovakia',
+                'Slovenia',
+                'Solomon Islands',
+                'Somalia',
+                'South Africa',
+                'South Georgia and the South Sandwich Islands',
+                'South Sudan',
+                'Spain',
+                'Sri Lanka',
+                'Sudan',
+                'Suriname',
+                'Svalbard and Jan Mayen',
+                'Swaziland',
+                'Sweden',
+                'Switzerland',
+                'Syrian Arab Republic',
+                'Taiwan, Province of China',
+                'Tajikistan',
+                'Tanzania, United Republic of',
+                'Thailand',
+                'Timor-Leste',
+                'Togo',
+                'Tokelau',
+                'Tonga',
+                'Trinidad and Tobago',
+                'Tunisia',
+                'Turkey',
+                'Turkmenistan',
+                'Turks and Caicos Islands',
+                'Tuvalu',
+                'Uganda',
+                'Ukraine',
+                'United Arab Emirates',
+                'United Kingdom',
+                'United States',
+                'United States Minor Outlying Islands',
+                'Uruguay',
+                'Uzbekistan',
+                'Vanuatu',
+                'Venezuela, Bolivarian Republic of',
+                'Viet Nam',
+                'Virgin Islands, British',
+                'Virgin Islands, U.S.',
+                'Wallis and Futuna',
+                'Western Sahara',
+                'Yemen',
+                'Zambia',
+                'Zimbabwe',
+                'Åland Islands'
+              ],
+              displayFormat: '#VALUE, ',
+              isRequired: false,
+              displayOrder: 1,
+              typeClass: 'controlledVocabulary',
+              displayOnCreate: false
+            },
+            state: {
+              name: 'state',
+              displayName: 'Geographic Coverage State / Province',
+              title: 'State / Province',
+              type: 'TEXT',
+              watermark: '',
+              description:
+                'The state or province that the Dataset is about. Use GeoNames for correct spelling and avoid abbreviations.',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '#VALUE, ',
+              isRequired: false,
+              displayOrder: 2,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            city: {
+              name: 'city',
+              displayName: 'Geographic Coverage City',
+              title: 'City',
+              type: 'TEXT',
+              watermark: '',
+              description:
+                'The name of the city that the Dataset is about. Use GeoNames for correct spelling and avoid abbreviations.',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '#VALUE, ',
+              isRequired: false,
+              displayOrder: 3,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            otherGeographicCoverage: {
+              name: 'otherGeographicCoverage',
+              displayName: 'Geographic Coverage Other',
+              title: 'Other',
+              type: 'TEXT',
+              watermark: '',
+              description: 'Other information on the geographic coverage of the data.',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '#VALUE, ',
+              isRequired: false,
+              displayOrder: 4,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            }
+          }
+        },
+        geographicUnit: {
+          name: 'geographicUnit',
+          displayName: 'Geographic Unit',
+          title: 'Geographic Unit',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'Lowest level of geographic aggregation covered by the Dataset, e.g., village, county, region.',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 5,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        geographicBoundingBox: {
+          name: 'geographicBoundingBox',
+          displayName: 'Geographic Bounding Box',
+          title: 'Geographic Bounding Box',
+          type: 'NONE',
+          watermark: '',
+          description:
+            "The fundamental geometric description for any Dataset that models geography is the geographic bounding box. It describes the minimum box, defined by west and east longitudes and north and south latitudes, which includes the largest geographic extent of the  Dataset's geographic coverage. This element is used in the first pass of a coordinate-based search. Inclusion of this element in the codebook is recommended, but is required if the bound polygon box is included. ",
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 6,
+          typeClass: 'compound',
+          displayOnCreate: false,
+          childMetadataFields: {
+            westLongitude: {
+              name: 'westLongitude',
+              displayName: 'Geographic Bounding Box Westernmost (Left) Longitude',
+              title: 'Westernmost (Left) Longitude',
+              type: 'TEXT',
+              watermark: '',
+              description:
+                'Westernmost coordinate delimiting the geographic extent of the Dataset. A valid range of values,  expressed in decimal degrees, is -180.0 <= West  Bounding Longitude Value <= 180.0.',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '',
+              isRequired: false,
+              displayOrder: 7,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            eastLongitude: {
+              name: 'eastLongitude',
+              displayName: 'Geographic Bounding Box Easternmost (Right) Longitude',
+              title: 'Easternmost (Right) Longitude',
+              type: 'TEXT',
+              watermark: '',
+              description:
+                'Easternmost coordinate delimiting the geographic extent of the Dataset. A valid range of values,  expressed in decimal degrees, is -180.0 <= East Bounding Longitude Value <= 180.0.',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '',
+              isRequired: false,
+              displayOrder: 8,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            northLatitude: {
+              name: 'northLatitude',
+              displayName: 'Geographic Bounding Box Northernmost (Top) Latitude',
+              title: 'Northernmost (Top) Latitude',
+              type: 'TEXT',
+              watermark: '',
+              description:
+                'Northernmost coordinate delimiting the geographic extent of the Dataset. A valid range of values,  expressed in decimal degrees, is -90.0 <= North Bounding Latitude Value <= 90.0.',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '',
+              isRequired: false,
+              displayOrder: 9,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            southLatitude: {
+              name: 'southLatitude',
+              displayName: 'Geographic Bounding Box Southernmost (Bottom) Latitude',
+              title: 'Southernmost (Bottom) Latitude',
+              type: 'TEXT',
+              watermark: '',
+              description:
+                'Southernmost coordinate delimiting the geographic extent of the Dataset. A valid range of values,  expressed in decimal degrees, is -90.0 <= South Bounding Latitude Value <= 90.0.',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '',
+              isRequired: false,
+              displayOrder: 10,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/tests/component/metadata-block-info/domain/models/JournalMetadataBlockInfoMother.ts b/tests/component/metadata-block-info/domain/models/JournalMetadataBlockInfoMother.ts
new file mode 100644
index 000000000..dc308bad9
--- /dev/null
+++ b/tests/component/metadata-block-info/domain/models/JournalMetadataBlockInfoMother.ts
@@ -0,0 +1,130 @@
+import { MetadataBlockInfo } from '../../../../../src/metadata-block-info/domain/models/MetadataBlockInfo'
+
+export class JournalMetadataBlockInfoMother {
+  static get(): MetadataBlockInfo {
+    return {
+      id: 6,
+      name: 'journal',
+      displayName: 'Journal Metadata',
+      displayOnCreate: false,
+      metadataFields: {
+        journalVolumeIssue: {
+          name: 'journalVolumeIssue',
+          displayName: 'Journal',
+          title: 'Journal',
+          type: 'NONE',
+          watermark: '',
+          description:
+            'Indicates the volume, issue and date of a journal, which this Dataset is associated with.',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 0,
+          typeClass: 'compound',
+          displayOnCreate: false,
+          childMetadataFields: {
+            journalVolume: {
+              name: 'journalVolume',
+              displayName: 'Journal Volume',
+              title: 'Volume',
+              type: 'TEXT',
+              watermark: '',
+              description:
+                'The journal volume which this Dataset is associated with (e.g., Volume 4).',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '',
+              isRequired: false,
+              displayOrder: 1,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            journalIssue: {
+              name: 'journalIssue',
+              displayName: 'Journal Issue',
+              title: 'Issue',
+              type: 'TEXT',
+              watermark: '',
+              description:
+                'The journal issue number which this Dataset is associated with (e.g., Number 2, Autumn).',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '',
+              isRequired: false,
+              displayOrder: 2,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            journalPubDate: {
+              name: 'journalPubDate',
+              displayName: 'Journal Publication Date',
+              title: 'Publication Date',
+              type: 'DATE',
+              watermark: 'YYYY or YYYY-MM or YYYY-MM-DD',
+              description:
+                'The publication date for this journal volume/issue, which this Dataset is associated with (e.g., 1999).',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '',
+              isRequired: false,
+              displayOrder: 3,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            }
+          }
+        },
+        journalArticleType: {
+          name: 'journalArticleType',
+          displayName: 'Type of Article',
+          title: 'Type of Article',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'Indicates what kind of article this is, for example, a research article, a commentary, a book or product review, a case report, a calendar, etc (based on JATS). ',
+          multiple: false,
+          isControlledVocabulary: true,
+          controlledVocabularyValues: [
+            'abstract',
+            'addendum',
+            'announcement',
+            'article-commentary',
+            'book review',
+            'books received',
+            'brief report',
+            'calendar',
+            'case report',
+            'collection',
+            'correction',
+            'data paper',
+            'discussion',
+            'dissertation',
+            'editorial',
+            'in brief',
+            'introduction',
+            'letter',
+            'meeting report',
+            'news',
+            'obituary',
+            'oration',
+            'partial retraction',
+            'product review',
+            'rapid communication',
+            'reply',
+            'reprint',
+            'research article',
+            'retraction',
+            'review article',
+            'translation',
+            'other'
+          ],
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 4,
+          typeClass: 'controlledVocabulary',
+          displayOnCreate: false
+        }
+      }
+    }
+  }
+}
diff --git a/tests/component/metadata-block-info/domain/models/MetadataBlockInfoMother.ts b/tests/component/metadata-block-info/domain/models/MetadataBlockInfoMother.ts
index 8489af959..c19e20572 100644
--- a/tests/component/metadata-block-info/domain/models/MetadataBlockInfoMother.ts
+++ b/tests/component/metadata-block-info/domain/models/MetadataBlockInfoMother.ts
@@ -3,6 +3,12 @@ import {
   MetadataBlockInfo
 } from '../../../../../src/metadata-block-info/domain/models/MetadataBlockInfo'
 import { MetadataBlockName } from '../../../../../src/dataset/domain/models/Dataset'
+import { CitationMetadataBlockInfoMother } from './CitationMetadataBlockInfoMother'
+import { AstrophysicsMetadataBlockInfoMother } from './AstrophysicsMetadataBlockInfoMother'
+import { BiomedicalMetadataBlockInfoMother } from './BiomedicalMetadataBlockInfoMother'
+import { GeospatialMetadataBlockInfoMother } from './GeospatialMetadataBlockInfoMother'
+import { SocialScienceMetadataBlockInfoMother } from './SocialScienceMetadataBlockInfoMother'
+import { JournalMetadataBlockInfoMother } from './JournalMetadataBlockInfoMother'
 
 export class MetadataBlockInfoMother {
   static create(props?: Partial<MetadataBlockInfoDisplayFormat>): MetadataBlockInfoDisplayFormat {
@@ -33,6 +39,31 @@ export class MetadataBlockInfoMother {
     }
   }
 
+  // TODO:ME Check response of getByNameTemporal hook and update this method
+  static getCitationBlock(): MetadataBlockInfo {
+    return CitationMetadataBlockInfoMother.get()
+  }
+
+  static getAstrophysicsBlock(): MetadataBlockInfo {
+    return AstrophysicsMetadataBlockInfoMother.get()
+  }
+
+  static getBiomedicalBlock(): MetadataBlockInfo {
+    return BiomedicalMetadataBlockInfoMother.get()
+  }
+
+  static getGeospatialBlock(): MetadataBlockInfo {
+    return GeospatialMetadataBlockInfoMother.get()
+  }
+
+  static getSocialScienceBlock(): MetadataBlockInfo {
+    return SocialScienceMetadataBlockInfoMother.get()
+  }
+
+  static getJournalBlock(): MetadataBlockInfo {
+    return JournalMetadataBlockInfoMother.get()
+  }
+
   static getByCollectionIdDisplayedOnCreateTrue(block?: MetadataBlockInfo): MetadataBlockInfo[] {
     return [
       {
diff --git a/tests/component/metadata-block-info/domain/models/SocialScienceMetadataBlockInfoMother.ts b/tests/component/metadata-block-info/domain/models/SocialScienceMetadataBlockInfoMother.ts
new file mode 100644
index 000000000..bd30f5fef
--- /dev/null
+++ b/tests/component/metadata-block-info/domain/models/SocialScienceMetadataBlockInfoMother.ts
@@ -0,0 +1,426 @@
+import { MetadataBlockInfo } from '../../../../../src/metadata-block-info/domain/models/MetadataBlockInfo'
+
+export class SocialScienceMetadataBlockInfoMother {
+  static get(): MetadataBlockInfo {
+    return {
+      id: 3,
+      name: 'socialscience',
+      displayName: 'Social Science and Humanities Metadata',
+      displayOnCreate: false,
+      metadataFields: {
+        unitOfAnalysis: {
+          name: 'unitOfAnalysis',
+          displayName: 'Unit of Analysis',
+          title: 'Unit of Analysis',
+          type: 'TEXTBOX',
+          watermark: '',
+          description:
+            "Basic unit of analysis or observation that this Dataset describes, such as individuals, families/households, groups, institutions/organizations, administrative units, and more. For information about the DDI's controlled vocabulary for this element, please refer to the DDI web page at http://www.ddialliance.org/controlled-vocabularies.",
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 0,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        universe: {
+          name: 'universe',
+          displayName: 'Universe',
+          title: 'Universe',
+          type: 'TEXTBOX',
+          watermark: '',
+          description:
+            'Description of the population covered by the data in the file; the group of people or other elements that are the object of the study and to which the study results refer. Age, nationality, and residence commonly help to  delineate a given universe, but any number of other factors may be used, such as age limits, sex, marital status, race, ethnic group, nationality, income, veteran status, criminal convictions, and more. The universe may consist of elements other than persons, such as housing units, court cases, deaths, countries, and so on. In general, it should be possible to tell from the description of the universe whether a given individual or element is a member of the population under study. Also known as the universe of interest, population of interest, and target population.',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 1,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        timeMethod: {
+          name: 'timeMethod',
+          displayName: 'Time Method',
+          title: 'Time Method',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'The time method or time dimension of the data collection, such as panel, cross-sectional, trend, time- series, or other.',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 2,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        dataCollector: {
+          name: 'dataCollector',
+          displayName: 'Data Collector',
+          title: 'Data Collector',
+          type: 'TEXT',
+          watermark: 'FamilyName, GivenName or Organization',
+          description:
+            'Individual, agency or organization responsible for  administering the questionnaire or interview or compiling the data.',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 3,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        collectorTraining: {
+          name: 'collectorTraining',
+          displayName: 'Collector Training',
+          title: 'Collector Training',
+          type: 'TEXT',
+          watermark: '',
+          description: 'Type of training provided to the data collector',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 4,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        frequencyOfDataCollection: {
+          name: 'frequencyOfDataCollection',
+          displayName: 'Frequency',
+          title: 'Frequency',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'If the data collected includes more than one point in time, indicate the frequency with which the data was collected; that is, monthly, quarterly, or other.',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 5,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        samplingProcedure: {
+          name: 'samplingProcedure',
+          displayName: 'Sampling Procedure',
+          title: 'Sampling Procedure',
+          type: 'TEXTBOX',
+          watermark: '',
+          description:
+            'Type of sample and sample design used to select the survey respondents to represent the population. May include reference to the target sample size and the sampling fraction.',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 6,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        targetSampleSize: {
+          name: 'targetSampleSize',
+          displayName: 'Target Sample Size',
+          title: 'Target Sample Size',
+          type: 'NONE',
+          watermark: '',
+          description:
+            'Specific information regarding the target sample size, actual  sample size, and the formula used to determine this.',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 7,
+          typeClass: 'compound',
+          displayOnCreate: false,
+          childMetadataFields: {
+            targetSampleActualSize: {
+              name: 'targetSampleActualSize',
+              displayName: 'Target Sample Size Actual',
+              title: 'Actual',
+              type: 'INT',
+              watermark: 'Enter an integer...',
+              description: 'Actual sample size.',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '',
+              isRequired: false,
+              displayOrder: 8,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            targetSampleSizeFormula: {
+              name: 'targetSampleSizeFormula',
+              displayName: 'Target Sample Size Formula',
+              title: 'Formula',
+              type: 'TEXT',
+              watermark: '',
+              description: 'Formula used to determine target sample size.',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '',
+              isRequired: false,
+              displayOrder: 9,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            }
+          }
+        },
+        deviationsFromSampleDesign: {
+          name: 'deviationsFromSampleDesign',
+          displayName: 'Major Deviations for Sample Design',
+          title: 'Major Deviations for Sample Design',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'Show correspondence as well as discrepancies between the sampled units (obtained) and available statistics for the population (age, sex-ratio, marital status, etc.) as a whole.',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 10,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        collectionMode: {
+          name: 'collectionMode',
+          displayName: 'Collection Mode',
+          title: 'Collection Mode',
+          type: 'TEXTBOX',
+          watermark: '',
+          description:
+            'Method used to collect the data; instrumentation characteristics (e.g., telephone interview, mail questionnaire, or other).',
+          multiple: true,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 11,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        researchInstrument: {
+          name: 'researchInstrument',
+          displayName: 'Type of Research Instrument',
+          title: 'Type of Research Instrument',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'Type of data collection instrument used. Structured indicates an instrument in which all respondents are asked the same questions/tests, possibly with precoded answers. If a small portion of such a questionnaire includes open-ended questions, provide appropriate comments. Semi-structured indicates that the research instrument contains mainly open-ended questions. Unstructured indicates that in-depth interviews were conducted.',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 12,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        dataCollectionSituation: {
+          name: 'dataCollectionSituation',
+          displayName: 'Characteristics of Data Collection Situation',
+          title: 'Characteristics of Data Collection Situation',
+          type: 'TEXTBOX',
+          watermark: '',
+          description:
+            'Description of noteworthy aspects of the data collection situation. Includes information on factors such as cooperativeness of respondents, duration of interviews, number of call backs, or similar.',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 13,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        actionsToMinimizeLoss: {
+          name: 'actionsToMinimizeLoss',
+          displayName: 'Actions to Minimize Losses',
+          title: 'Actions to Minimize Losses',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'Summary of actions taken to minimize data loss. Include information on actions such as follow-up visits, supervisory checks, historical matching, estimation, and so on.',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 14,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        controlOperations: {
+          name: 'controlOperations',
+          displayName: 'Control Operations',
+          title: 'Control Operations',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'Control OperationsMethods to facilitate data control performed by the primary investigator or by the data archive.',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 15,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        weighting: {
+          name: 'weighting',
+          displayName: 'Weighting',
+          title: 'Weighting',
+          type: 'TEXTBOX',
+          watermark: '',
+          description:
+            'The use of sampling procedures might make it necessary to apply weights to produce accurate statistical results. Describes the criteria for using weights in analysis of a collection. If a weighting formula or coefficient was developed, the formula is provided, its elements are defined, and it is indicated how the formula was applied to the data.',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 16,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        cleaningOperations: {
+          name: 'cleaningOperations',
+          displayName: 'Cleaning Operations',
+          title: 'Cleaning Operations',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'Methods used to clean the data collection, such as consistency checking, wildcode checking, or other.',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 17,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        datasetLevelErrorNotes: {
+          name: 'datasetLevelErrorNotes',
+          displayName: 'Study Level Error Notes',
+          title: 'Study Level Error Notes',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'Note element used for any information annotating or clarifying the methodology and processing of the study. ',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 18,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        responseRate: {
+          name: 'responseRate',
+          displayName: 'Response Rate',
+          title: 'Response Rate',
+          type: 'TEXTBOX',
+          watermark: '',
+          description: 'Percentage of sample members who provided information.',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 19,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        samplingErrorEstimates: {
+          name: 'samplingErrorEstimates',
+          displayName: 'Estimates of Sampling Error',
+          title: 'Estimates of Sampling Error',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'Measure of how precisely one can estimate a population value from a given sample.',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 20,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        otherDataAppraisal: {
+          name: 'otherDataAppraisal',
+          displayName: 'Other Forms of Data Appraisal',
+          title: 'Other Forms of Data Appraisal',
+          type: 'TEXT',
+          watermark: '',
+          description:
+            'Other issues pertaining to the data appraisal. Describe issues such as response variance, nonresponse rate  and testing for bias, interviewer and response bias, confidence levels, question bias, or similar.',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 21,
+          typeClass: 'primitive',
+          displayOnCreate: false
+        },
+        socialScienceNotes: {
+          name: 'socialScienceNotes',
+          displayName: 'Notes',
+          title: 'Notes',
+          type: 'NONE',
+          watermark: '',
+          description: 'General notes about this Dataset.',
+          multiple: false,
+          isControlledVocabulary: false,
+          displayFormat: '',
+          isRequired: false,
+          displayOrder: 22,
+          typeClass: 'compound',
+          displayOnCreate: false,
+          childMetadataFields: {
+            socialScienceNotesType: {
+              name: 'socialScienceNotesType',
+              displayName: 'Notes Type',
+              title: 'Type',
+              type: 'TEXT',
+              watermark: '',
+              description: 'Type of note.',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '',
+              isRequired: false,
+              displayOrder: 23,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            socialScienceNotesSubject: {
+              name: 'socialScienceNotesSubject',
+              displayName: 'Notes Subject',
+              title: 'Subject',
+              type: 'TEXT',
+              watermark: '',
+              description: 'Note subject.',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '',
+              isRequired: false,
+              displayOrder: 24,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            },
+            socialScienceNotesText: {
+              name: 'socialScienceNotesText',
+              displayName: 'Notes Text',
+              title: 'Text',
+              type: 'TEXTBOX',
+              watermark: '',
+              description: 'Text for this note.',
+              multiple: false,
+              isControlledVocabulary: false,
+              displayFormat: '',
+              isRequired: false,
+              displayOrder: 25,
+              typeClass: 'primitive',
+              displayOnCreate: false
+            }
+          }
+        }
+      }
+    }
+  }
+}

From a7b4a473f4d7683b13daad136da3a9758da856e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Fri, 2 Aug 2024 12:49:15 -0300
Subject: [PATCH 30/52] feat: add necessary things for tests to not break

---
 .../domain/models/CollectionMother.ts         |  1 +
 .../create-collection/CollectionForm.spec.tsx | 64 ++++++++++++++++++-
 .../CreateCollection.spec.tsx                 | 41 ++++++++++--
 3 files changed, 100 insertions(+), 6 deletions(-)

diff --git a/tests/component/collection/domain/models/CollectionMother.ts b/tests/component/collection/domain/models/CollectionMother.ts
index b5441d735..6873161b4 100644
--- a/tests/component/collection/domain/models/CollectionMother.ts
+++ b/tests/component/collection/domain/models/CollectionMother.ts
@@ -14,6 +14,7 @@ export class CollectionMother {
         : undefined,
       affiliation: faker.datatype.boolean() ? faker.lorem.words(3) : undefined,
       hierarchy: UpwardHierarchyNodeMother.createCollection(),
+      inputLevels: [],
       ...props
     }
   }
diff --git a/tests/component/sections/create-collection/CollectionForm.spec.tsx b/tests/component/sections/create-collection/CollectionForm.spec.tsx
index 7d82e1746..11721a53d 100644
--- a/tests/component/sections/create-collection/CollectionForm.spec.tsx
+++ b/tests/component/sections/create-collection/CollectionForm.spec.tsx
@@ -1,12 +1,20 @@
 import {
   CollectionForm,
-  CollectionFormData
+  CollectionFormData,
+  FormattedCollectionInputLevels,
+  FormattedCollectionInputLevelsWithoutParentBlockName,
+  INPUT_LEVELS_GROUPER,
+  METADATA_BLOCKS_NAMES_GROUPER,
+  USE_FIELDS_FROM_PARENT
 } from '../../../../src/sections/create-collection/collection-form/CollectionForm'
 import { CollectionRepository } from '../../../../src/collection/domain/repositories/CollectionRepository'
 import { UserRepository } from '../../../../src/users/domain/repositories/UserRepository'
 import { CollectionMother } from '../../collection/domain/models/CollectionMother'
 import { UserMother } from '../../users/domain/models/UserMother'
 import { collectionNameToAlias } from '../../../../src/sections/create-collection/collection-form/top-fields-section/IdentifierField'
+import { MetadataBlockInfoMother } from '../../metadata-block-info/domain/models/MetadataBlockInfoMother'
+import { CollectionFormHelper } from '../../../../src/sections/create-collection/collection-form/CollectionFormHelper'
+import { MetadataBlockName } from '../../../../src/metadata-block-info/domain/models/MetadataBlockInfo'
 
 const collectionRepository: CollectionRepository = {} as CollectionRepository
 
@@ -15,11 +23,41 @@ const OWNER_COLLECTION_ID = 'root'
 const COLLECTION_NAME = 'Collection Name'
 const collection = CollectionMother.create({ name: COLLECTION_NAME })
 
+const allMetadataBlocksMock = [
+  MetadataBlockInfoMother.getCitationBlock(),
+  MetadataBlockInfoMother.getGeospatialBlock(),
+  MetadataBlockInfoMother.getAstrophysicsBlock(),
+  MetadataBlockInfoMother.getBiomedicalBlock(),
+  MetadataBlockInfoMother.getJournalBlock(),
+  MetadataBlockInfoMother.getSocialScienceBlock()
+]
+
 const testUser = UserMother.create()
 const userRepository: UserRepository = {} as UserRepository
 
 const defaultCollectionName = `${testUser.displayName} Collection`
 
+const baseInputLevels: FormattedCollectionInputLevels =
+  CollectionFormHelper.defineBaseInputLevels(allMetadataBlocksMock)
+
+const formattedCollectionInputLevels: FormattedCollectionInputLevelsWithoutParentBlockName =
+  CollectionFormHelper.formatCollectiontInputLevels(collection?.inputLevels)
+
+const mergedInputLevels = CollectionFormHelper.mergeBaseAndDefaultInputLevels(
+  baseInputLevels,
+  formattedCollectionInputLevels
+)
+
+const defaultBlocksNames = {
+  [MetadataBlockName.CITATION]: true,
+  [MetadataBlockName.GEOSPATIAL]: false,
+  [MetadataBlockName.SOCIAL_SCIENCE]: false,
+  [MetadataBlockName.ASTROPHYSICS]: false,
+  [MetadataBlockName.BIOMEDICAL]: false,
+  [MetadataBlockName.JOURNAL]: false
+}
+
+// TODO:ME Add missing default values
 const formDefaultValues: CollectionFormData = {
   hostCollection: collection.name,
   name: defaultCollectionName,
@@ -28,7 +66,10 @@ const formDefaultValues: CollectionFormData = {
   contacts: [{ value: testUser.email }],
   affiliation: testUser.affiliation ?? '',
   storage: 'Local (Default)',
-  description: ''
+  description: '',
+  [USE_FIELDS_FROM_PARENT]: true,
+  [METADATA_BLOCKS_NAMES_GROUPER]: defaultBlocksNames,
+  [INPUT_LEVELS_GROUPER]: mergedInputLevels
 }
 
 describe('CollectionForm', () => {
@@ -44,6 +85,7 @@ describe('CollectionForm', () => {
         collectionRepository={collectionRepository}
         ownerCollectionId={OWNER_COLLECTION_ID}
         defaultValues={formDefaultValues}
+        allMetadataBlocksInfo={allMetadataBlocksMock}
       />
     )
 
@@ -55,6 +97,7 @@ describe('CollectionForm', () => {
         collectionRepository={collectionRepository}
         ownerCollectionId={OWNER_COLLECTION_ID}
         defaultValues={formDefaultValues}
+        allMetadataBlocksInfo={allMetadataBlocksMock}
       />
     )
 
@@ -67,6 +110,7 @@ describe('CollectionForm', () => {
         collectionRepository={collectionRepository}
         ownerCollectionId={OWNER_COLLECTION_ID}
         defaultValues={formDefaultValues}
+        allMetadataBlocksInfo={allMetadataBlocksMock}
       />
     )
 
@@ -83,6 +127,7 @@ describe('CollectionForm', () => {
         collectionRepository={collectionRepository}
         ownerCollectionId={OWNER_COLLECTION_ID}
         defaultValues={formDefaultValues}
+        allMetadataBlocksInfo={allMetadataBlocksMock}
       />
     )
 
@@ -95,6 +140,7 @@ describe('CollectionForm', () => {
         collectionRepository={collectionRepository}
         ownerCollectionId={OWNER_COLLECTION_ID}
         defaultValues={formDefaultValues}
+        allMetadataBlocksInfo={allMetadataBlocksMock}
       />
     )
 
@@ -111,6 +157,7 @@ describe('CollectionForm', () => {
         collectionRepository={collectionRepository}
         ownerCollectionId={OWNER_COLLECTION_ID}
         defaultValues={formDefaultValues}
+        allMetadataBlocksInfo={allMetadataBlocksMock}
       />
     )
 
@@ -131,6 +178,7 @@ describe('CollectionForm', () => {
         collectionRepository={collectionRepository}
         ownerCollectionId={OWNER_COLLECTION_ID}
         defaultValues={formDefaultValues}
+        allMetadataBlocksInfo={allMetadataBlocksMock}
       />
     )
 
@@ -148,6 +196,7 @@ describe('CollectionForm', () => {
         collectionRepository={collectionRepository}
         ownerCollectionId={OWNER_COLLECTION_ID}
         defaultValues={formDefaultValues}
+        allMetadataBlocksInfo={allMetadataBlocksMock}
       />
     )
 
@@ -164,6 +213,7 @@ describe('CollectionForm', () => {
         collectionRepository={collectionRepository}
         ownerCollectionId={OWNER_COLLECTION_ID}
         defaultValues={formDefaultValues}
+        allMetadataBlocksInfo={allMetadataBlocksMock}
       />
     )
 
@@ -184,6 +234,7 @@ describe('CollectionForm', () => {
         collectionRepository={collectionRepository}
         ownerCollectionId={OWNER_COLLECTION_ID}
         defaultValues={formDefaultValues}
+        allMetadataBlocksInfo={allMetadataBlocksMock}
       />
     )
 
@@ -205,6 +256,7 @@ describe('CollectionForm', () => {
         collectionRepository={collectionRepository}
         ownerCollectionId={OWNER_COLLECTION_ID}
         defaultValues={formDefaultValues}
+        allMetadataBlocksInfo={allMetadataBlocksMock}
       />
     )
     // Accept suggestion
@@ -226,6 +278,7 @@ describe('CollectionForm', () => {
         collectionRepository={collectionRepository}
         ownerCollectionId={OWNER_COLLECTION_ID}
         defaultValues={formDefaultValues}
+        allMetadataBlocksInfo={allMetadataBlocksMock}
       />
     )
 
@@ -247,6 +300,7 @@ describe('CollectionForm', () => {
         collectionRepository={collectionRepository}
         ownerCollectionId={OWNER_COLLECTION_ID}
         defaultValues={formDefaultValues}
+        allMetadataBlocksInfo={allMetadataBlocksMock}
       />
     )
 
@@ -260,6 +314,7 @@ describe('CollectionForm', () => {
           collectionRepository={collectionRepository}
           ownerCollectionId={OWNER_COLLECTION_ID}
           defaultValues={formDefaultValues}
+          allMetadataBlocksInfo={allMetadataBlocksMock}
         />
       )
 
@@ -277,6 +332,7 @@ describe('CollectionForm', () => {
           collectionRepository={collectionRepository}
           ownerCollectionId={OWNER_COLLECTION_ID}
           defaultValues={formDefaultValues}
+          allMetadataBlocksInfo={allMetadataBlocksMock}
         />
       )
 
@@ -298,6 +354,7 @@ describe('CollectionForm', () => {
             ...formDefaultValues,
             alias: collectionNameToAlias(defaultCollectionName)
           }}
+          allMetadataBlocksInfo={allMetadataBlocksMock}
         />
       )
 
@@ -310,6 +367,7 @@ describe('CollectionForm', () => {
           collectionRepository={collectionRepository}
           ownerCollectionId={OWNER_COLLECTION_ID}
           defaultValues={{ ...formDefaultValues, name: '' }}
+          allMetadataBlocksInfo={allMetadataBlocksMock}
         />
       )
 
@@ -324,6 +382,7 @@ describe('CollectionForm', () => {
           collectionRepository={collectionRepository}
           ownerCollectionId={OWNER_COLLECTION_ID}
           defaultValues={formDefaultValues}
+          allMetadataBlocksInfo={allMetadataBlocksMock}
         />
       )
 
@@ -342,6 +401,7 @@ describe('CollectionForm', () => {
             ...formDefaultValues,
             contacts: [{ value: testUser.email }, { value: 'fake@fake.com' }]
           }}
+          allMetadataBlocksInfo={allMetadataBlocksMock}
         />
       )
       cy.findAllByLabelText('Add Email').should('exist').should('have.length', 2)
diff --git a/tests/component/sections/create-collection/CreateCollection.spec.tsx b/tests/component/sections/create-collection/CreateCollection.spec.tsx
index e70bd849b..fb58b7059 100644
--- a/tests/component/sections/create-collection/CreateCollection.spec.tsx
+++ b/tests/component/sections/create-collection/CreateCollection.spec.tsx
@@ -1,14 +1,29 @@
 import { CollectionRepository } from '../../../../src/collection/domain/repositories/CollectionRepository'
+import { MetadataBlockInfoRepository } from '../../../../src/metadata-block-info/domain/repositories/MetadataBlockInfoRepository'
 import { CreateCollection } from '../../../../src/sections/create-collection/CreateCollection'
 import { UserRepository } from '../../../../src/users/domain/repositories/UserRepository'
 import { CollectionMother } from '../../collection/domain/models/CollectionMother'
+import { MetadataBlockInfoMother } from '../../metadata-block-info/domain/models/MetadataBlockInfoMother'
 import { UserMother } from '../../users/domain/models/UserMother'
 
 const collectionRepository: CollectionRepository = {} as CollectionRepository
+const metadataBlockInfoRepository: MetadataBlockInfoRepository = {} as MetadataBlockInfoRepository
 
 const COLLECTION_NAME = 'Collection Name'
 const collection = CollectionMother.create({ name: COLLECTION_NAME })
 
+const collectionMetadataBlocksInfo =
+  MetadataBlockInfoMother.getByCollectionIdDisplayedOnCreateFalse()
+
+const allMetadataBlocksMock = [
+  MetadataBlockInfoMother.getCitationBlock(),
+  MetadataBlockInfoMother.getGeospatialBlock(),
+  MetadataBlockInfoMother.getAstrophysicsBlock(),
+  MetadataBlockInfoMother.getBiomedicalBlock(),
+  MetadataBlockInfoMother.getJournalBlock(),
+  MetadataBlockInfoMother.getSocialScienceBlock()
+]
+
 const testUser = UserMother.create()
 const userRepository: UserRepository = {} as UserRepository
 
@@ -16,12 +31,18 @@ describe('CreateCollection', () => {
   beforeEach(() => {
     collectionRepository.create = cy.stub().resolves(1)
     collectionRepository.getById = cy.stub().resolves(collection)
+    metadataBlockInfoRepository.getByColecctionId = cy.stub().resolves(collectionMetadataBlocksInfo)
+    metadataBlockInfoRepository.getAllTemporal = cy.stub().resolves(allMetadataBlocksMock)
     userRepository.getAuthenticated = cy.stub().resolves(testUser)
   })
 
   it('should show loading skeleton while loading the owner collection', () => {
     cy.customMount(
-      <CreateCollection collectionRepository={collectionRepository} ownerCollectionId="root" />
+      <CreateCollection
+        collectionRepository={collectionRepository}
+        metadataBlockInfoRepository={metadataBlockInfoRepository}
+        ownerCollectionId="root"
+      />
     )
 
     cy.findByTestId('create-collection-skeleton').should('exist')
@@ -29,7 +50,11 @@ describe('CreateCollection', () => {
 
   it('should render the correct breadcrumbs', () => {
     cy.customMount(
-      <CreateCollection collectionRepository={collectionRepository} ownerCollectionId="root" />
+      <CreateCollection
+        collectionRepository={collectionRepository}
+        metadataBlockInfoRepository={metadataBlockInfoRepository}
+        ownerCollectionId="root"
+      />
     )
 
     cy.findByRole('link', { name: 'Root' }).should('exist')
@@ -44,7 +69,11 @@ describe('CreateCollection', () => {
     collectionRepository.getById = cy.stub().resolves(null)
 
     cy.customMount(
-      <CreateCollection collectionRepository={collectionRepository} ownerCollectionId="root" />
+      <CreateCollection
+        collectionRepository={collectionRepository}
+        metadataBlockInfoRepository={metadataBlockInfoRepository}
+        ownerCollectionId="root"
+      />
     )
 
     cy.findByText('Page Not Found').should('exist')
@@ -52,7 +81,11 @@ describe('CreateCollection', () => {
 
   it('pre-fills specific form fields with user data', () => {
     cy.mountAuthenticated(
-      <CreateCollection collectionRepository={collectionRepository} ownerCollectionId="root" />
+      <CreateCollection
+        collectionRepository={collectionRepository}
+        metadataBlockInfoRepository={metadataBlockInfoRepository}
+        ownerCollectionId="root"
+      />
     )
 
     cy.findByLabelText(/^Collection Name/i).should(

From 90c08f78ca53bd891eaca187ad6264334d314bcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Fri, 2 Aug 2024 12:50:39 -0300
Subject: [PATCH 31/52] feat: make required by dataverse fields required by
 default and dont allow to set them as optional

---
 .../create-collection/CreateCollection.tsx      |  3 ++-
 .../collection-form/CollectionFormHelper.ts     | 14 +++++++++++---
 .../RequiredOptionalRadios.tsx                  | 17 +++++++++++++----
 .../useGetAllMetadataBlocksInfo.tsx             |  2 --
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/sections/create-collection/CreateCollection.tsx b/src/sections/create-collection/CreateCollection.tsx
index 8fe73a38f..a21ec7ec7 100644
--- a/src/sections/create-collection/CreateCollection.tsx
+++ b/src/sections/create-collection/CreateCollection.tsx
@@ -16,6 +16,7 @@ import {
   CollectionFormMetadataBlocks,
   FormattedCollectionInputLevels,
   FormattedCollectionInputLevelsWithoutParentBlockName,
+  INPUT_LEVELS_GROUPER,
   METADATA_BLOCKS_NAMES_GROUPER,
   USE_FIELDS_FROM_PARENT
 } from './collection-form/CollectionForm'
@@ -130,7 +131,7 @@ export function CreateCollection({
     description: '',
     [USE_FIELDS_FROM_PARENT]: true,
     [METADATA_BLOCKS_NAMES_GROUPER]: defaultBlocksNames,
-    inputLevels: mergedInputLevels
+    [INPUT_LEVELS_GROUPER]: mergedInputLevels
   }
 
   return (
diff --git a/src/sections/create-collection/collection-form/CollectionFormHelper.ts b/src/sections/create-collection/collection-form/CollectionFormHelper.ts
index 5585a5738..6a37b43b9 100644
--- a/src/sections/create-collection/collection-form/CollectionFormHelper.ts
+++ b/src/sections/create-collection/collection-form/CollectionFormHelper.ts
@@ -9,7 +9,8 @@ import {
   CollectionFormMetadataBlock,
   CollectionFormMetadataBlocks,
   FormattedCollectionInputLevels,
-  FormattedCollectionInputLevelsWithoutParentBlockName
+  FormattedCollectionInputLevelsWithoutParentBlockName,
+  REQUIRED_BY_DATAVERSE_FIELDS
 } from './CollectionForm'
 
 export class CollectionFormHelper {
@@ -26,19 +27,26 @@ export class CollectionFormHelper {
     allMetadataBlocksInfoReduced.forEach((block) => {
       Object.entries(block.metadataFields).forEach(([_key, field]) => {
         const normalizedFieldName = this.replaceDotWithSlash(field.name)
+        const isRequiredByDataverseField = REQUIRED_BY_DATAVERSE_FIELDS.includes(
+          field.name as (typeof REQUIRED_BY_DATAVERSE_FIELDS)[number]
+        )
 
         fields[normalizedFieldName] = {
           include: true,
-          optionalOrRequired: 'optional',
+          optionalOrRequired: isRequiredByDataverseField ? 'required' : 'optional',
           parentBlockName: block.name as CollectionFormMetadataBlock
         }
 
         if (field.childMetadataFields) {
           Object.entries(field.childMetadataFields).forEach(([_key, childField]) => {
             const normalizedFieldName = this.replaceDotWithSlash(childField.name)
+            const isRequiredByDataverseField = REQUIRED_BY_DATAVERSE_FIELDS.includes(
+              childField.name as (typeof REQUIRED_BY_DATAVERSE_FIELDS)[number]
+            )
+
             childFields[normalizedFieldName] = {
               include: true,
-              optionalOrRequired: 'optional',
+              optionalOrRequired: isRequiredByDataverseField ? 'required' : 'optional',
               parentBlockName: block.name as CollectionFormMetadataBlock
             }
           })
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/RequiredOptionalRadios.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/RequiredOptionalRadios.tsx
index da995ffca..b11e67327 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/RequiredOptionalRadios.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/RequiredOptionalRadios.tsx
@@ -2,7 +2,11 @@ import { ChangeEvent } from 'react'
 import { Form, Stack } from '@iqss/dataverse-design-system'
 import { Controller, useFormContext, useWatch } from 'react-hook-form'
 import { ReducedMetadataFieldInfo } from '../../../../useGetAllMetadataBlocksInfo'
-import { CollectionFormInputLevelValue, INPUT_LEVELS_GROUPER } from '../../../CollectionForm'
+import {
+  CollectionFormInputLevelValue,
+  INPUT_LEVELS_GROUPER,
+  REQUIRED_BY_DATAVERSE_FIELDS
+} from '../../../CollectionForm'
 
 type RequiredOptionalRadiosProps =
   | {
@@ -47,9 +51,13 @@ export const RequiredOptionalRadios = ({
     e: ChangeEvent<HTMLInputElement>,
     formOnChange: (...event: unknown[]) => void
   ) => {
-    // Check if all siblingChildFields are required then set parent to required also
+    // Check if all siblingChildFields are required then set parent to required also unless parent is required by dataverse
     if (isForChildField) {
-      if (e.target.value === 'required') {
+      const isParentFieldRequiredByDataverseField = REQUIRED_BY_DATAVERSE_FIELDS.includes(
+        parentIncludeName as (typeof REQUIRED_BY_DATAVERSE_FIELDS)[number]
+      )
+      // If parent is required by dataverse, then is already required
+      if (e.target.value === 'required' && !isParentFieldRequiredByDataverseField) {
         const allSiblingsRequired = (
           siblingChildFieldsValues as CollectionFormInputLevelValue[]
         ).every((value) => value === 'required')
@@ -59,7 +67,8 @@ export const RequiredOptionalRadios = ({
         }
       }
 
-      if (e.target.value === 'optional') {
+      // If parent is required by dataverse, then is already required and should not be set to optional
+      if (e.target.value === 'optional' && !isParentFieldRequiredByDataverseField) {
         setValue(`${INPUT_LEVELS_GROUPER}.${parentIncludeName}.optionalOrRequired`, 'optional')
       }
     }
diff --git a/src/sections/create-collection/useGetAllMetadataBlocksInfo.tsx b/src/sections/create-collection/useGetAllMetadataBlocksInfo.tsx
index 21d6f18a0..a78eaaa53 100644
--- a/src/sections/create-collection/useGetAllMetadataBlocksInfo.tsx
+++ b/src/sections/create-collection/useGetAllMetadataBlocksInfo.tsx
@@ -55,8 +55,6 @@ export const useGetAllMetadataBlocksInfo = ({
           blocksNames
         )
 
-        console.log(blocksInfo)
-
         const reducedMetadataBlocksInfo: ReducedMetadataBlockInfo[] = blocksInfo.map(
           (blockInfo) => {
             const formattedMetadataFields: Record<string, ReducedMetadataFieldInfo> =

From 5bd24f6355ae40c0637d5810ebb837d4488218db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Fri, 2 Aug 2024 14:08:49 -0300
Subject: [PATCH 32/52] feat: back to disable button

---
 .../create-collection/collection-form/CollectionForm.tsx  | 5 ++---
 .../input-levels-table/RequiredOptionalRadios.tsx         | 8 ++++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/sections/create-collection/collection-form/CollectionForm.tsx b/src/sections/create-collection/collection-form/CollectionForm.tsx
index 4c2108b96..ca77914a0 100644
--- a/src/sections/create-collection/collection-form/CollectionForm.tsx
+++ b/src/sections/create-collection/collection-form/CollectionForm.tsx
@@ -177,10 +177,9 @@ export const CollectionForm = ({
           </Stack>
 
           <Stack direction="horizontal" className="pt-3">
-            <Button type="submit">{t('formButtons.save')}</Button>
-            {/* <Button type="submit" disabled={disableSubmitButton}>
+            <Button type="submit" disabled={disableSubmitButton}>
               {t('formButtons.save')}
-            </Button> */}
+            </Button>
             <Button
               variant="secondary"
               type="button"
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/RequiredOptionalRadios.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/RequiredOptionalRadios.tsx
index b11e67327..61b6d8c58 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/RequiredOptionalRadios.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/RequiredOptionalRadios.tsx
@@ -28,6 +28,14 @@ type RequiredOptionalRadiosProps =
       uniqueInputLevelRowID: string
     }
 
+/**
+ * Component that renders a pair of radio buttons for selecting if a field is required or optional
+ *
+ * Is used from a normal field or a child field
+ *
+ * If used from a child field, checks if at any moment all siblingChildFields are required then set parent to required also unless parent is required by dataverse
+ */
+
 export const RequiredOptionalRadios = ({
   disabled,
   fieldName,

From 72f8715c79274e24dea872d709916491a2db3687 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Mon, 5 Aug 2024 10:41:40 -0300
Subject: [PATCH 33/52] feat: rename component

---
 .../metadata-fields-section/MetadataFieldsSection.tsx         | 4 ++--
 .../ConfirmResetModificationsModal.tsx                        | 0
 .../FieldsFromParentCheckbox.tsx}                             | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename src/sections/create-collection/collection-form/metadata-fields-section/{fields-from-root-checkbox => fields-from-parent-checkbox}/ConfirmResetModificationsModal.tsx (100%)
 rename src/sections/create-collection/collection-form/metadata-fields-section/{fields-from-root-checkbox/FieldsFromRootCheckbox.tsx => fields-from-parent-checkbox/FieldsFromParentCheckbox.tsx} (95%)

diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx
index 7c2806761..d724178bc 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx
@@ -2,7 +2,7 @@ import { useTranslation } from 'react-i18next'
 import { Col, Form, Row, Stack } from '@iqss/dataverse-design-system'
 import { ReducedMetadataBlockInfo } from '../../useGetAllMetadataBlocksInfo'
 import { MetadataInputLevelFieldsBlock } from './metadata-input-level-fields-block/MetadataInputLevelFieldsBlock'
-import { FieldsFromRootCheckbox } from './fields-from-root-checkbox/FieldsFromRootCheckbox'
+import { FieldsFromParentCheckbox } from './fields-from-parent-checkbox/FieldsFromParentCheckbox'
 import { MetadataBlockName } from '../../../../metadata-block-info/domain/models/MetadataBlockInfo'
 import { CollectionFormHelper } from '../CollectionFormHelper'
 import { CollectionFormData } from '../CollectionForm'
@@ -36,7 +36,7 @@ export const MetadataFieldsSection = ({
         <Form.Group.Text>{t('fields.metadataFields.helperText')}</Form.Group.Text>
         <Col className="mt-3">
           <Stack gap={2}>
-            <FieldsFromRootCheckbox defaultValues={defaultValues} />
+            <FieldsFromParentCheckbox defaultValues={defaultValues} />
 
             <MetadataInputLevelFieldsBlock
               blockName={MetadataBlockName.CITATION}
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-root-checkbox/ConfirmResetModificationsModal.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-parent-checkbox/ConfirmResetModificationsModal.tsx
similarity index 100%
rename from src/sections/create-collection/collection-form/metadata-fields-section/fields-from-root-checkbox/ConfirmResetModificationsModal.tsx
rename to src/sections/create-collection/collection-form/metadata-fields-section/fields-from-parent-checkbox/ConfirmResetModificationsModal.tsx
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-root-checkbox/FieldsFromRootCheckbox.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-parent-checkbox/FieldsFromParentCheckbox.tsx
similarity index 95%
rename from src/sections/create-collection/collection-form/metadata-fields-section/fields-from-root-checkbox/FieldsFromRootCheckbox.tsx
rename to src/sections/create-collection/collection-form/metadata-fields-section/fields-from-parent-checkbox/FieldsFromParentCheckbox.tsx
index 1af51f419..da2de6e4d 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-root-checkbox/FieldsFromRootCheckbox.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-parent-checkbox/FieldsFromParentCheckbox.tsx
@@ -20,11 +20,11 @@ const ALL_INPUT_LEVEL_FIELDS = [
   MetadataBlockName.JOURNAL
 ]
 
-interface FieldsFromRootCheckboxProps {
+interface FieldsFromParentCheckboxProps {
   defaultValues: CollectionFormData
 }
 
-export const FieldsFromRootCheckbox = ({ defaultValues }: FieldsFromRootCheckboxProps) => {
+export const FieldsFromParentCheckbox = ({ defaultValues }: FieldsFromParentCheckboxProps) => {
   const checkboxID = useId()
   const { control, setValue } = useFormContext()
   const [showResetConfirmationModal, setShowResetConfirmationModal] = useState(false)

From 14b79c3bb8b3d49aa025ffaae05069f4c75d6a98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Mon, 5 Aug 2024 11:06:36 -0300
Subject: [PATCH 34/52] feat: use locale

---
 public/locales/en/createCollection.json                     | 3 ++-
 .../FieldsFromParentCheckbox.tsx                            | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/public/locales/en/createCollection.json b/public/locales/en/createCollection.json
index e561c89c7..dea6582cc 100644
--- a/public/locales/en/createCollection.json
+++ b/public/locales/en/createCollection.json
@@ -46,7 +46,8 @@
     },
     "metadataFields": {
       "label": "Metadata Fields",
-      "helperText": "Choose the metadata fields to use in dataset templates and when adding a dataset to this dataverse."
+      "helperText": "Choose the metadata fields to use in dataset templates and when adding a dataset to this dataverse.",
+      "useMetadataFieldsFrom": "Use metadata fields from"
     },
     "browseSearchFacets": {
       "label": "Browse/Search Facets",
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-parent-checkbox/FieldsFromParentCheckbox.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-parent-checkbox/FieldsFromParentCheckbox.tsx
index da2de6e4d..5d32452be 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-parent-checkbox/FieldsFromParentCheckbox.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-parent-checkbox/FieldsFromParentCheckbox.tsx
@@ -1,4 +1,5 @@
 import { ChangeEvent, useId, useState } from 'react'
+import { useTranslation } from 'react-i18next'
 import { Controller, UseControllerProps, useFormContext, useWatch } from 'react-hook-form'
 import { Form } from '@iqss/dataverse-design-system'
 import { MetadataBlockName } from '../../../../../metadata-block-info/domain/models/MetadataBlockInfo'
@@ -25,6 +26,7 @@ interface FieldsFromParentCheckboxProps {
 }
 
 export const FieldsFromParentCheckbox = ({ defaultValues }: FieldsFromParentCheckboxProps) => {
+  const { t } = useTranslation('createCollection')
   const checkboxID = useId()
   const { control, setValue } = useFormContext()
   const [showResetConfirmationModal, setShowResetConfirmationModal] = useState(false)
@@ -74,7 +76,9 @@ export const FieldsFromParentCheckbox = ({ defaultValues }: FieldsFromParentChec
               id={checkboxID}
               onChange={handleChange}
               name={USE_FIELDS_FROM_PARENT}
-              label={`Use metadata fields from ${hostCollectionFieldValue}`}
+              label={`${t(
+                'fields.metadataFields.useMetadataFieldsFrom'
+              )} ${hostCollectionFieldValue}`}
               checked={value as boolean}
               isInvalid={invalid}
               invalidFeedback={error?.message}

From 66a18dbfb1b05de9b840d0bbb5cf297232e4d4fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Mon, 5 Aug 2024 11:39:03 -0300
Subject: [PATCH 35/52] chore: use docker compose v2

---
 dev-env/rm-env.sh  | 2 +-
 dev-env/run-env.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-env/rm-env.sh b/dev-env/rm-env.sh
index 1bf0a3764..69142bdca 100755
--- a/dev-env/rm-env.sh
+++ b/dev-env/rm-env.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-docker-compose -f "./docker-compose-dev.yml" down
+docker compose -f "./docker-compose-dev.yml" down
 rm -rf ./docker-dev-volumes
diff --git a/dev-env/run-env.sh b/dev-env/run-env.sh
index 28ebd20c6..f8014c429 100755
--- a/dev-env/run-env.sh
+++ b/dev-env/run-env.sh
@@ -14,4 +14,4 @@ echo "INFO - Removing current environment if exists..."
 ./rm-env.sh
 
 echo "INFO - Running docker containers..."
-docker-compose -f "./docker-compose-dev.yml" up -d --build
+docker compose -f "./docker-compose-dev.yml" up -d --build

From 1cb0b77fcfa6a89dc6b1a20b154438e6a1603f1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Mon, 5 Aug 2024 13:24:52 -0300
Subject: [PATCH 36/52] feat: required by dataverse by isRequired property

---
 .../collection-form/CollectionForm.tsx        | 10 ---------
 .../collection-form/CollectionFormHelper.ts   | 15 +++++--------
 .../input-levels-table/InputLevelFieldRow.tsx | 22 +++++++------------
 .../RequiredOptionalRadios.tsx                | 18 +++++++--------
 .../useGetAllMetadataBlocksInfo.tsx           | 15 ++++++++-----
 5 files changed, 31 insertions(+), 49 deletions(-)

diff --git a/src/sections/create-collection/collection-form/CollectionForm.tsx b/src/sections/create-collection/collection-form/CollectionForm.tsx
index ca77914a0..24f931ea0 100644
--- a/src/sections/create-collection/collection-form/CollectionForm.tsx
+++ b/src/sections/create-collection/collection-form/CollectionForm.tsx
@@ -20,16 +20,6 @@ import styles from './CollectionForm.module.scss'
 export const METADATA_BLOCKS_NAMES_GROUPER = 'metadataBlockNames'
 export const USE_FIELDS_FROM_PARENT = 'useFieldsFromParent'
 export const INPUT_LEVELS_GROUPER = 'inputLevels'
-export const REQUIRED_BY_DATAVERSE_FIELDS = [
-  'title',
-  'author',
-  'authorName',
-  'datasetContact',
-  'datasetContactEmail',
-  'dsDescription',
-  'dsDescriptionValue',
-  'subject'
-] as const
 
 export interface CollectionFormProps {
   collectionRepository: CollectionRepository
diff --git a/src/sections/create-collection/collection-form/CollectionFormHelper.ts b/src/sections/create-collection/collection-form/CollectionFormHelper.ts
index 6a37b43b9..150807a17 100644
--- a/src/sections/create-collection/collection-form/CollectionFormHelper.ts
+++ b/src/sections/create-collection/collection-form/CollectionFormHelper.ts
@@ -9,8 +9,7 @@ import {
   CollectionFormMetadataBlock,
   CollectionFormMetadataBlocks,
   FormattedCollectionInputLevels,
-  FormattedCollectionInputLevelsWithoutParentBlockName,
-  REQUIRED_BY_DATAVERSE_FIELDS
+  FormattedCollectionInputLevelsWithoutParentBlockName
 } from './CollectionForm'
 
 export class CollectionFormHelper {
@@ -27,26 +26,22 @@ export class CollectionFormHelper {
     allMetadataBlocksInfoReduced.forEach((block) => {
       Object.entries(block.metadataFields).forEach(([_key, field]) => {
         const normalizedFieldName = this.replaceDotWithSlash(field.name)
-        const isRequiredByDataverseField = REQUIRED_BY_DATAVERSE_FIELDS.includes(
-          field.name as (typeof REQUIRED_BY_DATAVERSE_FIELDS)[number]
-        )
+        const isFieldRequiredByDataverse = field.isRequired
 
         fields[normalizedFieldName] = {
           include: true,
-          optionalOrRequired: isRequiredByDataverseField ? 'required' : 'optional',
+          optionalOrRequired: isFieldRequiredByDataverse ? 'required' : 'optional',
           parentBlockName: block.name as CollectionFormMetadataBlock
         }
 
         if (field.childMetadataFields) {
           Object.entries(field.childMetadataFields).forEach(([_key, childField]) => {
             const normalizedFieldName = this.replaceDotWithSlash(childField.name)
-            const isRequiredByDataverseField = REQUIRED_BY_DATAVERSE_FIELDS.includes(
-              childField.name as (typeof REQUIRED_BY_DATAVERSE_FIELDS)[number]
-            )
+            const isChildFieldRequiredByDataverse = childField.isRequired
 
             childFields[normalizedFieldName] = {
               include: true,
-              optionalOrRequired: isRequiredByDataverseField ? 'required' : 'optional',
+              optionalOrRequired: isChildFieldRequiredByDataverse ? 'required' : 'optional',
               parentBlockName: block.name as CollectionFormMetadataBlock
             }
           })
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
index 92c831df3..4568eba6a 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
@@ -3,7 +3,7 @@ import { Controller, UseControllerProps, useFormContext, useWatch } from 'react-
 import cn from 'classnames'
 import { Form } from '@iqss/dataverse-design-system'
 import { ReducedMetadataFieldInfo } from '../../../../useGetAllMetadataBlocksInfo'
-import { INPUT_LEVELS_GROUPER, REQUIRED_BY_DATAVERSE_FIELDS } from '../../../CollectionForm'
+import { INPUT_LEVELS_GROUPER } from '../../../CollectionForm'
 import styles from './InputLevelsTable.module.scss'
 import { CollectionFormHelper } from '../../../CollectionFormHelper'
 import { RequiredOptionalRadios } from './RequiredOptionalRadios'
@@ -21,13 +21,7 @@ export const InputLevelFieldRow = ({ metadataField, disabled }: InputLevelFieldR
     name: `${INPUT_LEVELS_GROUPER}.${metadataField.name}.include`
   }) as boolean
 
-  const { name, displayName, childMetadataFields } = metadataField
-
-  const isRequiredByDataverse = REQUIRED_BY_DATAVERSE_FIELDS.some((field) => field === name)
-
-  const isChildFieldRequiredByDataverse = (fieldName: string) => {
-    return REQUIRED_BY_DATAVERSE_FIELDS.some((field) => field === fieldName)
-  }
+  const { name, displayName, isRequired, childMetadataFields } = metadataField
 
   const rules: UseControllerProps['rules'] = {}
 
@@ -67,17 +61,17 @@ export const InputLevelFieldRow = ({ metadataField, disabled }: InputLevelFieldR
                 onChange={(e) => handleIncludeChange(e, onChange)}
                 label={displayName}
                 checked={Boolean(value as boolean)}
-                disabled={disabled || isRequiredByDataverse}
+                disabled={disabled || isRequired}
                 ref={ref}
               />
             )}
           />
         </td>
         <td>
-          {isRequiredByDataverse && (
+          {isRequired && (
             <span className={styles['required-by-dataverse-label']}>Required by Dataverse</span>
           )}
-          {!childMetadataFields && !isRequiredByDataverse && (
+          {!childMetadataFields && !isRequired && (
             <RequiredOptionalRadios
               disabled={disabled}
               isForChildField={false}
@@ -94,14 +88,13 @@ export const InputLevelFieldRow = ({ metadataField, disabled }: InputLevelFieldR
             <td>
               <label
                 className={cn({
-                  [styles['displayName-disabled']]:
-                    disabled || isChildFieldRequiredByDataverse(childField.name)
+                  [styles['displayName-disabled']]: disabled || childField.isRequired
                 })}>
                 {childField.displayName}
               </label>
             </td>
             <td>
-              {isChildFieldRequiredByDataverse(childField.name) ? (
+              {childField.isRequired ? (
                 <span className={styles['required-by-dataverse-label']}>Required by Dataverse</span>
               ) : (
                 <RequiredOptionalRadios
@@ -112,6 +105,7 @@ export const InputLevelFieldRow = ({ metadataField, disabled }: InputLevelFieldR
                     childField.name
                   )}
                   parentIncludeName={name}
+                  parentIsRequiredByDataverse={isRequired}
                   parentFieldChecked={includeCheckboxValue}
                   uniqueInputLevelRowID={`${uniqueInputLevelRowID}-${childField.name}`}
                   fieldName={`${INPUT_LEVELS_GROUPER}.${childField.name}.optionalOrRequired`}
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/RequiredOptionalRadios.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/RequiredOptionalRadios.tsx
index 61b6d8c58..089bf1946 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/RequiredOptionalRadios.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/RequiredOptionalRadios.tsx
@@ -2,11 +2,7 @@ import { ChangeEvent } from 'react'
 import { Form, Stack } from '@iqss/dataverse-design-system'
 import { Controller, useFormContext, useWatch } from 'react-hook-form'
 import { ReducedMetadataFieldInfo } from '../../../../useGetAllMetadataBlocksInfo'
-import {
-  CollectionFormInputLevelValue,
-  INPUT_LEVELS_GROUPER,
-  REQUIRED_BY_DATAVERSE_FIELDS
-} from '../../../CollectionForm'
+import { CollectionFormInputLevelValue, INPUT_LEVELS_GROUPER } from '../../../CollectionForm'
 
 type RequiredOptionalRadiosProps =
   | {
@@ -15,6 +11,7 @@ type RequiredOptionalRadiosProps =
       isForChildField: true
       siblingChildFields: Record<string, ReducedMetadataFieldInfo>
       parentIncludeName: string
+      parentIsRequiredByDataverse: boolean
       parentFieldChecked: boolean
       uniqueInputLevelRowID: string
     }
@@ -24,6 +21,7 @@ type RequiredOptionalRadiosProps =
       isForChildField?: false
       siblingChildFields?: never
       parentIncludeName?: never
+      parentIsRequiredByDataverse?: never
       parentFieldChecked: boolean
       uniqueInputLevelRowID: string
     }
@@ -36,12 +34,15 @@ type RequiredOptionalRadiosProps =
  * If used from a child field, checks if at any moment all siblingChildFields are required then set parent to required also unless parent is required by dataverse
  */
 
+// TODO:ME Make parent field required if one of the child fields is required
+
 export const RequiredOptionalRadios = ({
   disabled,
   fieldName,
   isForChildField,
   siblingChildFields,
   parentIncludeName,
+  parentIsRequiredByDataverse,
   parentFieldChecked,
   uniqueInputLevelRowID
 }: RequiredOptionalRadiosProps) => {
@@ -61,11 +62,8 @@ export const RequiredOptionalRadios = ({
   ) => {
     // Check if all siblingChildFields are required then set parent to required also unless parent is required by dataverse
     if (isForChildField) {
-      const isParentFieldRequiredByDataverseField = REQUIRED_BY_DATAVERSE_FIELDS.includes(
-        parentIncludeName as (typeof REQUIRED_BY_DATAVERSE_FIELDS)[number]
-      )
       // If parent is required by dataverse, then is already required
-      if (e.target.value === 'required' && !isParentFieldRequiredByDataverseField) {
+      if (e.target.value === 'required' && !parentIsRequiredByDataverse) {
         const allSiblingsRequired = (
           siblingChildFieldsValues as CollectionFormInputLevelValue[]
         ).every((value) => value === 'required')
@@ -76,7 +74,7 @@ export const RequiredOptionalRadios = ({
       }
 
       // If parent is required by dataverse, then is already required and should not be set to optional
-      if (e.target.value === 'optional' && !isParentFieldRequiredByDataverseField) {
+      if (e.target.value === 'optional' && !parentIsRequiredByDataverse) {
         setValue(`${INPUT_LEVELS_GROUPER}.${parentIncludeName}.optionalOrRequired`, 'optional')
       }
     }
diff --git a/src/sections/create-collection/useGetAllMetadataBlocksInfo.tsx b/src/sections/create-collection/useGetAllMetadataBlocksInfo.tsx
index a78eaaa53..181d09422 100644
--- a/src/sections/create-collection/useGetAllMetadataBlocksInfo.tsx
+++ b/src/sections/create-collection/useGetAllMetadataBlocksInfo.tsx
@@ -24,7 +24,10 @@ export interface ReducedMetadataBlockInfo {
   metadataFields: Record<string, ReducedMetadataFieldInfo>
 }
 
-export type ReducedMetadataFieldsAndChildsInfo = Pick<MetadataField, 'name' | 'displayName'>
+export type ReducedMetadataFieldsAndChildsInfo = Pick<
+  MetadataField,
+  'name' | 'displayName' | 'isRequired'
+>
 
 export type ReducedMetadataFieldInfo = ReducedMetadataFieldsAndChildsInfo & {
   childMetadataFields?: Record<string, ReducedMetadataFieldsAndChildsInfo>
@@ -59,25 +62,27 @@ export const useGetAllMetadataBlocksInfo = ({
           (blockInfo) => {
             const formattedMetadataFields: Record<string, ReducedMetadataFieldInfo> =
               Object.entries(blockInfo.metadataFields).reduce((acc, [key, value]) => {
-                const { name, displayName, childMetadataFields } = value
+                const { name, displayName, isRequired, childMetadataFields } = value
                 const replaceDotWithSlash = (str: string) => str.replace(/\./g, '/')
                 const normalizedName = replaceDotWithSlash(name)
 
                 acc[key] = {
                   name: normalizedName,
                   displayName,
+                  isRequired,
                   childMetadataFields: childMetadataFields
                     ? Object.entries(childMetadataFields).reduce((acc, [key, value]) => {
-                        const { name, displayName } = value
+                        const { name, displayName, isRequired } = value
 
                         const normalizedChildfieldName = replaceDotWithSlash(name)
 
                         acc[key] = {
                           name: normalizedChildfieldName,
-                          displayName
+                          displayName,
+                          isRequired
                         }
                         return acc
-                      }, {} as Record<string, Pick<MetadataField, 'name' | 'displayName'>>)
+                      }, {} as Record<string, ReducedMetadataFieldInfo>)
                     : undefined
                 }
                 return acc

From 97173cabc8eb21ab70d86397608d1de6e5ccf2e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Mon, 5 Aug 2024 13:35:35 -0300
Subject: [PATCH 37/52] feat: make parent required if at least one subfield
 becomes required

---
 .../RequiredOptionalRadios.tsx                | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/RequiredOptionalRadios.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/RequiredOptionalRadios.tsx
index 089bf1946..1335fbedd 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/RequiredOptionalRadios.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/RequiredOptionalRadios.tsx
@@ -29,13 +29,9 @@ type RequiredOptionalRadiosProps =
 /**
  * Component that renders a pair of radio buttons for selecting if a field is required or optional
  *
- * Is used from a normal field or a child field
- *
- * If used from a child field, checks if at any moment all siblingChildFields are required then set parent to required also unless parent is required by dataverse
+ * If used from a child field, makes parent field required if one of the child fields is required
  */
 
-// TODO:ME Make parent field required if one of the child fields is required
-
 export const RequiredOptionalRadios = ({
   disabled,
   fieldName,
@@ -60,22 +56,24 @@ export const RequiredOptionalRadios = ({
     e: ChangeEvent<HTMLInputElement>,
     formOnChange: (...event: unknown[]) => void
   ) => {
-    // Check if all siblingChildFields are required then set parent to required also unless parent is required by dataverse
+    // Check if any siblingChildFields is required then set parent to required also unless parent is required by dataverse
     if (isForChildField) {
       // If parent is required by dataverse, then is already required
       if (e.target.value === 'required' && !parentIsRequiredByDataverse) {
-        const allSiblingsRequired = (
-          siblingChildFieldsValues as CollectionFormInputLevelValue[]
-        ).every((value) => value === 'required')
-
-        if (allSiblingsRequired) {
-          setValue(`${INPUT_LEVELS_GROUPER}.${parentIncludeName}.optionalOrRequired`, 'required')
-        }
+        setValue(`${INPUT_LEVELS_GROUPER}.${parentIncludeName}.optionalOrRequired`, 'required')
       }
 
       // If parent is required by dataverse, then is already required and should not be set to optional
       if (e.target.value === 'optional' && !parentIsRequiredByDataverse) {
-        setValue(`${INPUT_LEVELS_GROUPER}.${parentIncludeName}.optionalOrRequired`, 'optional')
+        const isSomeSiblingRequired = (
+          siblingChildFieldsValues as CollectionFormInputLevelValue[]
+        ).some((value) => value === 'required')
+
+        if (!isSomeSiblingRequired) {
+          setValue(`${INPUT_LEVELS_GROUPER}.${parentIncludeName}.optionalOrRequired`, 'optional')
+        } else {
+          setValue(`${INPUT_LEVELS_GROUPER}.${parentIncludeName}.optionalOrRequired`, 'required')
+        }
       }
     }
     formOnChange(e)

From 8b51c8e87496e1d0cc620950a0801ec72b0f6739 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Mon, 5 Aug 2024 15:13:19 -0300
Subject: [PATCH 38/52] fix: use controlId only if not custom select

---
 .../MetadataFormField/Fields/Vocabulary.tsx               | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/sections/shared/form/DatasetMetadataForm/MetadataForm/MetadataBlockFormFields/MetadataFormField/Fields/Vocabulary.tsx b/src/sections/shared/form/DatasetMetadataForm/MetadataForm/MetadataBlockFormFields/MetadataFormField/Fields/Vocabulary.tsx
index 5fae08fa3..96cc95f22 100644
--- a/src/sections/shared/form/DatasetMetadataForm/MetadataForm/MetadataBlockFormFields/MetadataFormField/Fields/Vocabulary.tsx
+++ b/src/sections/shared/form/DatasetMetadataForm/MetadataForm/MetadataBlockFormFields/MetadataFormField/Fields/Vocabulary.tsx
@@ -69,13 +69,17 @@ export const Vocabulary = ({
     return rulesToApply
   }, [rulesToApply, fieldShouldBecomeRequired, displayName, isFieldThatMayBecomeRequired, t])
 
+  const showSelectWithSearch = options.length > 10
+
   return (
     <Controller
       name={builtFieldName}
       control={control}
       rules={updatedRulesToApply}
       render={({ field: { onChange, ref, value }, fieldState: { invalid, error } }) => (
-        <Form.Group controlId={builtFieldName} as={withinMultipleFieldsGroup ? Col : Row}>
+        <Form.Group
+          controlId={!showSelectWithSearch ? builtFieldName : undefined}
+          as={withinMultipleFieldsGroup ? Col : Row}>
           <Form.Group.Label
             message={description}
             required={Boolean(updatedRulesToApply?.required)}
@@ -87,7 +91,7 @@ export const Vocabulary = ({
           <Col sm={withinMultipleFieldsGroup ? 12 : 9}>
             <Row>
               <Col sm={withinMultipleFieldsGroup ? 12 : 9}>
-                {options.length > 10 ? (
+                {showSelectWithSearch ? (
                   <Form.Group.SelectAdvanced
                     defaultValue={value as string}
                     options={options}

From 7aa26985a61a29141db0906b11dd98f0563b51b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Mon, 5 Aug 2024 16:33:56 -0300
Subject: [PATCH 39/52] test: Collection form tests

---
 .../ConfirmResetModificationsModal.tsx        |   6 +-
 .../FieldsFromParentCheckbox.tsx              |   1 +
 .../MetadataInputLevelFieldsBlock.tsx         |   4 +-
 .../domain/models/MetadataBlockInfoMother.ts  |   1 -
 .../create-collection/CollectionForm.spec.tsx | 347 +++++++++++++++++-
 5 files changed, 353 insertions(+), 6 deletions(-)

diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-parent-checkbox/ConfirmResetModificationsModal.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-parent-checkbox/ConfirmResetModificationsModal.tsx
index 619b597c1..a708c9799 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-parent-checkbox/ConfirmResetModificationsModal.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-parent-checkbox/ConfirmResetModificationsModal.tsx
@@ -22,8 +22,10 @@ export const ConfirmResetModificationsModal = ({
       </Alert>
     </Modal.Body>
     <Modal.Footer>
-      <Button onClick={onContinue}>Continue</Button>
-      <Button variant="secondary" onClick={onCancel}>
+      <Button onClick={onContinue} data-testid="confirm-reset-modal-continue">
+        Continue
+      </Button>
+      <Button variant="secondary" onClick={onCancel} data-testid="confirm-reset-modal-cancel">
         Cancel
       </Button>
     </Modal.Footer>
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-parent-checkbox/FieldsFromParentCheckbox.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-parent-checkbox/FieldsFromParentCheckbox.tsx
index 5d32452be..91f38cee5 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-parent-checkbox/FieldsFromParentCheckbox.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-parent-checkbox/FieldsFromParentCheckbox.tsx
@@ -82,6 +82,7 @@ export const FieldsFromParentCheckbox = ({ defaultValues }: FieldsFromParentChec
               checked={value as boolean}
               isInvalid={invalid}
               invalidFeedback={error?.message}
+              data-testid="use-fields-from-parent-checkbox"
               ref={ref}
             />
           )
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
index bcd21eeb8..2404de885 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
@@ -121,13 +121,13 @@ export const MetadataInputLevelFieldsBlock = ({
           metadataBlockCheckedValue &&
           useFieldsFromParentCheckedValue && (
             <Button variant="link" size="sm" type="button" onClick={handleShowInputLevels}>
-              [+] View Fields
+              [+] View fields
             </Button>
           )}
         {/* If just not checked */}
         {!inputLevelsTableStatus.show && !metadataBlockCheckedValue && (
           <Button variant="link" size="sm" type="button" onClick={handleShowInputLevels}>
-            [+] View Fields
+            [+] View fields
           </Button>
         )}
       </Stack>
diff --git a/tests/component/metadata-block-info/domain/models/MetadataBlockInfoMother.ts b/tests/component/metadata-block-info/domain/models/MetadataBlockInfoMother.ts
index c19e20572..b18f42624 100644
--- a/tests/component/metadata-block-info/domain/models/MetadataBlockInfoMother.ts
+++ b/tests/component/metadata-block-info/domain/models/MetadataBlockInfoMother.ts
@@ -39,7 +39,6 @@ export class MetadataBlockInfoMother {
     }
   }
 
-  // TODO:ME Check response of getByNameTemporal hook and update this method
   static getCitationBlock(): MetadataBlockInfo {
     return CitationMetadataBlockInfoMother.get()
   }
diff --git a/tests/component/sections/create-collection/CollectionForm.spec.tsx b/tests/component/sections/create-collection/CollectionForm.spec.tsx
index 11721a53d..5a169df15 100644
--- a/tests/component/sections/create-collection/CollectionForm.spec.tsx
+++ b/tests/component/sections/create-collection/CollectionForm.spec.tsx
@@ -23,6 +23,9 @@ const OWNER_COLLECTION_ID = 'root'
 const COLLECTION_NAME = 'Collection Name'
 const collection = CollectionMother.create({ name: COLLECTION_NAME })
 
+const VIEW_AND_EDIT_FIELDS_LABEL = '[+] View fields + set as hidden, required, or optional'
+const VIEW_FIELDS_LABEL = '[+] View fields'
+
 const allMetadataBlocksMock = [
   MetadataBlockInfoMother.getCitationBlock(),
   MetadataBlockInfoMother.getGeospatialBlock(),
@@ -57,7 +60,6 @@ const defaultBlocksNames = {
   [MetadataBlockName.JOURNAL]: false
 }
 
-// TODO:ME Add missing default values
 const formDefaultValues: CollectionFormData = {
   hostCollection: collection.name,
   name: defaultCollectionName,
@@ -413,4 +415,347 @@ describe('CollectionForm', () => {
       cy.findByLabelText('Remove Email').should('not.exist')
     })
   })
+
+  describe('MetadataFieldsSection functionality', () => {
+    beforeEach(() => {
+      cy.mountAuthenticated(
+        <CollectionForm
+          collectionRepository={collectionRepository}
+          ownerCollectionId={OWNER_COLLECTION_ID}
+          defaultValues={formDefaultValues}
+          allMetadataBlocksInfo={allMetadataBlocksMock}
+        />
+      )
+
+      cy.get('[data-testid="use-fields-from-parent-checkbox"]').as('useFieldsFromParentCheckbox')
+    })
+
+    describe('Use fields from parent checkbox', () => {
+      it('should be checked by default', () => {
+        cy.get('@useFieldsFromParentCheckbox').should('be.checked')
+      })
+
+      it('should open the reset confirmation modal when unchecking and then checking the checkbox again', () => {
+        cy.get('@useFieldsFromParentCheckbox').uncheck({ force: true })
+
+        cy.get('@useFieldsFromParentCheckbox').check({ force: true })
+
+        cy.findByText(/Reset Modifications/).should('exist')
+      })
+
+      it('should close the reset confirmation modal if cancelling without finally checking the checkbox', () => {
+        cy.get('@useFieldsFromParentCheckbox').uncheck({ force: true })
+
+        cy.get('@useFieldsFromParentCheckbox').check({ force: true })
+
+        cy.findByText(/Reset Modifications/).should('exist')
+
+        cy.findByTestId('confirm-reset-modal-cancel').click()
+
+        cy.findByText(/Reset Modifications/).should('not.exist')
+
+        cy.get('@useFieldsFromParentCheckbox').should('not.be.checked')
+      })
+
+      it('should reset the metadata fields when confirming the reset', () => {
+        cy.get('@useFieldsFromParentCheckbox').uncheck()
+
+        // Modify a field in citation block
+        cy.findByRole('button', {
+          name: VIEW_AND_EDIT_FIELDS_LABEL
+        })
+          .should('exist')
+          .click()
+
+        cy.findByLabelText('Subtitle').uncheck({ force: true })
+
+        cy.findByLabelText('Subtitle').should('not.be.checked')
+
+        cy.get('@useFieldsFromParentCheckbox').check({ force: true })
+
+        cy.findByText(/Reset Modifications/).should('exist')
+
+        cy.findByTestId('confirm-reset-modal-continue').click()
+
+        cy.findByText(/Reset Modifications/).should('not.exist')
+
+        cy.get('@useFieldsFromParentCheckbox').should('be.checked')
+
+        // Check if field is back to its original state
+        cy.findAllByRole('button', {
+          name: VIEW_FIELDS_LABEL
+        })
+          .first()
+          .click()
+
+        cy.findByLabelText('Subtitle').should('be.checked')
+      })
+    })
+
+    describe('InputLevelFieldRow', () => {
+      it('On not composed fields - should unclude and include the field when checking the checkbox', () => {
+        cy.get('@useFieldsFromParentCheckbox').uncheck({ force: true })
+
+        // Open citation input levels
+        cy.findByRole('button', {
+          name: VIEW_AND_EDIT_FIELDS_LABEL
+        })
+          .should('exist')
+          .click({ force: true })
+
+        // First unclude the subtitle field
+        cy.findByLabelText('Subtitle').uncheck({ force: true })
+
+        cy.findByLabelText('Subtitle').should('not.be.checked')
+
+        // Go to parent td of Subtitle field and find sibling td to check if Hidden checkbox is there
+        cy.findByLabelText('Subtitle')
+          .closest('td')
+          .next()
+          .within(() => {
+            cy.findByLabelText('Hidden').should('exist').should('be.checked')
+          })
+
+        // Second include the subtitle field
+        cy.findByLabelText('Subtitle').check({ force: true })
+        cy.findByLabelText('Subtitle').should('be.checked')
+
+        // Go to parent td of Subtitle field and find sibling td to check if Hidden checkbox is not there anymore
+        cy.findByLabelText('Subtitle')
+          .closest('td')
+          .next()
+          .within(() => {
+            cy.findByLabelText('Hidden').should('not.exist')
+          })
+      })
+
+      it('On composed fields - should unclude and include the child field when checking the checkbox', () => {
+        cy.get('@useFieldsFromParentCheckbox').uncheck({ force: true })
+
+        // Open citation input levels
+        cy.findByRole('button', {
+          name: VIEW_AND_EDIT_FIELDS_LABEL
+        })
+          .should('exist')
+          .click()
+
+        // First unclude the other identifier composed field
+        cy.findByLabelText('Other Identifier').uncheck({ force: true })
+
+        cy.findByLabelText('Other Identifier').should('not.be.checked')
+
+        // Go to child fields rows and check if Hidden checkbox is there
+        cy.findByText('Other Identifier Agency', { exact: true })
+          .closest('td')
+          .next()
+          .within(() => {
+            cy.findByLabelText('Hidden').should('exist').should('be.checked')
+          })
+
+        cy.findByText('Other Identifier Identifier', { exact: true })
+          .closest('td')
+          .next()
+          .within(() => {
+            cy.findByLabelText('Hidden').should('exist').should('be.checked')
+          })
+
+        // Second include the other identifier composed fields
+        cy.findByLabelText('Other Identifier').check({ force: true })
+        cy.findByLabelText('Other Identifier').should('be.checked')
+
+        // Go to child fields rows and check if Hidden checkbox is not there anymore and they optional checkbox is checked
+        cy.findByText('Other Identifier Agency', { exact: true })
+          .closest('td')
+          .next()
+          .within(() => {
+            cy.findByLabelText('Hidden').should('not.exist')
+            cy.findByLabelText('Optional').should('be.checked')
+          })
+
+        cy.findByText('Other Identifier Identifier', { exact: true })
+          .closest('td')
+          .next()
+          .within(() => {
+            cy.findByLabelText('Hidden').should('not.exist')
+            cy.findByLabelText('Optional').should('be.checked')
+          })
+      })
+
+      it('On not composed fields - should select correctly the Required or Optional radios', () => {
+        cy.get('@useFieldsFromParentCheckbox').uncheck({ force: true })
+
+        // Open citation input levels
+        cy.findByRole('button', {
+          name: VIEW_AND_EDIT_FIELDS_LABEL
+        })
+          .should('exist')
+          .click()
+
+        // Go to parent td of Subtitle field and find sibling td to select the Required radio
+        cy.findByLabelText('Subtitle')
+          .closest('td')
+          .next()
+          .within(() => {
+            cy.findByLabelText('Required').should('exist').should('not.be.checked')
+            cy.findByLabelText('Optional').should('exist').should('be.checked')
+
+            cy.findByLabelText('Required').check({ force: true })
+            cy.findByLabelText('Required').should('be.checked')
+            cy.findByLabelText('Optional').should('not.be.checked')
+
+            cy.findByLabelText('Optional').check({ force: true })
+            cy.findByLabelText('Optional').should('be.checked')
+            cy.findByLabelText('Required').should('not.be.checked')
+          })
+
+        // Second set the subtitle field as optional
+        // cy.findByLabelText('Subtitle').uncheck({ force: true })
+
+        // // Go to parent td of Subtitle field and find sibling td to check if Optional radio is there
+        // cy.findByLabelText('Subtitle')
+        //   .closest('td')
+        //   .next()
+        //   .next()
+        //   .within(() => {
+        //     cy.findByLabelText('Optional').should('exist').should('be.checked')
+        //   })
+      })
+
+      it('On composed fields - should select correctly the Required or Optional radios of child fields', () => {
+        cy.get('@useFieldsFromParentCheckbox').uncheck({ force: true })
+
+        // Open citation input levels
+        cy.findByRole('button', {
+          name: VIEW_AND_EDIT_FIELDS_LABEL
+        })
+          .should('exist')
+          .click()
+
+        // Go to child fields row and check if Required radio is there and perform the check/uncheck
+        cy.findByText('Other Identifier Identifier', { exact: true })
+          .closest('td')
+          .next()
+          .within(() => {
+            cy.findByLabelText('Required').should('exist').should('not.be.checked')
+            cy.findByLabelText('Optional').should('exist').should('be.checked')
+
+            cy.findByLabelText('Required').check({ force: true })
+            cy.findByLabelText('Required').should('be.checked')
+            cy.findByLabelText('Optional').should('not.be.checked')
+          })
+
+        cy.findByText('Other Identifier Agency', { exact: true })
+          .closest('td')
+          .next()
+          .within(() => {
+            cy.findByLabelText('Required').should('exist').should('not.be.checked')
+            cy.findByLabelText('Optional').should('exist').should('be.checked')
+
+            cy.findByLabelText('Required').check({ force: true })
+            cy.findByLabelText('Required').should('be.checked')
+            cy.findByLabelText('Optional').should('not.be.checked')
+
+            cy.findByLabelText('Optional').check({ force: true })
+            cy.findByLabelText('Optional').should('be.checked')
+            cy.findByLabelText('Required').should('not.be.checked')
+          })
+
+        cy.findByText('Other Identifier Identifier', { exact: true })
+          .closest('td')
+          .next()
+          .within(() => {
+            cy.findByLabelText('Optional').check({ force: true })
+          })
+
+        cy.findByText('Other Identifier Agency', { exact: true })
+          .closest('td')
+          .next()
+          .within(() => {
+            cy.findByLabelText('Required').should('exist').should('not.be.checked')
+            cy.findByLabelText('Optional').should('exist').should('be.checked')
+
+            cy.findByLabelText('Required').check({ force: true })
+            cy.findByLabelText('Required').should('be.checked')
+            cy.findByLabelText('Optional').should('not.be.checked')
+
+            cy.findByLabelText('Optional').check({ force: true })
+            cy.findByLabelText('Optional').should('be.checked')
+            cy.findByLabelText('Required').should('not.be.checked')
+          })
+      })
+    })
+
+    describe('Opens input levels table correctly on different states', () => {
+      it('should open the Citation input levels on view mode', () => {
+        // cy.get('@useFieldsFromParentCheckbox').uncheck({ force: true })
+
+        cy.findAllByRole('button', {
+          name: VIEW_FIELDS_LABEL
+        })
+          .first()
+          .should('exist')
+          .click()
+
+        cy.findByRole('table').should('exist').should('be.visible')
+
+        cy.findByRole('table').within(() => {
+          cy.findByText('Title').should('be.visible')
+          cy.findByLabelText('Subtitle').should('be.visible').should('be.disabled')
+        })
+
+        // Close the table
+        cy.findAllByLabelText('Hide input levels table').first().click()
+
+        cy.findByRole('table').should('not.exist')
+      })
+
+      it('should open the Citation input levels on edit mode', () => {
+        cy.get('@useFieldsFromParentCheckbox').uncheck({ force: true })
+
+        cy.findByRole('button', {
+          name: VIEW_AND_EDIT_FIELDS_LABEL
+        })
+          .should('exist')
+          .click()
+
+        cy.findByRole('table').should('exist').should('be.visible')
+
+        cy.findByRole('table').within(() => {
+          cy.findByText('Title').should('be.visible')
+          cy.findByLabelText('Subtitle').should('be.visible').should('not.be.disabled')
+        })
+
+        // Close the table
+        cy.findAllByLabelText('Hide input levels table').first().click()
+
+        cy.findByRole('table').should('not.exist')
+      })
+
+      it('should enable fields when opening an input levels table on view mode and checking the block name checkbox', () => {
+        cy.get('@useFieldsFromParentCheckbox').uncheck({ force: true })
+
+        cy.findAllByRole('button', {
+          name: VIEW_FIELDS_LABEL
+        })
+          .first()
+          .should('exist')
+          .click()
+
+        cy.findByRole('table').should('exist').should('be.visible')
+
+        cy.findByRole('table').within(() => {
+          cy.findByLabelText('Geographic Unit').should('exist').should('be.disabled')
+        })
+
+        // Now check the Geospatial block name checkbox
+        cy.findByLabelText('Geospatial Metadata').check({ force: true })
+
+        cy.findByRole('table').should('exist').should('be.visible')
+
+        cy.findByRole('table').within(() => {
+          cy.findByLabelText('Geographic Unit').should('exist').should('not.be.disabled')
+        })
+      })
+    })
+  })
 })

From 4a201fd1d7e932b7a4a8e199b4ee82eab908d6d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Mon, 5 Aug 2024 17:25:17 -0300
Subject: [PATCH 40/52] test: helper tests

---
 .../MetadataFormField/Fields/Vocabulary.tsx   |   1 +
 .../CollectionFormHelper.spec.ts              | 262 ++++++++++++++++++
 2 files changed, 263 insertions(+)
 create mode 100644 tests/component/sections/create-collection/CollectionFormHelper.spec.ts

diff --git a/src/sections/shared/form/DatasetMetadataForm/MetadataForm/MetadataBlockFormFields/MetadataFormField/Fields/Vocabulary.tsx b/src/sections/shared/form/DatasetMetadataForm/MetadataForm/MetadataBlockFormFields/MetadataFormField/Fields/Vocabulary.tsx
index 96cc95f22..6268ffff9 100644
--- a/src/sections/shared/form/DatasetMetadataForm/MetadataForm/MetadataBlockFormFields/MetadataFormField/Fields/Vocabulary.tsx
+++ b/src/sections/shared/form/DatasetMetadataForm/MetadataForm/MetadataBlockFormFields/MetadataFormField/Fields/Vocabulary.tsx
@@ -85,6 +85,7 @@ export const Vocabulary = ({
             required={Boolean(updatedRulesToApply?.required)}
             column={!withinMultipleFieldsGroup}
             className={styles['field-label']}
+            htmlFor={builtFieldName}
             sm={3}>
             {title}
           </Form.Group.Label>
diff --git a/tests/component/sections/create-collection/CollectionFormHelper.spec.ts b/tests/component/sections/create-collection/CollectionFormHelper.spec.ts
new file mode 100644
index 000000000..e56769f75
--- /dev/null
+++ b/tests/component/sections/create-collection/CollectionFormHelper.spec.ts
@@ -0,0 +1,262 @@
+import { CollectionInputLevel } from '../../../../src/collection/domain/models/Collection'
+import { CollectionInputLevelDTO } from '../../../../src/collection/domain/useCases/DTOs/CollectionDTO'
+import {
+  CollectionFormMetadataBlock,
+  FormattedCollectionInputLevels,
+  FormattedCollectionInputLevelsWithoutParentBlockName
+} from '../../../../src/sections/create-collection/collection-form/CollectionForm'
+import { CollectionFormHelper } from '../../../../src/sections/create-collection/collection-form/CollectionFormHelper'
+import {
+  ReducedMetadataBlockInfo,
+  ReducedMetadataFieldInfo
+} from '../../../../src/sections/create-collection/useGetAllMetadataBlocksInfo'
+
+const allMetadataBlocksInfoReducedMock: ReducedMetadataBlockInfo[] = [
+  {
+    id: 4,
+    name: 'astrophysics',
+    displayName: 'Astronomy and Astrophysics Metadata',
+    metadataFields: {
+      requiredField: {
+        name: 'requiredField',
+        displayName: 'Spatial Resolution',
+        isRequired: true
+      },
+      'coverage.Spectral.Wavelength': {
+        name: 'coverage.Spectral.Wavelength',
+        displayName: 'Wavelength Range',
+        isRequired: false,
+        childMetadataFields: {
+          'coverage.Spectral.MinimumWavelength': {
+            name: 'coverage.Spectral.MinimumWavelength',
+            displayName: 'Wavelength Range Minimum (m)',
+            isRequired: false
+          },
+          bar: {
+            name: 'bar',
+            displayName: 'Bar',
+            isRequired: true
+          }
+        }
+      }
+    }
+  }
+]
+
+const expectedBaseInputLevels: FormattedCollectionInputLevels = {
+  bar: {
+    include: true,
+    optionalOrRequired: 'required',
+    parentBlockName: 'astrophysics' as CollectionFormMetadataBlock
+  },
+  'coverage/Spectral/MinimumWavelength': {
+    include: true,
+    optionalOrRequired: 'optional',
+    parentBlockName: 'astrophysics' as CollectionFormMetadataBlock
+  },
+  'coverage/Spectral/Wavelength': {
+    include: true,
+    optionalOrRequired: 'optional',
+    parentBlockName: 'astrophysics' as CollectionFormMetadataBlock
+  },
+  requiredField: {
+    include: true,
+    optionalOrRequired: 'required',
+    parentBlockName: 'astrophysics' as CollectionFormMetadataBlock
+  }
+}
+
+describe('CollectionFormHelper', () => {
+  it('defineBaseInputLevels helper', () => {
+    const result = CollectionFormHelper.defineBaseInputLevels(allMetadataBlocksInfoReducedMock)
+
+    expect(result).to.deep.equal(expectedBaseInputLevels)
+  })
+
+  it('formatCollectiontInputLevels', () => {
+    const collectionInputLevels: CollectionInputLevel[] = [
+      {
+        datasetFieldName: 'coverage.Spectral.Wavelength',
+        include: true,
+        required: false
+      },
+      {
+        datasetFieldName: 'bar',
+        include: true,
+        required: true
+      }
+    ]
+
+    const result = CollectionFormHelper.formatCollectiontInputLevels(collectionInputLevels)
+    const undefinedResult = CollectionFormHelper.formatCollectiontInputLevels(undefined)
+
+    expect(result).to.deep.equal({
+      bar: {
+        include: true,
+        optionalOrRequired: 'required'
+      },
+      'coverage/Spectral/Wavelength': {
+        include: true,
+        optionalOrRequired: 'optional'
+      }
+    })
+
+    expect(undefinedResult).to.deep.equal({})
+  })
+
+  it('mergeBaseAndDefaultInputLevels', () => {
+    const baseInputLevels: FormattedCollectionInputLevels = {
+      'coverage/Spectral/Wavelength': {
+        include: true,
+        optionalOrRequired: 'optional',
+        parentBlockName: 'astrophysics' as CollectionFormMetadataBlock
+      },
+      foo: {
+        include: true,
+        optionalOrRequired: 'optional',
+        parentBlockName: 'astrophysics' as CollectionFormMetadataBlock
+      }
+    }
+
+    const formattedCollectionInputLevels: FormattedCollectionInputLevelsWithoutParentBlockName = {
+      'coverage/Spectral/Wavelength': {
+        include: true,
+        optionalOrRequired: 'optional'
+      },
+      foo: {
+        include: true,
+        optionalOrRequired: 'required'
+      }
+    }
+    const result = CollectionFormHelper.mergeBaseAndDefaultInputLevels(
+      baseInputLevels,
+      formattedCollectionInputLevels
+    )
+
+    expect(result).to.deep.equal({
+      'coverage/Spectral/Wavelength': {
+        include: true,
+        optionalOrRequired: 'optional',
+        parentBlockName: 'astrophysics' as CollectionFormMetadataBlock
+      },
+      foo: {
+        include: true,
+        optionalOrRequired: 'required',
+        parentBlockName: 'astrophysics' as CollectionFormMetadataBlock
+      }
+    })
+  })
+
+  it('formatFormMetadataBlockNamesToMetadataBlockNamesDTO', () => {
+    const formMetadataBlockNames = {
+      citation: true,
+      geospatial: false,
+      socialscience: true,
+      astrophysics: false,
+      biomedical: true,
+      journal: false
+    }
+
+    const result =
+      CollectionFormHelper.formatFormMetadataBlockNamesToMetadataBlockNamesDTO(
+        formMetadataBlockNames
+      )
+
+    expect(result).to.deep.equal(['citation', 'socialscience', 'biomedical'])
+  })
+
+  it('formatFormInputLevelsToInputLevelsDTO', () => {
+    const metadataBlockNamesSelected = ['citation', 'socialscience']
+    const formCollectionInputLevels: FormattedCollectionInputLevels = {
+      title: {
+        include: true,
+        optionalOrRequired: 'required',
+        parentBlockName: 'citation' as CollectionFormMetadataBlock
+      },
+      subtitle: {
+        include: true,
+        optionalOrRequired: 'optional',
+        parentBlockName: 'citation' as CollectionFormMetadataBlock
+      },
+      foo: {
+        include: true,
+        optionalOrRequired: 'required',
+        parentBlockName: 'socialscience' as CollectionFormMetadataBlock
+      },
+      bar: {
+        include: true,
+        optionalOrRequired: 'optional',
+        parentBlockName: 'socialscience' as CollectionFormMetadataBlock
+      }
+    }
+
+    const expectedResult: CollectionInputLevelDTO[] = [
+      {
+        datasetFieldName: 'title',
+        include: true,
+        required: true
+      },
+      {
+        datasetFieldName: 'subtitle',
+        include: true,
+        required: false
+      },
+      {
+        datasetFieldName: 'foo',
+        include: true,
+        required: true
+      },
+      {
+        datasetFieldName: 'bar',
+        include: true,
+        required: false
+      }
+    ]
+
+    const result = CollectionFormHelper.formatFormInputLevelsToInputLevelsDTO(
+      metadataBlockNamesSelected,
+      formCollectionInputLevels
+    )
+
+    expect(result).to.deep.equal(expectedResult)
+  })
+
+  it('getChildFieldSiblings', () => {
+    const childMetadataFields: Record<string, ReducedMetadataFieldInfo> = {
+      'coverage.Spectral.MinimumWavelength': {
+        name: 'coverage.Spectral.MinimumWavelength',
+        displayName: 'Wavelength Range Minimum (m)',
+        isRequired: false
+      },
+      bar: {
+        name: 'bar',
+        displayName: 'Bar',
+        isRequired: true
+      },
+      foo: {
+        name: 'foo',
+        displayName: 'Foo',
+        isRequired: false
+      }
+    }
+    const targetChildFieldName = 'bar'
+
+    const result = CollectionFormHelper.getChildFieldSiblings(
+      childMetadataFields,
+      targetChildFieldName
+    )
+
+    expect(result).to.deep.equal({
+      'coverage.Spectral.MinimumWavelength': {
+        name: 'coverage.Spectral.MinimumWavelength',
+        displayName: 'Wavelength Range Minimum (m)',
+        isRequired: false
+      },
+      foo: {
+        name: 'foo',
+        displayName: 'Foo',
+        isRequired: false
+      }
+    })
+  })
+})

From 39e098a6de1cd49ed2eb8d60b92fa763407bcc17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Tue, 6 Aug 2024 09:01:40 -0300
Subject: [PATCH 41/52] feat: add locales

---
 .../components/form/form-group/FormGroup.tsx  |  1 -
 public/locales/en/createCollection.json       | 20 +++++++-
 .../MetadataFieldsSection.tsx                 | 18 ++++----
 .../ConfirmResetModificationsModal.tsx        | 46 ++++++++++---------
 .../MetadataInputLevelFieldsBlock.tsx         |  6 ++-
 .../input-levels-table/InputLevelFieldRow.tsx | 12 ++++-
 6 files changed, 67 insertions(+), 36 deletions(-)

diff --git a/packages/design-system/src/lib/components/form/form-group/FormGroup.tsx b/packages/design-system/src/lib/components/form/form-group/FormGroup.tsx
index 48ceaf664..3a7061f94 100644
--- a/packages/design-system/src/lib/components/form/form-group/FormGroup.tsx
+++ b/packages/design-system/src/lib/components/form/form-group/FormGroup.tsx
@@ -9,7 +9,6 @@ import { Col, ColProps } from '../../grid/Col'
 import { Row } from '../../grid/Row'
 import { FormCheckbox } from './form-element/FormCheckbox'
 import { FormFeedback } from './form-element/FormFeedback'
-import { FormRadio } from './form-element/FormRadio'
 import { FormSelectAdvanced } from './form-element/FormSelectAdvanced'
 import { FormRadio } from './form-element/FormRadio'
 
diff --git a/public/locales/en/createCollection.json b/public/locales/en/createCollection.json
index dea6582cc..040639f83 100644
--- a/public/locales/en/createCollection.json
+++ b/public/locales/en/createCollection.json
@@ -45,15 +45,31 @@
       "invalid": "Email is not a valid email"
     },
     "metadataFields": {
-      "label": "Metadata Fields",
+      "sectionLabel": "Metadata Fields",
       "helperText": "Choose the metadata fields to use in dataset templates and when adding a dataset to this dataverse.",
-      "useMetadataFieldsFrom": "Use metadata fields from"
+      "useMetadataFieldsFrom": "Use metadata fields from",
+      "citationMetadata": "Citation Metadata (Required)",
+      "geospatialMetadata": "Geospatial Metadata",
+      "socialScienceMetadata": "Social Science and Humanities Metadata",
+      "astrophysicsMetadata": "Astronomy and Astrophysics Metadata",
+      "biomedicalMetadata": "Life Sciences Metadata",
+      "journalMetadata": "Journal Metadata",
+      "inputLevelsTable": {
+        "hideTableAriaLabel": "Hide input levels table",
+        "requiredByDataverse": "Required by Dataverse"
+      }
     },
     "browseSearchFacets": {
       "label": "Browse/Search Facets",
       "helperText": "Choose the metadata fields to use as facets for browsing datasets and dataverses in this dataverse."
     }
   },
+  "confirmResetModal": {
+    "title": "Reset Modifications",
+    "warning": "Are you sure you want to reset the selected metadata fields? If you do this, any customizations (hidden, required, optional) you have done will no longer appear.",
+    "continue": "Continue",
+    "cancel": "Cancel"
+  },
   "submitStatus": {
     "success": "Collection created successfully."
   },
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx
index d724178bc..1593d7206 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx
@@ -16,7 +16,7 @@ export const MetadataFieldsSection = ({
   allMetadataBlocksInfo,
   defaultValues
 }: MetadataFieldsSectionProps) => {
-  const { t } = useTranslation('createCollection')
+  const { t } = useTranslation('createCollection', { keyPrefix: 'fields.metadataFields' })
 
   const {
     citationBlock,
@@ -30,42 +30,42 @@ export const MetadataFieldsSection = ({
   return (
     <Row>
       <Col lg={3}>
-        <Form.Group.Label>{t('fields.metadataFields.label')}</Form.Group.Label>
+        <Form.Group.Label>{t('sectionLabel')}</Form.Group.Label>
       </Col>
       <Col lg={9}>
-        <Form.Group.Text>{t('fields.metadataFields.helperText')}</Form.Group.Text>
+        <Form.Group.Text>{t('helperText')}</Form.Group.Text>
         <Col className="mt-3">
           <Stack gap={2}>
             <FieldsFromParentCheckbox defaultValues={defaultValues} />
 
             <MetadataInputLevelFieldsBlock
               blockName={MetadataBlockName.CITATION}
-              blockDisplayName="Citation Metadata (Required)"
+              blockDisplayName={t('citationMetadata')}
               reducedMetadataBlockInfo={citationBlock}
             />
             <MetadataInputLevelFieldsBlock
               blockName={MetadataBlockName.GEOSPATIAL}
-              blockDisplayName="Geospatial Metadata"
+              blockDisplayName={t('geospatialMetadata')}
               reducedMetadataBlockInfo={geospatialBlock}
             />
             <MetadataInputLevelFieldsBlock
               blockName={MetadataBlockName.SOCIAL_SCIENCE}
-              blockDisplayName="Social Science and Humanities Metadata"
+              blockDisplayName={t('socialScienceMetadata')}
               reducedMetadataBlockInfo={socialScienceBlock}
             />
             <MetadataInputLevelFieldsBlock
               blockName={MetadataBlockName.ASTROPHYSICS}
-              blockDisplayName="Astronomy and Astrophysics Metadata"
+              blockDisplayName={t('astrophysicsMetadata')}
               reducedMetadataBlockInfo={astrophysicsBlock}
             />
             <MetadataInputLevelFieldsBlock
               blockName={MetadataBlockName.BIOMEDICAL}
-              blockDisplayName="Life Sciences Metadata"
+              blockDisplayName={t('biomedicalMetadata')}
               reducedMetadataBlockInfo={biomedicalBlock}
             />
             <MetadataInputLevelFieldsBlock
               blockName={MetadataBlockName.JOURNAL}
-              blockDisplayName="Journal Metadata"
+              blockDisplayName={t('journalMetadata')}
               reducedMetadataBlockInfo={journalBlock}
             />
           </Stack>
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-parent-checkbox/ConfirmResetModificationsModal.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-parent-checkbox/ConfirmResetModificationsModal.tsx
index a708c9799..9412b8fb9 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-parent-checkbox/ConfirmResetModificationsModal.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/fields-from-parent-checkbox/ConfirmResetModificationsModal.tsx
@@ -1,4 +1,5 @@
 import { Alert, Button, Modal } from '@iqss/dataverse-design-system'
+import { useTranslation } from 'react-i18next'
 
 interface ConfirmResetModificationsModalProps {
   showModal: boolean
@@ -10,24 +11,27 @@ export const ConfirmResetModificationsModal = ({
   showModal,
   onContinue,
   onCancel
-}: ConfirmResetModificationsModalProps) => (
-  <Modal show={showModal} onHide={onCancel} size="xl">
-    <Modal.Header>
-      <Modal.Title>Reset Modifications</Modal.Title>
-    </Modal.Header>
-    <Modal.Body>
-      <Alert variant="warning" dismissible={false}>
-        Are you sure you want to reset the selected metadata fields? If you do this, any
-        customizations (hidden, required, optional) you have done will no longer appear.
-      </Alert>
-    </Modal.Body>
-    <Modal.Footer>
-      <Button onClick={onContinue} data-testid="confirm-reset-modal-continue">
-        Continue
-      </Button>
-      <Button variant="secondary" onClick={onCancel} data-testid="confirm-reset-modal-cancel">
-        Cancel
-      </Button>
-    </Modal.Footer>
-  </Modal>
-)
+}: ConfirmResetModificationsModalProps) => {
+  const { t } = useTranslation('createCollection', { keyPrefix: 'confirmResetModal' })
+
+  return (
+    <Modal show={showModal} onHide={onCancel} size="xl">
+      <Modal.Header>
+        <Modal.Title>{t('title')}</Modal.Title>
+      </Modal.Header>
+      <Modal.Body>
+        <Alert variant="warning" dismissible={false}>
+          {t('warning')}
+        </Alert>
+      </Modal.Body>
+      <Modal.Footer>
+        <Button onClick={onContinue} data-testid="confirm-reset-modal-continue">
+          {t('continue')}
+        </Button>
+        <Button variant="secondary" onClick={onCancel} data-testid="confirm-reset-modal-cancel">
+          {t('cancel')}
+        </Button>
+      </Modal.Footer>
+    </Modal>
+  )
+}
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
index 2404de885..e3c0d67d9 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/MetadataInputLevelFieldsBlock.tsx
@@ -6,6 +6,7 @@ import { MetadataBlockName } from '../../../../../metadata-block-info/domain/mod
 import { ReducedMetadataBlockInfo } from '../../../useGetAllMetadataBlocksInfo'
 import { METADATA_BLOCKS_NAMES_GROUPER, USE_FIELDS_FROM_PARENT } from '../../CollectionForm'
 import { InputLevelsTable } from './input-levels-table/InputLevelsTable'
+import { useTranslation } from 'react-i18next'
 
 interface MetadataInputLevelFieldsBlockProps {
   blockName: MetadataBlockName
@@ -20,6 +21,9 @@ export const MetadataInputLevelFieldsBlock = ({
 }: MetadataInputLevelFieldsBlockProps) => {
   const checkboxID = useId()
   const { control } = useFormContext()
+  const { t } = useTranslation('createCollection', {
+    keyPrefix: 'fields.metadataFields.inputLevelsTable'
+  })
 
   const [inputLevelsTableStatus, setInputLevelsTableStatus] = useState({
     show: false,
@@ -139,7 +143,7 @@ export const MetadataInputLevelFieldsBlock = ({
         closeButton={
           <CloseButton
             onClick={handleHideInputLevelsTable}
-            aria-label="Hide input levels table"
+            aria-label={t('hideTableAriaLabel')}
             tabIndex={inputLevelsTableStatus.show ? 0 : -1}
           />
         }
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
index 4568eba6a..94a5d50e1 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
@@ -7,6 +7,7 @@ import { INPUT_LEVELS_GROUPER } from '../../../CollectionForm'
 import styles from './InputLevelsTable.module.scss'
 import { CollectionFormHelper } from '../../../CollectionFormHelper'
 import { RequiredOptionalRadios } from './RequiredOptionalRadios'
+import { useTranslation } from 'react-i18next'
 
 interface InputLevelFieldRowProps {
   metadataField: ReducedMetadataFieldInfo
@@ -14,6 +15,9 @@ interface InputLevelFieldRowProps {
 }
 
 export const InputLevelFieldRow = ({ metadataField, disabled }: InputLevelFieldRowProps) => {
+  const { t } = useTranslation('createCollection', {
+    keyPrefix: 'fields.metadataFields.inputLevelsTable'
+  })
   const uniqueInputLevelRowID = useId()
   const { control, setValue } = useFormContext()
 
@@ -69,7 +73,9 @@ export const InputLevelFieldRow = ({ metadataField, disabled }: InputLevelFieldR
         </td>
         <td>
           {isRequired && (
-            <span className={styles['required-by-dataverse-label']}>Required by Dataverse</span>
+            <span className={styles['required-by-dataverse-label']}>
+              {t('requiredByDataverse')}
+            </span>
           )}
           {!childMetadataFields && !isRequired && (
             <RequiredOptionalRadios
@@ -95,7 +101,9 @@ export const InputLevelFieldRow = ({ metadataField, disabled }: InputLevelFieldR
             </td>
             <td>
               {childField.isRequired ? (
-                <span className={styles['required-by-dataverse-label']}>Required by Dataverse</span>
+                <span className={styles['required-by-dataverse-label']}>
+                  {t('requiredByDataverse')}
+                </span>
               ) : (
                 <RequiredOptionalRadios
                   disabled={disabled}

From 9da36b472c84a237d8796ca56970f24379ba4317 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Tue, 6 Aug 2024 09:12:41 -0300
Subject: [PATCH 42/52] feat: improve AlertProvider tests

---
 .../sections/alerts/AlertProvider.spec.tsx    | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 tests/component/sections/alerts/AlertProvider.spec.tsx

diff --git a/tests/component/sections/alerts/AlertProvider.spec.tsx b/tests/component/sections/alerts/AlertProvider.spec.tsx
new file mode 100644
index 000000000..ea3c0ba7a
--- /dev/null
+++ b/tests/component/sections/alerts/AlertProvider.spec.tsx
@@ -0,0 +1,59 @@
+import { useAlertContext } from '../../../../src/sections/alerts/AlertContext'
+import { AlertProvider } from '../../../../src/sections/alerts/AlertProvider'
+import { AlertMessageKey } from '../../../../src/alert/domain/models/Alert'
+
+describe('AlertProvider', () => {
+  const Component = () => {
+    const { alerts, addAlert, removeAlert } = useAlertContext()
+
+    return (
+      <div>
+        <button
+          onClick={() =>
+            addAlert({ messageKey: AlertMessageKey.METADATA_UPDATED, variant: 'info' })
+          }>
+          Add Alert
+        </button>
+        <button onClick={() => removeAlert(AlertMessageKey.METADATA_UPDATED)}>Remove Alert</button>
+        {alerts.map((alert, index) => (
+          <div key={index}>{alert.messageKey}</div>
+        ))}
+      </div>
+    )
+  }
+
+  it('should add an alert', () => {
+    cy.mount(
+      <AlertProvider>
+        <Component />
+      </AlertProvider>
+    )
+
+    cy.findByRole('button', { name: /Add Alert/ }).click()
+    cy.findByText(AlertMessageKey.METADATA_UPDATED).should('exist')
+  })
+
+  it('should remove an alert', () => {
+    cy.mount(
+      <AlertProvider>
+        <Component />
+      </AlertProvider>
+    )
+
+    cy.findByRole('button', { name: /Add Alert/ }).click()
+    cy.findByRole('button', { name: /Remove Alert/ }).click()
+    cy.findByText(AlertMessageKey.METADATA_UPDATED).should('not.exist')
+  })
+
+  it('should not add the same alert twice', () => {
+    cy.mount(
+      <AlertProvider>
+        <Component />
+      </AlertProvider>
+    )
+
+    cy.findByRole('button', { name: /Add Alert/ }).click()
+    cy.findByRole('button', { name: /Add Alert/ }).click()
+    cy.findAllByText(AlertMessageKey.METADATA_UPDATED).should('have.length', 1)
+  })
+})

From 8f4769f947e08e9cfe434e67b8ec7d716bdbfc87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Tue, 6 Aug 2024 09:27:28 -0300
Subject: [PATCH 43/52] fix: avoid boostrap warning

---
 .../MetadataFormField/Fields/Vocabulary.tsx                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sections/shared/form/DatasetMetadataForm/MetadataForm/MetadataBlockFormFields/MetadataFormField/Fields/Vocabulary.tsx b/src/sections/shared/form/DatasetMetadataForm/MetadataForm/MetadataBlockFormFields/MetadataFormField/Fields/Vocabulary.tsx
index 6268ffff9..afa78204d 100644
--- a/src/sections/shared/form/DatasetMetadataForm/MetadataForm/MetadataBlockFormFields/MetadataFormField/Fields/Vocabulary.tsx
+++ b/src/sections/shared/form/DatasetMetadataForm/MetadataForm/MetadataBlockFormFields/MetadataFormField/Fields/Vocabulary.tsx
@@ -78,14 +78,14 @@ export const Vocabulary = ({
       rules={updatedRulesToApply}
       render={({ field: { onChange, ref, value }, fieldState: { invalid, error } }) => (
         <Form.Group
-          controlId={!showSelectWithSearch ? builtFieldName : undefined}
+          controlId={showSelectWithSearch ? undefined : builtFieldName}
           as={withinMultipleFieldsGroup ? Col : Row}>
           <Form.Group.Label
             message={description}
             required={Boolean(updatedRulesToApply?.required)}
             column={!withinMultipleFieldsGroup}
             className={styles['field-label']}
-            htmlFor={builtFieldName}
+            htmlFor={showSelectWithSearch ? builtFieldName : undefined}
             sm={3}>
             {title}
           </Form.Group.Label>

From 0246beaaded8e0adb6063205d197721b1e01f4c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Tue, 6 Aug 2024 09:57:56 -0300
Subject: [PATCH 44/52] feat: add more tests

---
 .../create-collection/CreateCollection.tsx    | 38 ++++----
 .../useGetAllMetadataBlocksInfo.tsx           | 86 ++++++++++---------
 ...=> useGetCollectionMetadataBlocksInfo.tsx} | 25 +++---
 .../domain/models/MetadataBlockInfoMother.ts  | 11 +++
 .../useGetAllMetadataBlocksInfo.spec.tsx      | 79 +++++++++++++++++
 ...seGetCollectionMetadataBlocksInfo.spec.tsx | 76 ++++++++++++++++
 6 files changed, 242 insertions(+), 73 deletions(-)
 rename src/sections/create-collection/{useGetCollectionMetadataBlocksNamesInfo.tsx => useGetCollectionMetadataBlocksInfo.tsx} (63%)
 create mode 100644 tests/component/sections/create-collection/useGetAllMetadataBlocksInfo.spec.tsx
 create mode 100644 tests/component/sections/create-collection/useGetCollectionMetadataBlocksInfo.spec.tsx

diff --git a/src/sections/create-collection/CreateCollection.tsx b/src/sections/create-collection/CreateCollection.tsx
index a21ec7ec7..f530dfed8 100644
--- a/src/sections/create-collection/CreateCollection.tsx
+++ b/src/sections/create-collection/CreateCollection.tsx
@@ -2,7 +2,7 @@ import { useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useDeepCompareMemo } from 'use-deep-compare'
 import { useCollection } from '../collection/useCollection'
-import { useGetCollectionMetadataBlocksNamesInfo } from './useGetCollectionMetadataBlocksNamesInfo'
+import { useGetCollectionMetadataBlocksInfo } from './useGetCollectionMetadataBlocksInfo'
 import { useGetAllMetadataBlocksInfo } from './useGetAllMetadataBlocksInfo'
 import { CollectionRepository } from '../../collection/domain/repositories/CollectionRepository'
 import { MetadataBlockInfoRepository } from '../../metadata-block-info/domain/repositories/MetadataBlockInfoRepository'
@@ -47,8 +47,8 @@ export function CreateCollection({
   )
 
   // TODO:ME In edit mode, collection id should not be from the collection owner but from the collection being edited, but this can perhaps be differentiated by page.
-  const { metadataBlocksNamesInfo, isLoading: isLoadingMetadataBlocksNamesInfo } =
-    useGetCollectionMetadataBlocksNamesInfo({
+  const { metadataBlocksInfo, isLoading: isLoadingMetadataBlocksNamesInfo } =
+    useGetCollectionMetadataBlocksInfo({
       collectionId: ownerCollectionId,
       metadataBlockInfoRepository
     })
@@ -74,21 +74,23 @@ export function CreateCollection({
 
   const defaultBlocksNames = useDeepCompareMemo(
     () =>
-      metadataBlocksNamesInfo.reduce(
-        (acc, blockName) => {
-          acc[blockName as keyof CollectionFormMetadataBlocks] = true
-          return acc
-        },
-        {
-          [MetadataBlockName.CITATION]: false,
-          [MetadataBlockName.GEOSPATIAL]: false,
-          [MetadataBlockName.SOCIAL_SCIENCE]: false,
-          [MetadataBlockName.ASTROPHYSICS]: false,
-          [MetadataBlockName.BIOMEDICAL]: false,
-          [MetadataBlockName.JOURNAL]: false
-        }
-      ),
-    [metadataBlocksNamesInfo]
+      metadataBlocksInfo
+        .map((block) => block.name)
+        .reduce(
+          (acc, blockName) => {
+            acc[blockName as keyof CollectionFormMetadataBlocks] = true
+            return acc
+          },
+          {
+            [MetadataBlockName.CITATION]: false,
+            [MetadataBlockName.GEOSPATIAL]: false,
+            [MetadataBlockName.SOCIAL_SCIENCE]: false,
+            [MetadataBlockName.ASTROPHYSICS]: false,
+            [MetadataBlockName.BIOMEDICAL]: false,
+            [MetadataBlockName.JOURNAL]: false
+          }
+        ),
+    [metadataBlocksInfo]
   )
 
   useEffect(() => {
diff --git a/src/sections/create-collection/useGetAllMetadataBlocksInfo.tsx b/src/sections/create-collection/useGetAllMetadataBlocksInfo.tsx
index 181d09422..66dc6528b 100644
--- a/src/sections/create-collection/useGetAllMetadataBlocksInfo.tsx
+++ b/src/sections/create-collection/useGetAllMetadataBlocksInfo.tsx
@@ -58,46 +58,8 @@ export const useGetAllMetadataBlocksInfo = ({
           blocksNames
         )
 
-        const reducedMetadataBlocksInfo: ReducedMetadataBlockInfo[] = blocksInfo.map(
-          (blockInfo) => {
-            const formattedMetadataFields: Record<string, ReducedMetadataFieldInfo> =
-              Object.entries(blockInfo.metadataFields).reduce((acc, [key, value]) => {
-                const { name, displayName, isRequired, childMetadataFields } = value
-                const replaceDotWithSlash = (str: string) => str.replace(/\./g, '/')
-                const normalizedName = replaceDotWithSlash(name)
-
-                acc[key] = {
-                  name: normalizedName,
-                  displayName,
-                  isRequired,
-                  childMetadataFields: childMetadataFields
-                    ? Object.entries(childMetadataFields).reduce((acc, [key, value]) => {
-                        const { name, displayName, isRequired } = value
-
-                        const normalizedChildfieldName = replaceDotWithSlash(name)
-
-                        acc[key] = {
-                          name: normalizedChildfieldName,
-                          displayName,
-                          isRequired
-                        }
-                        return acc
-                      }, {} as Record<string, ReducedMetadataFieldInfo>)
-                    : undefined
-                }
-                return acc
-              }, {} as Record<string, ReducedMetadataFieldInfo>)
-
-            const reducedMetadataBlockInfo: ReducedMetadataBlockInfo = {
-              id: blockInfo.id,
-              name: blockInfo.name,
-              displayName: blockInfo.displayName,
-              metadataFields: formattedMetadataFields
-            }
-
-            return reducedMetadataBlockInfo
-          }
-        )
+        const reducedMetadataBlocksInfo: ReducedMetadataBlockInfo[] =
+          reduceMetadataBlocksInfo(blocksInfo)
 
         setAllMetadataBlocksInfo(reducedMetadataBlocksInfo)
       } catch (err) {
@@ -120,3 +82,47 @@ export const useGetAllMetadataBlocksInfo = ({
     isLoading
   }
 }
+
+export function reduceMetadataBlocksInfo(
+  allMetadataBlocksInfo: MetadataBlockInfo[]
+): ReducedMetadataBlockInfo[] {
+  return allMetadataBlocksInfo.map((blockInfo) => {
+    const formattedMetadataFields: Record<string, ReducedMetadataFieldInfo> = Object.entries(
+      blockInfo.metadataFields
+    ).reduce((acc, [key, value]) => {
+      const { name, displayName, isRequired, childMetadataFields } = value
+      const replaceDotWithSlash = (str: string) => str.replace(/\./g, '/')
+      const normalizedName = replaceDotWithSlash(name)
+
+      acc[key] = {
+        name: normalizedName,
+        displayName,
+        isRequired,
+        childMetadataFields: childMetadataFields
+          ? Object.entries(childMetadataFields).reduce((acc, [key, value]) => {
+              const { name, displayName, isRequired } = value
+
+              const normalizedChildfieldName = replaceDotWithSlash(name)
+
+              acc[key] = {
+                name: normalizedChildfieldName,
+                displayName,
+                isRequired
+              }
+              return acc
+            }, {} as Record<string, ReducedMetadataFieldInfo>)
+          : undefined
+      }
+      return acc
+    }, {} as Record<string, ReducedMetadataFieldInfo>)
+
+    const reducedMetadataBlockInfo: ReducedMetadataBlockInfo = {
+      id: blockInfo.id,
+      name: blockInfo.name,
+      displayName: blockInfo.displayName,
+      metadataFields: formattedMetadataFields
+    }
+
+    return reducedMetadataBlockInfo
+  })
+}
diff --git a/src/sections/create-collection/useGetCollectionMetadataBlocksNamesInfo.tsx b/src/sections/create-collection/useGetCollectionMetadataBlocksInfo.tsx
similarity index 63%
rename from src/sections/create-collection/useGetCollectionMetadataBlocksNamesInfo.tsx
rename to src/sections/create-collection/useGetCollectionMetadataBlocksInfo.tsx
index e9ca4944b..d196d96bc 100644
--- a/src/sections/create-collection/useGetCollectionMetadataBlocksNamesInfo.tsx
+++ b/src/sections/create-collection/useGetCollectionMetadataBlocksInfo.tsx
@@ -1,32 +1,29 @@
 import { useEffect, useState } from 'react'
 import { MetadataBlockInfoRepository } from '../../metadata-block-info/domain/repositories/MetadataBlockInfoRepository'
 import { getMetadataBlockInfoByCollectionId } from '../../metadata-block-info/domain/useCases/getMetadataBlockInfoByCollectionId'
-import {
-  MetadataBlockInfo,
-  MetadataBlockName
-} from '../../metadata-block-info/domain/models/MetadataBlockInfo'
+import { MetadataBlockInfo } from '../../metadata-block-info/domain/models/MetadataBlockInfo'
 
 interface Props {
   collectionId: string
   metadataBlockInfoRepository: MetadataBlockInfoRepository
 }
 
-interface UseGetMetadataBlocksNamesInfoReturn {
-  metadataBlocksNamesInfo: MetadataBlockName[]
+interface UseGetMetadataBlocksInfoReturn {
+  metadataBlocksInfo: MetadataBlockInfo[]
   error: string | null
   isLoading: boolean
 }
 
-export const useGetCollectionMetadataBlocksNamesInfo = ({
+export const useGetCollectionMetadataBlocksInfo = ({
   collectionId,
   metadataBlockInfoRepository
-}: Props): UseGetMetadataBlocksNamesInfoReturn => {
-  const [metadataBlocksNamesInfo, setMetadataBlocksNamesInfo] = useState<MetadataBlockName[]>([])
+}: Props): UseGetMetadataBlocksInfoReturn => {
+  const [metadataBlocksInfo, setMetadataBlocksInfo] = useState<MetadataBlockInfo[]>([])
   const [isLoading, setIsLoading] = useState<boolean>(true)
   const [error, setError] = useState<string | null>(null)
 
   useEffect(() => {
-    const handleGetCollectionMetadataBlockNames = async () => {
+    const handleGetCollectionMetadataBlocks = async () => {
       setIsLoading(true)
       try {
         const metadataBlocks: MetadataBlockInfo[] = await getMetadataBlockInfoByCollectionId(
@@ -34,9 +31,7 @@ export const useGetCollectionMetadataBlocksNamesInfo = ({
           collectionId
         )
 
-        const blocksNames = metadataBlocks.map((block) => block.name) as MetadataBlockName[]
-
-        setMetadataBlocksNamesInfo(blocksNames)
+        setMetadataBlocksInfo(metadataBlocks)
       } catch (err) {
         const errorMessage =
           err instanceof Error && err.message
@@ -48,11 +43,11 @@ export const useGetCollectionMetadataBlocksNamesInfo = ({
       }
     }
 
-    void handleGetCollectionMetadataBlockNames()
+    void handleGetCollectionMetadataBlocks()
   }, [collectionId, metadataBlockInfoRepository])
 
   return {
-    metadataBlocksNamesInfo,
+    metadataBlocksInfo,
     error,
     isLoading
   }
diff --git a/tests/component/metadata-block-info/domain/models/MetadataBlockInfoMother.ts b/tests/component/metadata-block-info/domain/models/MetadataBlockInfoMother.ts
index b18f42624..e0f672f60 100644
--- a/tests/component/metadata-block-info/domain/models/MetadataBlockInfoMother.ts
+++ b/tests/component/metadata-block-info/domain/models/MetadataBlockInfoMother.ts
@@ -39,6 +39,17 @@ export class MetadataBlockInfoMother {
     }
   }
 
+  static getAllBlocks(): MetadataBlockInfo[] {
+    return [
+      this.getCitationBlock(),
+      this.getAstrophysicsBlock(),
+      this.getBiomedicalBlock(),
+      this.getGeospatialBlock(),
+      this.getSocialScienceBlock(),
+      this.getJournalBlock()
+    ]
+  }
+
   static getCitationBlock(): MetadataBlockInfo {
     return CitationMetadataBlockInfoMother.get()
   }
diff --git a/tests/component/sections/create-collection/useGetAllMetadataBlocksInfo.spec.tsx b/tests/component/sections/create-collection/useGetAllMetadataBlocksInfo.spec.tsx
new file mode 100644
index 000000000..b8840176d
--- /dev/null
+++ b/tests/component/sections/create-collection/useGetAllMetadataBlocksInfo.spec.tsx
@@ -0,0 +1,79 @@
+import { act, renderHook } from '@testing-library/react'
+import { MetadataBlockInfoRepository } from '../../../../src/metadata-block-info/domain/repositories/MetadataBlockInfoRepository'
+import { MetadataBlockInfoMother } from '../../metadata-block-info/domain/models/MetadataBlockInfoMother'
+import {
+  reduceMetadataBlocksInfo,
+  useGetAllMetadataBlocksInfo
+} from '../../../../src/sections/create-collection/useGetAllMetadataBlocksInfo'
+
+const metadataBlockInfoRepository: MetadataBlockInfoRepository = {} as MetadataBlockInfoRepository
+const allMetadataBlocksInfoMock = MetadataBlockInfoMother.getAllBlocks()
+
+describe('useGetAllMetadataBlocksInfo', () => {
+  it('should return metadataBlockDisplayFormatInfo correctly', async () => {
+    metadataBlockInfoRepository.getAllTemporal = cy.stub().resolves(allMetadataBlocksInfoMock)
+
+    const { result } = renderHook(() =>
+      useGetAllMetadataBlocksInfo({
+        metadataBlockInfoRepository
+      })
+    )
+
+    await act(() => {
+      expect(result.current.isLoading).to.deep.equal(true)
+      return expect(result.current.allMetadataBlocksInfo).to.deep.equal([])
+    })
+
+    await act(() => {
+      const reducedMetadataBlocksInfo = reduceMetadataBlocksInfo(allMetadataBlocksInfoMock)
+
+      expect(result.current.isLoading).to.deep.equal(false)
+
+      return expect(result.current.allMetadataBlocksInfo).to.deep.equal(reducedMetadataBlocksInfo)
+    })
+  })
+
+  describe('Error handling', () => {
+    it('should return correct error message when there is an error type catched', async () => {
+      metadataBlockInfoRepository.getAllTemporal = cy.stub().rejects(new Error('Error message'))
+
+      const { result } = renderHook(() =>
+        useGetAllMetadataBlocksInfo({
+          metadataBlockInfoRepository
+        })
+      )
+
+      await act(() => {
+        expect(result.current.isLoading).to.deep.equal(true)
+        return expect(result.current.error).to.deep.equal(null)
+      })
+
+      await act(() => {
+        expect(result.current.isLoading).to.deep.equal(false)
+        return expect(result.current.error).to.deep.equal('Error message')
+      })
+    })
+
+    it('should return correct error message when there is not an error type catched', async () => {
+      metadataBlockInfoRepository.getAllTemporal = cy.stub().rejects('Error message')
+
+      const { result } = renderHook(() =>
+        useGetAllMetadataBlocksInfo({
+          metadataBlockInfoRepository
+        })
+      )
+
+      await act(() => {
+        expect(result.current.isLoading).to.deep.equal(true)
+        return expect(result.current.error).to.deep.equal(null)
+      })
+
+      await act(() => {
+        expect(result.current.isLoading).to.deep.equal(false)
+        return expect(result.current.error).to.deep.equal(
+          'Something went wrong getting the information from the metadata blocks. Try again later.'
+        )
+      })
+    })
+  })
+})
diff --git a/tests/component/sections/create-collection/useGetCollectionMetadataBlocksInfo.spec.tsx b/tests/component/sections/create-collection/useGetCollectionMetadataBlocksInfo.spec.tsx
new file mode 100644
index 000000000..7c60da514
--- /dev/null
+++ b/tests/component/sections/create-collection/useGetCollectionMetadataBlocksInfo.spec.tsx
@@ -0,0 +1,76 @@
+import { act, renderHook } from '@testing-library/react'
+import { MetadataBlockInfoRepository } from '../../../../src/metadata-block-info/domain/repositories/MetadataBlockInfoRepository'
+import { MetadataBlockInfoMother } from '../../metadata-block-info/domain/models/MetadataBlockInfoMother'
+import { useGetCollectionMetadataBlocksInfo } from '../../../../src/sections/create-collection/useGetCollectionMetadataBlocksInfo'
+
+const metadataBlockInfoRepository: MetadataBlockInfoRepository = {} as MetadataBlockInfoRepository
+const metadataBlocksInfoMock = MetadataBlockInfoMother.getAllBlocks()
+
+describe('useGetCollectionMetadataBlocksInfo', () => {
+  it('should return metadataBlockDisplayFormatInfo correctly', async () => {
+    metadataBlockInfoRepository.getByColecctionId = cy.stub().resolves(metadataBlocksInfoMock)
+
+    const { result } = renderHook(() =>
+      useGetCollectionMetadataBlocksInfo({
+        collectionId: 'collectionId',
+        metadataBlockInfoRepository
+      })
+    )
+
+    await act(() => {
+      expect(result.current.isLoading).to.deep.equal(true)
+      return expect(result.current.metadataBlocksInfo).to.deep.equal([])
+    })
+
+    await act(() => {
+      expect(result.current.isLoading).to.deep.equal(false)
+      return expect(result.current.metadataBlocksInfo).to.deep.equal(metadataBlocksInfoMock)
+    })
+  })
+
+  describe('Error handling', () => {
+    it('should return correct error message when there is an error type catched', async () => {
+      metadataBlockInfoRepository.getByColecctionId = cy.stub().rejects(new Error('Error message'))
+
+      const { result } = renderHook(() =>
+        useGetCollectionMetadataBlocksInfo({
+          collectionId: 'collectionId',
+          metadataBlockInfoRepository
+        })
+      )
+
+      await act(() => {
+        expect(result.current.isLoading).to.deep.equal(true)
+        return expect(result.current.error).to.deep.equal(null)
+      })
+
+      await act(() => {
+        expect(result.current.isLoading).to.deep.equal(false)
+        return expect(result.current.error).to.deep.equal('Error message')
+      })
+    })
+
+    it('should return correct error message when there is not an error type catched', async () => {
+      metadataBlockInfoRepository.getByColecctionId = cy.stub().rejects('Error message')
+
+      const { result } = renderHook(() =>
+        useGetCollectionMetadataBlocksInfo({
+          collectionId: 'collectionId',
+          metadataBlockInfoRepository
+        })
+      )
+
+      await act(() => {
+        expect(result.current.isLoading).to.deep.equal(true)
+        return expect(result.current.error).to.deep.equal(null)
+      })
+
+      await act(() => {
+        expect(result.current.isLoading).to.deep.equal(false)
+        return expect(result.current.error).to.deep.equal(
+          'Something went wrong getting the information from the metadata blocks. Try again later.'
+        )
+      })
+    })
+  })
+})

From c4db090d43e35673763594350201d56b7b83f27a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Tue, 6 Aug 2024 09:59:54 -0300
Subject: [PATCH 45/52] chore: use ghcr dataverse image tag

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index db4356d24..b4a9f9cb0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -6,7 +6,7 @@ on:
     types: [opened, reopened]
 
 env:
-  E2E_DATAVERSE_IMAGE_TAG: unstable
+  E2E_DATAVERSE_IMAGE_TAG: 10726-facets-api-extension
 
 jobs:
   e2e:

From aea2fa6ad90679afba91440edd70b428be77713c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Tue, 6 Aug 2024 10:53:58 -0300
Subject: [PATCH 46/52] feat: disable and set to optional a conditionally
 required field

---
 public/locales/en/createCollection.json       |  6 +-
 .../collection-form/CollectionForm.tsx        |  2 +
 .../collection-form/CollectionFormHelper.ts   | 13 ++-
 .../input-levels-table/InputLevelFieldRow.tsx | 83 ++++++++++---------
 .../RequiredOptionalRadios.tsx                | 43 ++++++----
 5 files changed, 93 insertions(+), 54 deletions(-)

diff --git a/public/locales/en/createCollection.json b/public/locales/en/createCollection.json
index 040639f83..939bcff98 100644
--- a/public/locales/en/createCollection.json
+++ b/public/locales/en/createCollection.json
@@ -56,7 +56,11 @@
       "journalMetadata": "Journal Metadata",
       "inputLevelsTable": {
         "hideTableAriaLabel": "Hide input levels table",
-        "requiredByDataverse": "Required by Dataverse"
+        "requiredByDataverse": "Required by Dataverse",
+        "hidden": "Hidden",
+        "optional": "Optional",
+        "required": "Required",
+        "conditionallyRequired": "Conditionally Required"
       }
     },
     "browseSearchFacets": {
diff --git a/src/sections/create-collection/collection-form/CollectionForm.tsx b/src/sections/create-collection/collection-form/CollectionForm.tsx
index 24f931ea0..58a1b4fa3 100644
--- a/src/sections/create-collection/collection-form/CollectionForm.tsx
+++ b/src/sections/create-collection/collection-form/CollectionForm.tsx
@@ -71,6 +71,8 @@ export const CollectionFormInputLevelOptions = {
 export type CollectionFormInputLevelValue =
   (typeof CollectionFormInputLevelOptions)[keyof typeof CollectionFormInputLevelOptions]
 
+export const CONDITIONALLY_REQUIRED_FIELDS = ['producerName']
+
 // On the submit function callback, type is CollectionType as type field is required and wont never be ""
 export type CollectionFormValuesOnSubmit = Omit<CollectionFormData, 'type'> & {
   type: CollectionType
diff --git a/src/sections/create-collection/collection-form/CollectionFormHelper.ts b/src/sections/create-collection/collection-form/CollectionFormHelper.ts
index 150807a17..d3296efcb 100644
--- a/src/sections/create-collection/collection-form/CollectionFormHelper.ts
+++ b/src/sections/create-collection/collection-form/CollectionFormHelper.ts
@@ -8,6 +8,7 @@ import { ReducedMetadataBlockInfo, ReducedMetadataFieldInfo } from '../useGetAll
 import {
   CollectionFormMetadataBlock,
   CollectionFormMetadataBlocks,
+  CONDITIONALLY_REQUIRED_FIELDS,
   FormattedCollectionInputLevels,
   FormattedCollectionInputLevelsWithoutParentBlockName
 } from './CollectionForm'
@@ -27,10 +28,12 @@ export class CollectionFormHelper {
       Object.entries(block.metadataFields).forEach(([_key, field]) => {
         const normalizedFieldName = this.replaceDotWithSlash(field.name)
         const isFieldRequiredByDataverse = field.isRequired
+        const isAConditionallyRequiredField = CONDITIONALLY_REQUIRED_FIELDS.includes(field.name)
 
         fields[normalizedFieldName] = {
           include: true,
-          optionalOrRequired: isFieldRequiredByDataverse ? 'required' : 'optional',
+          optionalOrRequired:
+            isFieldRequiredByDataverse && !isAConditionallyRequiredField ? 'required' : 'optional',
           parentBlockName: block.name as CollectionFormMetadataBlock
         }
 
@@ -38,10 +41,16 @@ export class CollectionFormHelper {
           Object.entries(field.childMetadataFields).forEach(([_key, childField]) => {
             const normalizedFieldName = this.replaceDotWithSlash(childField.name)
             const isChildFieldRequiredByDataverse = childField.isRequired
+            const isAConditionallyRequiredChildField = CONDITIONALLY_REQUIRED_FIELDS.includes(
+              childField.name
+            )
 
             childFields[normalizedFieldName] = {
               include: true,
-              optionalOrRequired: isChildFieldRequiredByDataverse ? 'required' : 'optional',
+              optionalOrRequired:
+                isChildFieldRequiredByDataverse && !isAConditionallyRequiredChildField
+                  ? 'required'
+                  : 'optional',
               parentBlockName: block.name as CollectionFormMetadataBlock
             }
           })
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
index 94a5d50e1..9c1d2c314 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/InputLevelFieldRow.tsx
@@ -3,7 +3,7 @@ import { Controller, UseControllerProps, useFormContext, useWatch } from 'react-
 import cn from 'classnames'
 import { Form } from '@iqss/dataverse-design-system'
 import { ReducedMetadataFieldInfo } from '../../../../useGetAllMetadataBlocksInfo'
-import { INPUT_LEVELS_GROUPER } from '../../../CollectionForm'
+import { CONDITIONALLY_REQUIRED_FIELDS, INPUT_LEVELS_GROUPER } from '../../../CollectionForm'
 import styles from './InputLevelsTable.module.scss'
 import { CollectionFormHelper } from '../../../CollectionFormHelper'
 import { RequiredOptionalRadios } from './RequiredOptionalRadios'
@@ -27,6 +27,8 @@ export const InputLevelFieldRow = ({ metadataField, disabled }: InputLevelFieldR
 
   const { name, displayName, isRequired, childMetadataFields } = metadataField
 
+  const isAConditionallyRequiredField = CONDITIONALLY_REQUIRED_FIELDS.includes(name)
+
   const rules: UseControllerProps['rules'] = {}
 
   const handleIncludeChange = (
@@ -72,56 +74,63 @@ export const InputLevelFieldRow = ({ metadataField, disabled }: InputLevelFieldR
           />
         </td>
         <td>
-          {isRequired && (
+          {isRequired && !isAConditionallyRequiredField && (
             <span className={styles['required-by-dataverse-label']}>
               {t('requiredByDataverse')}
             </span>
           )}
-          {!childMetadataFields && !isRequired && (
+          {!childMetadataFields && (!isRequired || isAConditionallyRequiredField) && (
             <RequiredOptionalRadios
               disabled={disabled}
               isForChildField={false}
               parentFieldChecked={includeCheckboxValue}
               uniqueInputLevelRowID={uniqueInputLevelRowID}
-              fieldName={`${INPUT_LEVELS_GROUPER}.${name}.optionalOrRequired`}
+              formBuiltedFieldName={`${INPUT_LEVELS_GROUPER}.${name}.optionalOrRequired`}
             />
           )}
         </td>
       </tr>
       {childMetadataFields &&
-        Object.entries(childMetadataFields).map(([key, childField]) => (
-          <tr className={styles['input-level-row--child-field']} key={key}>
-            <td>
-              <label
-                className={cn({
-                  [styles['displayName-disabled']]: disabled || childField.isRequired
-                })}>
-                {childField.displayName}
-              </label>
-            </td>
-            <td>
-              {childField.isRequired ? (
-                <span className={styles['required-by-dataverse-label']}>
-                  {t('requiredByDataverse')}
-                </span>
-              ) : (
-                <RequiredOptionalRadios
-                  disabled={disabled}
-                  isForChildField={true}
-                  siblingChildFields={CollectionFormHelper.getChildFieldSiblings(
-                    childMetadataFields,
-                    childField.name
-                  )}
-                  parentIncludeName={name}
-                  parentIsRequiredByDataverse={isRequired}
-                  parentFieldChecked={includeCheckboxValue}
-                  uniqueInputLevelRowID={`${uniqueInputLevelRowID}-${childField.name}`}
-                  fieldName={`${INPUT_LEVELS_GROUPER}.${childField.name}.optionalOrRequired`}
-                />
-              )}
-            </td>
-          </tr>
-        ))}
+        Object.entries(childMetadataFields).map(([key, childField]) => {
+          const isAConditionallyRequiredChildField = CONDITIONALLY_REQUIRED_FIELDS.includes(
+            childField.name
+          )
+
+          return (
+            <tr className={styles['input-level-row--child-field']} key={key}>
+              <td>
+                <label
+                  className={cn({
+                    [styles['displayName-disabled']]:
+                      disabled || (childField.isRequired && !isAConditionallyRequiredChildField)
+                  })}>
+                  {childField.displayName}
+                </label>
+              </td>
+              <td>
+                {childField.isRequired && !isAConditionallyRequiredChildField ? (
+                  <span className={styles['required-by-dataverse-label']}>
+                    {t('requiredByDataverse')}
+                  </span>
+                ) : (
+                  <RequiredOptionalRadios
+                    disabled={disabled}
+                    isForChildField={true}
+                    siblingChildFields={CollectionFormHelper.getChildFieldSiblings(
+                      childMetadataFields,
+                      childField.name
+                    )}
+                    parentIncludeName={name}
+                    parentIsRequiredByDataverse={isRequired}
+                    parentFieldChecked={includeCheckboxValue}
+                    uniqueInputLevelRowID={`${uniqueInputLevelRowID}-${childField.name}`}
+                    formBuiltedFieldName={`${INPUT_LEVELS_GROUPER}.${childField.name}.optionalOrRequired`}
+                  />
+                )}
+              </td>
+            </tr>
+          )
+        })}
     </>
   )
 }
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/RequiredOptionalRadios.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/RequiredOptionalRadios.tsx
index 1335fbedd..a150e3589 100644
--- a/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/RequiredOptionalRadios.tsx
+++ b/src/sections/create-collection/collection-form/metadata-fields-section/metadata-input-level-fields-block/input-levels-table/RequiredOptionalRadios.tsx
@@ -1,13 +1,18 @@
 import { ChangeEvent } from 'react'
+import { useTranslation } from 'react-i18next'
 import { Form, Stack } from '@iqss/dataverse-design-system'
 import { Controller, useFormContext, useWatch } from 'react-hook-form'
 import { ReducedMetadataFieldInfo } from '../../../../useGetAllMetadataBlocksInfo'
-import { CollectionFormInputLevelValue, INPUT_LEVELS_GROUPER } from '../../../CollectionForm'
+import {
+  CollectionFormInputLevelValue,
+  CONDITIONALLY_REQUIRED_FIELDS,
+  INPUT_LEVELS_GROUPER
+} from '../../../CollectionForm'
 
 type RequiredOptionalRadiosProps =
   | {
       disabled: boolean
-      fieldName: string
+      formBuiltedFieldName: string
       isForChildField: true
       siblingChildFields: Record<string, ReducedMetadataFieldInfo>
       parentIncludeName: string
@@ -17,7 +22,7 @@ type RequiredOptionalRadiosProps =
     }
   | {
       disabled: boolean
-      fieldName: string
+      formBuiltedFieldName: string
       isForChildField?: false
       siblingChildFields?: never
       parentIncludeName?: never
@@ -34,7 +39,7 @@ type RequiredOptionalRadiosProps =
 
 export const RequiredOptionalRadios = ({
   disabled,
-  fieldName,
+  formBuiltedFieldName,
   isForChildField,
   siblingChildFields,
   parentIncludeName,
@@ -42,6 +47,9 @@ export const RequiredOptionalRadios = ({
   parentFieldChecked,
   uniqueInputLevelRowID
 }: RequiredOptionalRadiosProps) => {
+  const { t } = useTranslation('createCollection', {
+    keyPrefix: 'fields.metadataFields.inputLevelsTable'
+  })
   const { control, setValue } = useFormContext()
 
   const siblingChildFieldsNames = Object.values(siblingChildFields || {})
@@ -79,9 +87,13 @@ export const RequiredOptionalRadios = ({
     formOnChange(e)
   }
 
+  const isAConditionallyRequiredField = CONDITIONALLY_REQUIRED_FIELDS.some((field) =>
+    formBuiltedFieldName.includes(field)
+  )
+
   return (
     <Controller
-      name={fieldName}
+      name={formBuiltedFieldName}
       control={control}
       render={({ field: { onChange, ref, value } }) => {
         const castedValue = value as CollectionFormInputLevelValue
@@ -89,38 +101,41 @@ export const RequiredOptionalRadios = ({
         if (!parentFieldChecked) {
           return (
             <Form.Group.Radio
-              label="Hidden"
+              label={t('hidden')}
               checked={true}
-              value="required"
-              name={`${uniqueInputLevelRowID}-${fieldName}-hidden-radio`}
-              id={`${uniqueInputLevelRowID}-${fieldName}-hidden-radio`}
+              value="hidden"
+              name={`${uniqueInputLevelRowID}-${formBuiltedFieldName}-hidden-radio`}
+              id={`${uniqueInputLevelRowID}-${formBuiltedFieldName}-hidden-radio`}
               readOnly
               disabled
               ref={ref}
             />
           )
         }
-
+        {
+          /* For now we are just disabling the radios if this is a conditionally required field */
+        }
         return (
           <Stack direction="horizontal">
             <Form.Group.Radio
-              label="Required"
+              label={t('required')}
               onChange={(e) => handleOptionalOrRequiredChange(e, onChange)}
               checked={castedValue === 'required'}
               value="required"
               name={`${uniqueInputLevelRowID}-radio-group`}
               id={`${uniqueInputLevelRowID}-required-radio`}
-              disabled={disabled}
+              disabled={disabled || isAConditionallyRequiredField}
               ref={ref}
             />
+
             <Form.Group.Radio
-              label="Optional"
+              label={!isAConditionallyRequiredField ? t('optional') : t('conditionallyRequired')}
               onChange={(e) => handleOptionalOrRequiredChange(e, onChange)}
               checked={castedValue === 'optional'}
               value="optional"
               name={`${uniqueInputLevelRowID}-radio-group`}
               id={`${uniqueInputLevelRowID}-optional-radio`}
-              disabled={disabled}
+              disabled={disabled || isAConditionallyRequiredField}
               ref={ref}
             />
           </Stack>

From 35a5b5de8dfec977c7358f0db56849666ebb44be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Tue, 6 Aug 2024 11:23:10 -0300
Subject: [PATCH 47/52] chore: update pull request template to match
 js-dataverse repo

---
 .github/PULL_REQUEST_TEMPLATE.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index b57aa23fc..f28b0de8c 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,15 +1,15 @@
-**What this PR does / why we need it**:
+## What this PR does / why we need it:
 
-**Which issue(s) this PR closes**:
+## Which issue(s) this PR closes:
 
-Closes #
+- Closes #
 
-**Special notes for your reviewer**:
+## Special notes for your reviewer:
 
-**Suggestions on how to test this**:
+## Suggestions on how to test this:
 
-**Does this PR introduce a user interface change? If mockups are available, please link/include them here**:
+## Does this PR introduce a user interface change? If mockups are available, please link/include them here:
 
-**Is there a release notes update needed for this change?**:
+## Is there a release notes update needed for this change?:
 
-**Additional documentation**:
+## Additional documentation:

From 9648e469909abdff514b7db69323af2631f30626 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Wed, 7 Aug 2024 09:48:58 -0300
Subject: [PATCH 48/52] feat: change loading name and back test.yml as original

---
 .github/workflows/test.yml                          |  2 +-
 src/sections/create-collection/CreateCollection.tsx | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b4a9f9cb0..db4356d24 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -6,7 +6,7 @@ on:
     types: [opened, reopened]
 
 env:
-  E2E_DATAVERSE_IMAGE_TAG: 10726-facets-api-extension
+  E2E_DATAVERSE_IMAGE_TAG: unstable
 
 jobs:
   e2e:
diff --git a/src/sections/create-collection/CreateCollection.tsx b/src/sections/create-collection/CreateCollection.tsx
index f530dfed8..a7245eac3 100644
--- a/src/sections/create-collection/CreateCollection.tsx
+++ b/src/sections/create-collection/CreateCollection.tsx
@@ -47,7 +47,7 @@ export function CreateCollection({
   )
 
   // TODO:ME In edit mode, collection id should not be from the collection owner but from the collection being edited, but this can perhaps be differentiated by page.
-  const { metadataBlocksInfo, isLoading: isLoadingMetadataBlocksNamesInfo } =
+  const { metadataBlocksInfo, isLoading: isLoadingMetadataBlocksInfo } =
     useGetCollectionMetadataBlocksInfo({
       collectionId: ownerCollectionId,
       metadataBlockInfoRepository
@@ -94,17 +94,13 @@ export function CreateCollection({
   )
 
   useEffect(() => {
-    if (
-      !isLoadingCollection &&
-      !isLoadingMetadataBlocksNamesInfo &&
-      !isLoadingAllMetadataBlocksInfo
-    ) {
+    if (!isLoadingCollection && !isLoadingMetadataBlocksInfo && !isLoadingAllMetadataBlocksInfo) {
       setIsLoading(false)
     }
   }, [
     isLoading,
     isLoadingCollection,
-    isLoadingMetadataBlocksNamesInfo,
+    isLoadingMetadataBlocksInfo,
     isLoadingAllMetadataBlocksInfo,
     setIsLoading
   ])
@@ -115,7 +111,7 @@ export function CreateCollection({
 
   if (
     isLoadingCollection ||
-    isLoadingMetadataBlocksNamesInfo ||
+    isLoadingMetadataBlocksInfo ||
     isLoadingAllMetadataBlocksInfo ||
     !collection
   ) {

From 9424690e93477d3665efa6346358a4a8dbd7fcdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Fri, 9 Aug 2024 08:45:46 -0300
Subject: [PATCH 49/52] fix typo

---
 .../domain/repositories/MetadataBlockInfoRepository.ts      | 2 +-
 .../domain/useCases/getMetadataBlockInfoByCollectionId.ts   | 2 +-
 .../repositories/MetadataBlockInfoJSDataverseRepository.ts  | 2 +-
 .../MetadataBlockInfoMockErrorRepository.ts                 | 2 +-
 .../MetadataBlockInfoMockLoadingRepository.ts               | 2 +-
 .../metadata-block-info/MetadataBlockInfoMockRepository.ts  | 2 +-
 .../sections/create-collection/CreateCollection.spec.tsx    | 2 +-
 .../useGetCollectionMetadataBlocksInfo.spec.tsx             | 6 +++---
 .../edit-dataset-metadata/EditDatasetMetadata.spec.tsx      | 2 +-
 .../dataset-metadata-form/DatasetMetadataForm.spec.tsx      | 6 +++---
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/metadata-block-info/domain/repositories/MetadataBlockInfoRepository.ts b/src/metadata-block-info/domain/repositories/MetadataBlockInfoRepository.ts
index 76b7dc1a7..15c21e8aa 100644
--- a/src/metadata-block-info/domain/repositories/MetadataBlockInfoRepository.ts
+++ b/src/metadata-block-info/domain/repositories/MetadataBlockInfoRepository.ts
@@ -6,5 +6,5 @@ export interface MetadataBlockInfoRepository {
   getDisplayedOnCreateByCollectionId: (
     collectionId: number | string
   ) => Promise<MetadataBlockInfo[]>
-  getByColecctionId: (collectionId: number | string) => Promise<MetadataBlockInfo[]>
+  getByCollectionId: (collectionId: number | string) => Promise<MetadataBlockInfo[]>
 }
diff --git a/src/metadata-block-info/domain/useCases/getMetadataBlockInfoByCollectionId.ts b/src/metadata-block-info/domain/useCases/getMetadataBlockInfoByCollectionId.ts
index 76f32c51f..ab3fba345 100644
--- a/src/metadata-block-info/domain/useCases/getMetadataBlockInfoByCollectionId.ts
+++ b/src/metadata-block-info/domain/useCases/getMetadataBlockInfoByCollectionId.ts
@@ -5,7 +5,7 @@ export async function getMetadataBlockInfoByCollectionId(
   metadataBlockInfoRepository: MetadataBlockInfoRepository,
   collectionId: number | string
 ): Promise<MetadataBlockInfo[]> {
-  return metadataBlockInfoRepository.getByColecctionId(collectionId).catch((error: Error) => {
+  return metadataBlockInfoRepository.getByCollectionId(collectionId).catch((error: Error) => {
     throw new Error(error.message)
   })
 }
diff --git a/src/metadata-block-info/infrastructure/repositories/MetadataBlockInfoJSDataverseRepository.ts b/src/metadata-block-info/infrastructure/repositories/MetadataBlockInfoJSDataverseRepository.ts
index 6726f568c..a435bc552 100644
--- a/src/metadata-block-info/infrastructure/repositories/MetadataBlockInfoJSDataverseRepository.ts
+++ b/src/metadata-block-info/infrastructure/repositories/MetadataBlockInfoJSDataverseRepository.ts
@@ -36,7 +36,7 @@ export class MetadataBlockInfoJSDataverseRepository implements MetadataBlockInfo
       })
   }
 
-  getByColecctionId(collectionIdOrAlias: number | string): Promise<MetadataBlockInfo[]> {
+  getByCollectionId(collectionIdOrAlias: number | string): Promise<MetadataBlockInfo[]> {
     return getCollectionMetadataBlocks
       .execute(collectionIdOrAlias)
       .then((metadataBlocks: MetadataBlockInfo[]) => {
diff --git a/src/stories/shared-mock-repositories/metadata-block-info/MetadataBlockInfoMockErrorRepository.ts b/src/stories/shared-mock-repositories/metadata-block-info/MetadataBlockInfoMockErrorRepository.ts
index b71ad86c0..4a115b622 100644
--- a/src/stories/shared-mock-repositories/metadata-block-info/MetadataBlockInfoMockErrorRepository.ts
+++ b/src/stories/shared-mock-repositories/metadata-block-info/MetadataBlockInfoMockErrorRepository.ts
@@ -13,7 +13,7 @@ export class MetadataBlockInfoMockErrorRepository implements MetadataBlockInfoMo
     })
   }
 
-  getByColecctionId(_collectionId: number | string): Promise<MetadataBlockInfo[]> {
+  getByCollectionId(_collectionId: number | string): Promise<MetadataBlockInfo[]> {
     return new Promise((_resolve, reject) => {
       setTimeout(() => {
         reject('Error thrown from mock')
diff --git a/src/stories/shared-mock-repositories/metadata-block-info/MetadataBlockInfoMockLoadingRepository.ts b/src/stories/shared-mock-repositories/metadata-block-info/MetadataBlockInfoMockLoadingRepository.ts
index fb3eb4076..21191c7a7 100644
--- a/src/stories/shared-mock-repositories/metadata-block-info/MetadataBlockInfoMockLoadingRepository.ts
+++ b/src/stories/shared-mock-repositories/metadata-block-info/MetadataBlockInfoMockLoadingRepository.ts
@@ -9,7 +9,7 @@ export class MetadataBlockInfoMockLoadingRepository implements MetadataBlockInfo
     return new Promise(() => {})
   }
 
-  getByColecctionId(_collectionId: number | string): Promise<MetadataBlockInfo[]> {
+  getByCollectionId(_collectionId: number | string): Promise<MetadataBlockInfo[]> {
     return new Promise(() => {})
   }
 
diff --git a/src/stories/shared-mock-repositories/metadata-block-info/MetadataBlockInfoMockRepository.ts b/src/stories/shared-mock-repositories/metadata-block-info/MetadataBlockInfoMockRepository.ts
index eeee978e5..a49c6cd83 100644
--- a/src/stories/shared-mock-repositories/metadata-block-info/MetadataBlockInfoMockRepository.ts
+++ b/src/stories/shared-mock-repositories/metadata-block-info/MetadataBlockInfoMockRepository.ts
@@ -14,7 +14,7 @@ export class MetadataBlockInfoMockRepository implements MetadataBlockInfoReposit
     })
   }
 
-  getByColecctionId(_collectionId: number | string): Promise<MetadataBlockInfo[]> {
+  getByCollectionId(_collectionId: number | string): Promise<MetadataBlockInfo[]> {
     return new Promise((resolve) => {
       setTimeout(() => {
         resolve(MetadataBlockInfoMother.getByCollectionIdDisplayedOnCreateFalse())
diff --git a/tests/component/sections/create-collection/CreateCollection.spec.tsx b/tests/component/sections/create-collection/CreateCollection.spec.tsx
index fb58b7059..0c65ab5d9 100644
--- a/tests/component/sections/create-collection/CreateCollection.spec.tsx
+++ b/tests/component/sections/create-collection/CreateCollection.spec.tsx
@@ -31,7 +31,7 @@ describe('CreateCollection', () => {
   beforeEach(() => {
     collectionRepository.create = cy.stub().resolves(1)
     collectionRepository.getById = cy.stub().resolves(collection)
-    metadataBlockInfoRepository.getByColecctionId = cy.stub().resolves(collectionMetadataBlocksInfo)
+    metadataBlockInfoRepository.getByCollectionId = cy.stub().resolves(collectionMetadataBlocksInfo)
     metadataBlockInfoRepository.getAllTemporal = cy.stub().resolves(allMetadataBlocksMock)
     userRepository.getAuthenticated = cy.stub().resolves(testUser)
   })
diff --git a/tests/component/sections/create-collection/useGetCollectionMetadataBlocksInfo.spec.tsx b/tests/component/sections/create-collection/useGetCollectionMetadataBlocksInfo.spec.tsx
index 7c60da514..5be83bc26 100644
--- a/tests/component/sections/create-collection/useGetCollectionMetadataBlocksInfo.spec.tsx
+++ b/tests/component/sections/create-collection/useGetCollectionMetadataBlocksInfo.spec.tsx
@@ -8,7 +8,7 @@ const metadataBlocksInfoMock = MetadataBlockInfoMother.getAllBlocks()
 
 describe('useGetCollectionMetadataBlocksInfo', () => {
   it('should return metadataBlockDisplayFormatInfo correctly', async () => {
-    metadataBlockInfoRepository.getByColecctionId = cy.stub().resolves(metadataBlocksInfoMock)
+    metadataBlockInfoRepository.getByCollectionId = cy.stub().resolves(metadataBlocksInfoMock)
 
     const { result } = renderHook(() =>
       useGetCollectionMetadataBlocksInfo({
@@ -30,7 +30,7 @@ describe('useGetCollectionMetadataBlocksInfo', () => {
 
   describe('Error handling', () => {
     it('should return correct error message when there is an error type catched', async () => {
-      metadataBlockInfoRepository.getByColecctionId = cy.stub().rejects(new Error('Error message'))
+      metadataBlockInfoRepository.getByCollectionId = cy.stub().rejects(new Error('Error message'))
 
       const { result } = renderHook(() =>
         useGetCollectionMetadataBlocksInfo({
@@ -51,7 +51,7 @@ describe('useGetCollectionMetadataBlocksInfo', () => {
     })
 
     it('should return correct error message when there is not an error type catched', async () => {
-      metadataBlockInfoRepository.getByColecctionId = cy.stub().rejects('Error message')
+      metadataBlockInfoRepository.getByCollectionId = cy.stub().rejects('Error message')
 
       const { result } = renderHook(() =>
         useGetCollectionMetadataBlocksInfo({
diff --git a/tests/component/sections/edit-dataset-metadata/EditDatasetMetadata.spec.tsx b/tests/component/sections/edit-dataset-metadata/EditDatasetMetadata.spec.tsx
index fab09862a..8c32c3719 100644
--- a/tests/component/sections/edit-dataset-metadata/EditDatasetMetadata.spec.tsx
+++ b/tests/component/sections/edit-dataset-metadata/EditDatasetMetadata.spec.tsx
@@ -20,7 +20,7 @@ describe('EditDatasetMetadata', () => {
     const searchParams = { persistentId: 'some-persistent-id' }
 
     datasetRepository.getByPersistentId = cy.stub().resolves(dataset)
-    metadataBlockInfoRepository.getByColecctionId = cy.stub().resolves(metadataBlocksInfoOnEditMode)
+    metadataBlockInfoRepository.getByCollectionId = cy.stub().resolves(metadataBlocksInfoOnEditMode)
     datasetRepository.updateMetadata = cy.stub().resolves(undefined)
 
     cy.customMount(
diff --git a/tests/component/sections/shared/dataset-metadata-form/DatasetMetadataForm.spec.tsx b/tests/component/sections/shared/dataset-metadata-form/DatasetMetadataForm.spec.tsx
index f1eca3b8d..cff76feda 100644
--- a/tests/component/sections/shared/dataset-metadata-form/DatasetMetadataForm.spec.tsx
+++ b/tests/component/sections/shared/dataset-metadata-form/DatasetMetadataForm.spec.tsx
@@ -202,7 +202,7 @@ describe('DatasetMetadataForm', () => {
     datasetRepository.getByPersistentId = cy.stub().resolves(dataset)
     datasetRepository.create = cy.stub().resolves({ persistentId: 'persistentId' })
     datasetRepository.updateMetadata = cy.stub().resolves(undefined)
-    metadataBlockInfoRepository.getByColecctionId = cy.stub().resolves(metadataBlocksInfoOnEditMode)
+    metadataBlockInfoRepository.getByCollectionId = cy.stub().resolves(metadataBlocksInfoOnEditMode)
     metadataBlockInfoRepository.getDisplayedOnCreateByCollectionId = cy
       .stub()
       .resolves(metadataBlocksInfoOnCreateMode)
@@ -1628,7 +1628,7 @@ describe('DatasetMetadataForm', () => {
       datasetRepository.updateMetadata = cy
         .stub()
         .rejects(new Error('Error from the api javascript client'))
-      metadataBlockInfoRepository.getByColecctionId = cy
+      metadataBlockInfoRepository.getByCollectionId = cy
         .stub()
         .resolves(wrongCollectionMetadataBlocksInfo)
 
@@ -1845,7 +1845,7 @@ describe('DatasetMetadataForm', () => {
         })
     })
     it('for a composed field NOT multiple', () => {
-      metadataBlockInfoRepository.getByColecctionId = cy
+      metadataBlockInfoRepository.getByCollectionId = cy
         .stub()
         .resolves(metadataBlocksInfoOnCreateModeWithComposedNotMultipleField)
 

From a7aa7be920ede99692d0f13357066709a59bc049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Fri, 9 Aug 2024 09:09:18 -0300
Subject: [PATCH 50/52] test: match collection model response

---
 .../collection/CollectionJSDataverseRepository.spec.ts      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/e2e-integration/integration/collection/CollectionJSDataverseRepository.spec.ts b/tests/e2e-integration/integration/collection/CollectionJSDataverseRepository.spec.ts
index a2534020a..7339fe403 100644
--- a/tests/e2e-integration/integration/collection/CollectionJSDataverseRepository.spec.ts
+++ b/tests/e2e-integration/integration/collection/CollectionJSDataverseRepository.spec.ts
@@ -6,9 +6,10 @@ import {
   DvObjectType,
   UpwardHierarchyNode
 } from '../../../../src/shared/hierarchy/domain/models/UpwardHierarchyNode'
+import { Collection } from '../../../../src/collection/domain/models/Collection'
 
 const collectionRepository = new CollectionJSDataverseRepository()
-const collectionExpected = {
+const collectionExpected: Collection = {
   id: 'new-collection',
   name: 'Scientific Research',
   description: 'We do all the science.',
@@ -28,7 +29,8 @@ const collectionExpected = {
       undefined,
       undefined
     )
-  )
+  ),
+  inputLevels: undefined
 }
 describe('Collection JSDataverse Repository', () => {
   before(() => TestsUtils.setup())

From 9abeed401340af6006f3cf2cfd651ea8971186a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Mon, 19 Aug 2024 11:06:07 -0300
Subject: [PATCH 51/52] chore: update to latest version of js-dv and change
 registry

---
 dev-env/.env      | 2 +-
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-env/.env b/dev-env/.env
index af9cd824e..3745eed3b 100644
--- a/dev-env/.env
+++ b/dev-env/.env
@@ -1,4 +1,4 @@
 POSTGRES_VERSION=13
 DATAVERSE_DB_USER=dataverse
 SOLR_VERSION=9.3.0
-REGISTRY=ghcr.io
\ No newline at end of file
+REGISTRY=docker.io
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index de5a9febe..0273f4e3a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.1.0",
       "dependencies": {
         "@faker-js/faker": "7.6.0",
-        "@iqss/dataverse-client-javascript": "2.0.0-pr169.5c26a1e",
+        "@iqss/dataverse-client-javascript": "2.0.0-pr169.aa49f06",
         "@iqss/dataverse-design-system": "*",
         "@istanbuljs/nyc-config-typescript": "1.0.2",
         "@tanstack/react-table": "8.9.2",
@@ -3610,9 +3610,9 @@
     },
     "node_modules/@iqss/dataverse-client-javascript": {
       "name": "@IQSS/dataverse-client-javascript",
-      "version": "2.0.0-pr169.5c26a1e",
-      "resolved": "https://npm.pkg.github.com/download/@IQSS/dataverse-client-javascript/2.0.0-pr169.5c26a1e/65bb7f674264c1e93ed46b8f9ce527f2f73dbaaf",
-      "integrity": "sha512-r+37oyOj6qCsWYSvNdZHvK2/aHX60TyUTnbqrkK97AAaToAraEMf83b8Bd7hMCEwF7T25+3u7l0bI+PnAFIxvw==",
+      "version": "2.0.0-pr169.aa49f06",
+      "resolved": "https://npm.pkg.github.com/download/@IQSS/dataverse-client-javascript/2.0.0-pr169.aa49f06/d8061b0af0068e530c6ef78b89e0a4ce668df4b3",
+      "integrity": "sha512-2D3wxWA87kU8EXltK7pBMGX9OoK7aecX869zbalbdtSNcPz9ATbZOOhDYbfaU+J526AyNTVQ6xlPTY5hWIRFvQ==",
       "license": "MIT",
       "dependencies": {
         "@types/node": "^18.15.11",
diff --git a/package.json b/package.json
index 4982deefc..894d361f3 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@faker-js/faker": "7.6.0",
-    "@iqss/dataverse-client-javascript": "2.0.0-pr169.5c26a1e",
+    "@iqss/dataverse-client-javascript": "2.0.0-pr169.aa49f06",
     "@iqss/dataverse-design-system": "*",
     "@istanbuljs/nyc-config-typescript": "1.0.2",
     "@tanstack/react-table": "8.9.2",

From f33b8754533b25176707f48c6690095ff510b17c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Saracca?= <gersaracca@gmail.com>
Date: Mon, 19 Aug 2024 11:22:17 -0300
Subject: [PATCH 52/52] comment out js outdated file upload use case

---
 src/files/infrastructure/FileJSDataverseRepository.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/files/infrastructure/FileJSDataverseRepository.ts b/src/files/infrastructure/FileJSDataverseRepository.ts
index 89d6fea4b..de9ece5e6 100644
--- a/src/files/infrastructure/FileJSDataverseRepository.ts
+++ b/src/files/infrastructure/FileJSDataverseRepository.ts
@@ -15,7 +15,6 @@ import {
   getFileDownloadCount,
   getFileUserPermissions,
   uploadFile as jsUploadFile,
-  addUploadedFileToDataset,
   ReadError
 } from '@iqss/dataverse-client-javascript'
 import { FileCriteria } from '../domain/models/FileCriteria'
@@ -307,6 +306,7 @@ export class FileJSDataverseRepository implements FileRepository {
   }
 
   addUploadedFile(datasetId: number | string, file: FileHolder, storageId: string): Promise<void> {
-    return addUploadedFileToDataset.execute(datasetId, file.file, storageId)
+    return new Promise<void>(() => {})
+    // return addUploadedFilesToDataset.execute(datasetId, file.file)
   }
 }