chore: add cypress tests for name property

dhis2 · Sep 29, 2023 · 00ca2ab · 00ca2ab
1 parent 8cb981c
commit 00ca2ab
Show file tree

Hide file tree

Showing 7 changed files with 94 additions and 5 deletions.
diff --git a/cypress/elements/thematic_layer.js b/cypress/elements/thematic_layer.js
@@ -1,6 +1,12 @@
 import { Layer } from './layer.js'
 
 export class ThematicLayer extends Layer {
+    selectItemType(itemType) {
+        cy.getByDataTest('itemtypeselect').click()
+        cy.contains(itemType).click()
+
+        return this
+    }
     selectIndicatorGroup(indicatorGroup) {
         cy.get('[data-test="indicatorgroupselect"]').click()
         cy.contains(indicatorGroup).click()
@@ -15,6 +21,33 @@ export class ThematicLayer extends Layer {
         return this
     }
 
+    selectDataElementGroup(dataElementGroup) {
+        cy.getByDataTest('dataelementgroupselect').click()
+        cy.getByDataTest('dhis2-uicore-singleselectoption')
+            .contains(dataElementGroup)
+            .click()
+
+        return this
+    }
+
+    selectDataElement(dataElement) {
+        cy.getByDataTest('dataelementselect').click()
+        cy.getByDataTest('dhis2-uicore-singleselectoption')
+            .contains(dataElement)
+            .click()
+
+        return this
+    }
+
+    selectDataElementOperand(dataElementOperand) {
+        cy.getByDataTest('dataelementoperandselect').click()
+        cy.getByDataTest('dhis2-uicore-singleselectoption')
+            .contains(dataElementOperand)
+            .click()
+
+        return this
+    }
+
     selectPeriodType(periodType) {
         cy.get('[data-test="periodtypeselect"]').click()
         cy.contains(periodType).click()

diff --git a/cypress/integration/usersettings.cy.js b/cypress/integration/usersettings.cy.js
@@ -1,3 +1,4 @@
+import { ThematicLayer } from '../elements/thematic_layer.js'
 import { EXTENDED_TIMEOUT, getApiBaseUrl } from '../support/util.js'
 
 const testMap = {
@@ -17,7 +18,6 @@ describe('userSettings', () => {
             body: 'nb',
         }).then((response) => {
             expect(response.status).to.eq(200)
-            cy.log('language switched to', response.message)
 
             cy.visit(`/?id=${testMap.id}`)
             cy.get('[data-test=layercard]')
@@ -66,4 +66,58 @@ describe('userSettings', () => {
             })
         })
     })
+
+    it.only('uses the correct name property', () => {
+        cy.request({
+            method: 'POST',
+            url: `${getApiBaseUrl()}/api/userSettings/keyAnalysisDisplayProperty`,
+            headers: {
+                'Content-Type': 'text/plain',
+            },
+            body: 'shortName',
+        }).then((response) => {
+            expect(response.status).to.eq(200)
+
+            cy.visit('/')
+            const ThemLayer = new ThematicLayer()
+            ThemLayer.openDialog('Thematic')
+                .selectIndicatorGroup('ANC')
+                .selectIndicator('ANC visit clinical prof')
+
+            ThemLayer.selectItemType('Data element')
+                .selectDataElementGroup('Acute Flaccid Paralysis (AFP)')
+                .selectDataElement('AFP follow-up')
+
+            cy.get('input[type=radio][value=details]').click()
+            ThemLayer.selectDataElementOperand('AFP follow-up 0-11m')
+
+            cy.request({
+                method: 'POST',
+                url: `${getApiBaseUrl()}/api/userSettings/keyAnalysisDisplayProperty`,
+                headers: {
+                    'Content-Type': 'text/plain',
+                },
+                body: 'name',
+            }).then((response) => {
+                expect(response.status).to.eq(200)
+
+                cy.visit('/')
+                const ThemLayer = new ThematicLayer()
+                ThemLayer.openDialog('Thematic')
+                    .selectIndicatorGroup('ANC')
+                    .selectIndicator('ANC visits per clinical professional')
+
+                ThemLayer.selectItemType('Data element')
+                    .selectDataElementGroup('Acute Flaccid Paralysis (AFP)')
+                    .selectDataElement(
+                        'Acute Flaccid Paralysis (AFP) follow-up'
+                    )
+
+                cy.get('input[type=radio][value=details]').click()
+                ThemLayer.selectDataElementOperand(
+                    'Acute Flaccid Paralysis (AFP) follow-up 0-11m'
+                )
+            })
+        })
+    })
 })
diff --git a/src/components/app/FileMenu.js b/src/components/app/FileMenu.js
@@ -1,6 +1,5 @@
 import { FileMenu as UiFileMenu, useCachedDataQuery } from '@dhis2/analytics'
 import { useDataMutation, useDataEngine } from '@dhis2/app-runtime'
-import { useD2 } from '@dhis2/app-runtime-adapter-d2'
 import { useAlert } from '@dhis2/app-service-alerts'
 import i18n from '@dhis2/d2-i18n'
 import PropTypes from 'prop-types'
@@ -53,11 +52,10 @@ const getSaveFailureMessage = (message) =>
     })
 
 const FileMenu = ({ onFileMenuAction }) => {
-    const { d2 } = useD2()
     const engine = useDataEngine()
     const map = useSelector((state) => state.map)
     const dispatch = useDispatch()
-    const { systemSettings, basemaps } = useCachedDataQuery()
+    const { systemSettings, currentUser, basemaps } = useCachedDataQuery()
     const defaultBasemap = systemSettings.keyDefaultBaseMap
     //alerts
     const saveAlert = useAlert(ALERT_MESSAGE_DYNAMIC, ALERT_OPTIONS_DYNAMIC)
@@ -188,7 +186,7 @@ const FileMenu = ({ onFileMenuAction }) => {
 
     return (
         <UiFileMenu
-            currentUser={d2.currentUser}
+            currentUser={currentUser}
             fileType="map"
             fileObject={map}
             onNew={onNew}

diff --git a/src/components/dataElement/DataElementGroupSelect.js b/src/components/dataElement/DataElementGroupSelect.js
@@ -39,6 +39,7 @@ const DataElementGroupSelect = ({
                 error?.message ||
                 (!dataElementGroup && errorText ? errorText : null)
             }
+            dataTest="dataelementgroupselect"
         />
     )
 }

diff --git a/src/components/dataElement/DataElementOperandSelect.js b/src/components/dataElement/DataElementOperandSelect.js
@@ -62,6 +62,7 @@ const DataElementOperandSelect = ({
             errorText={
                 error?.message || (!dataElement && errorText ? errorText : null)
             }
+            dataTest="dataelementoperandselect"
         />
     )
 }

diff --git a/src/components/dataElement/DataElementSelect.js b/src/components/dataElement/DataElementSelect.js
@@ -66,6 +66,7 @@ const DataElementSelect = ({
             errorText={
                 error?.message || (!dataElement && errorText ? errorText : null)
             }
+            dataTest="dataelementselect"
         />
     )
 }

diff --git a/src/components/edit/thematic/ValueTypeSelect.js b/src/components/edit/thematic/ValueTypeSelect.js
@@ -35,6 +35,7 @@ const ValueTypeSelect = (props) => {
             value={type}
             onChange={(valueType) => onChange(valueType.id)}
             className={className}
+            dataTest="itemtypeselect"
         />
     )
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,6 +39,7 @@ const DataElementGroupSelect = ({ @@
                     error?.message ||
                     (!dataElementGroup && errorText ? errorText : null)
                 }
+                dataTest="dataelementgroupselect"
             />
         )
     }
@@ Expand Down @@