From 0311045f5da79be423428458c2351c50ca8e5504 Mon Sep 17 00:00:00 2001
From: Mohammer5 <jan-gerke@dhis2.org>
Date: Mon, 4 Mar 2024 12:46:15 +0800
Subject: [PATCH] chore(data elements new form test): fix tests after some
 restructuring \w Birk

---
 .../form/attributes/CustomAttributes.tsx      |  1 -
 .../attributes/useCustomAttributesQuery.ts    |  1 -
 .../fields/DataElementsField.tsx              |  2 +-
 src/pages/dataElements/New.spec.tsx           | 26 ++++++++++++-------
 .../fields/AggregationLevelsField.tsx         |  4 +--
 .../fields/AggregationTypeField.tsx           |  2 +-
 .../fields/CategoryComboField.test.tsx        |  4 +--
 .../fields/CategoryComboField.tsx             |  4 +--
 .../dataElements/fields/ColorAndIconField.tsx |  2 +-
 src/pages/dataElements/fields/DomainField.tsx |  2 +-
 .../dataElements/fields/FieldMaskField.tsx    |  2 +-
 .../dataElements/fields/FormNameField.tsx     |  2 +-
 .../dataElements/fields/LegendSetField.tsx    |  2 +-
 .../fields/OptionSetCommentField.tsx          |  4 +--
 .../dataElements/fields/OptionSetField.tsx    |  4 +--
 src/pages/dataElements/fields/UrlField.tsx    |  2 +-
 .../dataElements/fields/ValueTypeField.tsx    |  2 +-
 .../fields/ZeroIsSignificantField.tsx         |  2 +-
 18 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/src/components/form/attributes/CustomAttributes.tsx b/src/components/form/attributes/CustomAttributes.tsx
index e6d44b4b..c02ba003 100644
--- a/src/components/form/attributes/CustomAttributes.tsx
+++ b/src/components/form/attributes/CustomAttributes.tsx
@@ -86,7 +86,6 @@ export function CustomAttributes() {
     const customAttributes = formState.initialValues.attributeValues?.map(
         (av) => av.attribute
     )
-    console.log('> <CustomAttribute /> customAttributes:', customAttributes)
 
     return (
         <>
diff --git a/src/components/form/attributes/useCustomAttributesQuery.ts b/src/components/form/attributes/useCustomAttributesQuery.ts
index 0c01b58b..97d2209e 100644
--- a/src/components/form/attributes/useCustomAttributesQuery.ts
+++ b/src/components/form/attributes/useCustomAttributesQuery.ts
@@ -28,7 +28,6 @@ interface QueryResponse {
 
 export function useCustomAttributesQuery() {
     const schemaSection = useSchemaSectionHandleOrThrow()
-
     const customAttributes = useDataQuery<QueryResponse>(
         CUSTOM_ATTRIBUTES_QUERY,
         { variables: { modelName: schemaSection.name } }
diff --git a/src/pages/dataElementGroups/fields/DataElementsField.tsx b/src/pages/dataElementGroups/fields/DataElementsField.tsx
index c030ac95..6ad0fe10 100644
--- a/src/pages/dataElementGroups/fields/DataElementsField.tsx
+++ b/src/pages/dataElementGroups/fields/DataElementsField.tsx
@@ -51,7 +51,7 @@ export function DataElementsField() {
 
     return (
         <Field
-            dataTest="dataelementsformfields-dataElementsets"
+            dataTest="formfields-dataElementsets"
             error={!!meta.error}
             validationText={meta.error?.toString()}
             name={name}
diff --git a/src/pages/dataElements/New.spec.tsx b/src/pages/dataElements/New.spec.tsx
index fe7ba0af..8e5173f4 100644
--- a/src/pages/dataElements/New.spec.tsx
+++ b/src/pages/dataElements/New.spec.tsx
@@ -9,6 +9,16 @@ import attributes from './__mocks__/attributes.json'
 import categoryCombosPage1 from './__mocks__/categoryCombosPage1.json'
 import { Component as New } from './New'
 
+jest.mock('../../lib/routeUtils/useSectionHandle', () => ({
+    useSchemaSectionHandleOrThrow: jest.fn(() => ({
+        name: 'dataElement',
+        namePlural: 'dataElements',
+        parentSectionKey: 'dataElement',
+        title: 'Data element',
+        titlePlural: 'Data elements',
+    })),
+}))
+
 // @TODO: For some reason string interpolation somewhere within the Transfer
 //        component does not get transpiled correctly for the cjs build when
 //        building the UI library. We'll have to address that at some point.
@@ -66,10 +76,10 @@ describe('Data Elements / New', () => {
     it('should return to the list view when cancelling', async () => {
         const router = createMemoryRouter(
             [
-                { path: '/new', element: <New /> },
+                { path: '/dataElements/new', element: <New /> },
                 { path: '/dataElements', element: <div>List view</div> },
             ],
-            { initialEntries: ['/new'] }
+            { initialEntries: ['/dataElements/new'] }
         )
 
         const result = render(
@@ -111,19 +121,17 @@ describe('Data Elements / New', () => {
         ).toHaveLength(3)
 
         const nameRequiredError = await result.findByText('Required', {
-            selector: '[data-test="dataelementsformfields-name-validation"]',
+            selector: '[data-test="formfields-name-validation"]',
         })
         expect(nameRequiredError).toBeTruthy()
 
         const shortNameRequiredError = await result.findByText('Required', {
-            selector:
-                '[data-test="dataelementsformfields-shortname-validation"]',
+            selector: '[data-test="formfields-shortname-validation"]',
         })
         expect(shortNameRequiredError).toBeTruthy()
 
         const categoryComboRequiredError = await result.findByText('Required', {
-            selector:
-                '[data-test="dataelementsformfields-categorycombo-validation"]',
+            selector: '[data-test="formfields-categorycombo-validation"]',
         })
         expect(categoryComboRequiredError).toBeTruthy()
     })
@@ -135,12 +143,12 @@ describe('Data Elements / New', () => {
             })
         const router = createMemoryRouter(
             [
-                { path: '/new', element: <New /> },
+                { path: '/dataElements/new', element: <New /> },
                 { path: '/dataElements', element: <div>List view</div> },
             ],
             {
                 initialIndex: 0,
-                initialEntries: ['/new'],
+                initialEntries: ['/dataElements/new'],
             }
         )
         const result = render(
diff --git a/src/pages/dataElements/fields/AggregationLevelsField.tsx b/src/pages/dataElements/fields/AggregationLevelsField.tsx
index c3c8610f..4f372083 100644
--- a/src/pages/dataElements/fields/AggregationLevelsField.tsx
+++ b/src/pages/dataElements/fields/AggregationLevelsField.tsx
@@ -30,7 +30,7 @@ export function AggregationLevelsField() {
 
     return (
         <EditableFieldWrapper
-            dataTest="dataelementsformfields-aggregationlevels"
+            dataTest="formfields-aggregationlevels"
             onRefresh={() => aggregationLevelHandle.current.refetch()}
             onAddNew={() => window.open(newAggregationLevelLink, '_blank')}
         >
@@ -43,7 +43,7 @@ export function AggregationLevelsField() {
                     )}
                     validationText={meta.touched ? meta.error : undefined}
                     error={meta.touched && !!meta.error}
-                    dataTest="dataelementsformfields-aggregationlevels"
+                    dataTest="formfields-aggregationlevels"
                 >
                     <AggregationLevelMultiSelect
                         ref={aggregationLevelHandle}
diff --git a/src/pages/dataElements/fields/AggregationTypeField.tsx b/src/pages/dataElements/fields/AggregationTypeField.tsx
index f4241df9..61cf88d0 100644
--- a/src/pages/dataElements/fields/AggregationTypeField.tsx
+++ b/src/pages/dataElements/fields/AggregationTypeField.tsx
@@ -58,7 +58,7 @@ export function AggregationTypeField() {
             key={disabled ? 0 : 1}
             disabled={disabled}
             component={SingleSelectFieldFF}
-            dataTest="dataelementsformfields-aggregationtype"
+            dataTest="formfields-aggregationtype"
             required={!disabled}
             inputWidth="400px"
             name="aggregationType"
diff --git a/src/pages/dataElements/fields/CategoryComboField.test.tsx b/src/pages/dataElements/fields/CategoryComboField.test.tsx
index a28515db..dcd7334f 100644
--- a/src/pages/dataElements/fields/CategoryComboField.test.tsx
+++ b/src/pages/dataElements/fields/CategoryComboField.test.tsx
@@ -48,9 +48,7 @@ describe('<CategoryComboField />', () => {
         fireEvent.click(submitButton)
 
         expect(
-            result.getByTestId(
-                'dataelementsformfields-categorycombo-validation'
-            )
+            result.getByTestId('formfields-categorycombo-validation')
         ).toBeTruthy()
         expect(onSubmit).toHaveBeenCalledTimes(0)
     })
diff --git a/src/pages/dataElements/fields/CategoryComboField.tsx b/src/pages/dataElements/fields/CategoryComboField.tsx
index 50e9f434..aa785bb8 100644
--- a/src/pages/dataElements/fields/CategoryComboField.tsx
+++ b/src/pages/dataElements/fields/CategoryComboField.tsx
@@ -50,7 +50,7 @@ export function CategoryComboField() {
 
     return (
         <EditableFieldWrapper
-            dataTest="dataelementsformfields-categorycombo"
+            dataTest="formfields-categorycombo"
             onRefresh={() => categoryComboHandle.current.refetch()}
             onAddNew={() => window.open(newCategoryComboLink, '_blank')}
         >
@@ -66,7 +66,7 @@ export function CategoryComboField() {
                     )}
                     error={meta.touched && !!meta.error}
                     validationText={meta.touched ? meta.error : undefined}
-                    dataTest="dataelementsformfields-categorycombo"
+                    dataTest="formfields-categorycombo"
                 >
                     <CategoryComboSelect
                         required
diff --git a/src/pages/dataElements/fields/ColorAndIconField.tsx b/src/pages/dataElements/fields/ColorAndIconField.tsx
index e0125322..3d0aa99d 100644
--- a/src/pages/dataElements/fields/ColorAndIconField.tsx
+++ b/src/pages/dataElements/fields/ColorAndIconField.tsx
@@ -14,7 +14,7 @@ export function ColorAndIconField() {
 
     return (
         <Field
-            dataTest="dataelementsformfields-colorandicon"
+            dataTest="formfields-colorandicon"
             label={i18n.t('Color and icon')}
             helpText={i18n.t(
                 'A color and icon are helpful for identifying data elements in information-dense screens.'
diff --git a/src/pages/dataElements/fields/DomainField.tsx b/src/pages/dataElements/fields/DomainField.tsx
index 7659d8e2..7ea36df3 100644
--- a/src/pages/dataElements/fields/DomainField.tsx
+++ b/src/pages/dataElements/fields/DomainField.tsx
@@ -35,7 +35,7 @@ export function DomainField() {
     return (
         <Field
             required
-            dataTest="dataelementsformfields-domaintype"
+            dataTest="formfields-domaintype"
             name={name}
             label={i18n.t('{{fieldLabel}} (required)', {
                 fieldLabel: i18n.t('Domain'),
diff --git a/src/pages/dataElements/fields/FieldMaskField.tsx b/src/pages/dataElements/fields/FieldMaskField.tsx
index 0ee56aaa..7ff88954 100644
--- a/src/pages/dataElements/fields/FieldMaskField.tsx
+++ b/src/pages/dataElements/fields/FieldMaskField.tsx
@@ -15,7 +15,7 @@ export function FieldMaskField() {
         <FieldRFF
             component={InputFieldFF}
             inputWidth="400px"
-            dataTest="dataelementsformfields-fieldmask"
+            dataTest="formfields-fieldmask"
             name="fieldMask"
             label={i18n.t('Field mask')}
             helpText={i18n.t(
diff --git a/src/pages/dataElements/fields/FormNameField.tsx b/src/pages/dataElements/fields/FormNameField.tsx
index 6f2c3ea1..99354f8e 100644
--- a/src/pages/dataElements/fields/FormNameField.tsx
+++ b/src/pages/dataElements/fields/FormNameField.tsx
@@ -14,7 +14,7 @@ export function FormNameField() {
     return (
         <FieldRFF
             component={InputFieldFF}
-            dataTest="dataelementsformfields-formname"
+            dataTest="formfields-formname"
             inputWidth="400px"
             name="formName"
             label={i18n.t('Form name')}
diff --git a/src/pages/dataElements/fields/LegendSetField.tsx b/src/pages/dataElements/fields/LegendSetField.tsx
index 88e6acab..53fc0dd5 100644
--- a/src/pages/dataElements/fields/LegendSetField.tsx
+++ b/src/pages/dataElements/fields/LegendSetField.tsx
@@ -53,7 +53,7 @@ export function LegendSetField() {
 
     return (
         <Field
-            dataTest="dataelementsformfields-legendsets"
+            dataTest="formfields-legendsets"
             error={!!meta.error}
             validationText={meta.error?.toString()}
             name={name}
diff --git a/src/pages/dataElements/fields/OptionSetCommentField.tsx b/src/pages/dataElements/fields/OptionSetCommentField.tsx
index f82a2758..9c9163b3 100644
--- a/src/pages/dataElements/fields/OptionSetCommentField.tsx
+++ b/src/pages/dataElements/fields/OptionSetCommentField.tsx
@@ -28,7 +28,7 @@ export function OptionSetCommentField() {
 
     return (
         <EditableFieldWrapper
-            dataTest="dataelementsformfields-commentoptionset"
+            dataTest="formfields-commentoptionset"
             onRefresh={() => optionSetHandle.current.refetch()}
             onAddNew={() => window.open(newOptionSetLink, '_blank')}
         >
@@ -41,7 +41,7 @@ export function OptionSetCommentField() {
                     )}
                     validationText={meta.touched ? meta.error : undefined}
                     error={meta.touched && !!meta.error}
-                    dataTest="dataelementsformfields-commentoptionset"
+                    dataTest="formfields-commentoptionset"
                 >
                     <OptionSetSelect
                         showAllOption
diff --git a/src/pages/dataElements/fields/OptionSetField.tsx b/src/pages/dataElements/fields/OptionSetField.tsx
index 6d72a56d..9291eb12 100644
--- a/src/pages/dataElements/fields/OptionSetField.tsx
+++ b/src/pages/dataElements/fields/OptionSetField.tsx
@@ -23,7 +23,7 @@ export function OptionSetField() {
 
     return (
         <EditableFieldWrapper
-            dataTest="dataelementsformfields-optionset"
+            dataTest="formfields-optionset"
             onRefresh={() => optionSetHandle.current.refetch()}
             onAddNew={() => window.open(newOptionSetLink, '_blank')}
         >
@@ -36,7 +36,7 @@ export function OptionSetField() {
                     )}
                     validationText={meta.touched ? meta.error : undefined}
                     error={meta.touched && !!meta.error}
-                    dataTest="dataelementsformfields-optionset"
+                    dataTest="formfields-optionset"
                 >
                     <OptionSetSelect
                         showAllOption
diff --git a/src/pages/dataElements/fields/UrlField.tsx b/src/pages/dataElements/fields/UrlField.tsx
index 2906a762..25c4f274 100644
--- a/src/pages/dataElements/fields/UrlField.tsx
+++ b/src/pages/dataElements/fields/UrlField.tsx
@@ -14,7 +14,7 @@ export function UrlField() {
     return (
         <FieldRFF
             component={InputFieldFF}
-            dataTest="dataelementsformfields-url"
+            dataTest="formfields-url"
             inputWidth="400px"
             name="url"
             label={i18n.t('Url')}
diff --git a/src/pages/dataElements/fields/ValueTypeField.tsx b/src/pages/dataElements/fields/ValueTypeField.tsx
index 481009fc..22ffe8fb 100644
--- a/src/pages/dataElements/fields/ValueTypeField.tsx
+++ b/src/pages/dataElements/fields/ValueTypeField.tsx
@@ -77,7 +77,7 @@ export function ValueTypeField() {
             required
             disabled={disabled}
             component={SingleSelectFieldFF}
-            dataTest="dataelementsformfields-valuetype"
+            dataTest="formfields-valuetype"
             inputWidth="400px"
             name="valueType"
             label={i18n.t('{{fieldLabel}} (required)', {
diff --git a/src/pages/dataElements/fields/ZeroIsSignificantField.tsx b/src/pages/dataElements/fields/ZeroIsSignificantField.tsx
index 6108531c..b863de30 100644
--- a/src/pages/dataElements/fields/ZeroIsSignificantField.tsx
+++ b/src/pages/dataElements/fields/ZeroIsSignificantField.tsx
@@ -7,7 +7,7 @@ export function ZeroIsSignificantField() {
     return (
         <FieldRFF
             component={CheckboxFieldFF}
-            dataTest="dataelementsformfields-zeroissignificant"
+            dataTest="formfields-zeroissignificant"
             name="zeroIsSignificant"
             label={i18n.t('Store zero data values')}
             type="checkbox"