revert: "chore: fixed period select refactor (#2958)" (#2984)

This reverts commit 8fdd67e.
dhis2 · Sep 25, 2023 · f532a81 · f532a81
1 parent 202fae0
commit f532a81
Show file tree

Hide file tree

Showing 12 changed files with 142 additions and 351 deletions.
diff --git a/cypress/integration/layers/thematiclayer.cy.js b/cypress/integration/layers/thematiclayer.cy.js
@@ -6,7 +6,7 @@ import {
     expectContextMenuOptions,
 } from '../../elements/map_context_menu.js'
 import { ThematicLayer } from '../../elements/thematic_layer.js'
-import { CURRENT_YEAR, getApiBaseUrl } from '../../support/util.js'
+import { CURRENT_YEAR } from '../../support/util.js'
 
 const INDICATOR_NAME = 'VCCT post-test counselling rate'
 
@@ -136,83 +136,4 @@ context('Thematic Layers', () => {
             { name: VIEW_PROFILE },
         ])
     })
-
-    // TODO - update demo database with calculations instead of creating on the fly
-    it('adds a thematic layer with a calculation', () => {
-        const timestamp = new Date().toUTCString().slice(-24, -4)
-        const calculationName = `map calc ${timestamp}`
-
-        // add a calculation
-        cy.request('POST', `${getApiBaseUrl()}/api/expressionDimensionItems`, {
-            name: calculationName,
-            shortName: calculationName,
-            expression: '#{fbfJHSPpUQD}/2',
-        }).then((response) => {
-            expect(response.status).to.eq(201)
-
-            const calculationUid = response.body.response.uid
-
-            // open thematic dialog
-            cy.getByDataTest('add-layer-button').click()
-            cy.getByDataTest('addlayeritem-thematic').click()
-
-            // choose "Calculation" in item type
-            cy.getByDataTest('thematic-layer-value-type-select').click()
-            cy.contains('Calculations').click()
-
-            // assert that the label on the Calculation select is "Calculation"
-            cy.getByDataTest('calculationselect-label').contains('Calculation')
-
-            // click to open the calculation select
-            cy.getByDataTest('calculationselect').click()
-
-            // check search box exists "Type to filter options"
-            cy.getByDataTest('dhis2-uicore-popper')
-                .find('input[type="text"]')
-                .should('have.attr', 'placeholder', 'Type to filter options')
-
-            // search for something that doesn't exist
-            cy.getByDataTest('dhis2-uicore-popper')
-                .find('input[type="text"]')
-                .type('foo')
-
-            cy.getByDataTest('dhis2-uicore-select-menu-menuwrapper')
-                .contains('No options found')
-                .should('be.visible')
-
-            // try search for something that exists
-            cy.getByDataTest('dhis2-uicore-popper')
-                .find('input[type="text"]')
-                .clear()
-
-            cy.getByDataTest('dhis2-uicore-popper')
-                .find('input[type="text"]')
-                .type(calculationName)
-
-            cy.getByDataTest('dhis2-uicore-select-menu-menuwrapper')
-                .contains(calculationName)
-                .should('be.visible')
-
-            // select the calculation and close dialog
-            cy.contains(calculationName).click()
-
-            cy.getByDataTest('dhis2-uicore-modalactions')
-                .contains('Add layer')
-                .click()
-
-            // check the layer card title
-            cy.getByDataTest('layercard')
-                .contains(calculationName, { timeout: 50000 })
-                .should('be.visible')
-
-            // check the map canvas is displayed
-            cy.get('canvas.maplibregl-canvas').should('be.visible')
-
-            // delete the calculation
-            cy.request(
-                'DELETE',
-                `${getApiBaseUrl()}/api/expressionDimensionItems/${calculationUid}`
-            )
-        })
-    })
 })
diff --git a/i18n/en.pot b/i18n/en.pot
@@ -17,15 +17,6 @@ msgstr "Map \"{{- name}}\" is saved."
 msgid "Failed to save map: {{message}}"
 msgstr "Failed to save map: {{message}}"
 
-msgid "Calculation"
-msgstr "Calculation"
-
-msgid "No calculations found"
-msgstr "No calculations found"
-
-msgid "Calculations can be created in the Data Visualizer app."
-msgstr "Calculations can be created in the Data Visualizer app."
-
 msgid "Classification"
 msgstr "Classification"
 
@@ -430,9 +421,6 @@ msgstr "Event data item is required"
 msgid "Program indicator is required"
 msgstr "Program indicator is required"
 
-msgid "Calculation is required"
-msgstr "Calculation is required"
-
 msgid "Period is required"
 msgstr "Period is required"
 
@@ -448,9 +436,6 @@ msgstr "Event data items"
 msgid "Program indicators"
 msgstr "Program indicators"
 
-msgid "Calculations"
-msgstr "Calculations"
-
 msgid "Item type"
 msgstr "Item type"
 

diff --git a/src/components/calculations/CalculationSelect.js b/src/components/calculations/CalculationSelect.js
diff --git a/src/components/calculations/styles/CalculationSelect.module.css b/src/components/calculations/styles/CalculationSelect.module.css
diff --git a/src/components/core/SelectField.js b/src/components/core/SelectField.js
@@ -17,7 +17,6 @@ import styles from './styles/InputField.module.css'
 const SelectField = (props) => {
     const {
         dense = true,
-        emptyText,
         errorText,
         helpText,
         warning,
@@ -26,7 +25,6 @@ const SelectField = (props) => {
         prefix,
         loading,
         multiple,
-        filterable,
         disabled,
         onChange,
         className,
@@ -67,14 +65,12 @@ const SelectField = (props) => {
                 label={label}
                 prefix={prefix}
                 selected={!isLoading ? selected : undefined}
-                filterable={filterable}
                 disabled={disabled}
                 loading={isLoading}
                 error={!!errorText}
                 warning={!!warning}
                 validationText={warning ? warning : errorText}
                 helpText={helpText}
-                empty={emptyText}
                 onChange={onSelectChange}
                 dataTest={dataTest}
             >
@@ -92,9 +88,7 @@ SelectField.propTypes = {
     dataTest: PropTypes.string,
     dense: PropTypes.bool,
     disabled: PropTypes.bool,
-    emptyText: PropTypes.string, // If set, shows empty text when no options
     errorText: PropTypes.string, // If set, shows the error message below the SelectField
-    filterable: PropTypes.bool,
     helpText: PropTypes.string, // If set, shows the help text below the SelectField
     items: PropTypes.arrayOf(
         PropTypes.shape({

diff --git a/src/components/edit/thematic/ThematicDialog.js b/src/components/edit/thematic/ThematicDialog.js
@@ -36,7 +36,6 @@ import {
 } from '../../../util/analytics.js'
 import { isPeriodAvailable } from '../../../util/periods.js'
 import { getStartEndDateError } from '../../../util/time.js'
-import CalculationSelect from '../../calculations/CalculationSelect.js'
 import NumericLegendStyle from '../../classification/NumericLegendStyle.js'
 import { Tab, Tabs } from '../../core/index.js'
 import DataElementGroupSelect from '../../dataElement/DataElementGroupSelect.js'
@@ -256,7 +255,6 @@ class ThematicDialog extends Component {
             dataElementError,
             dataSetError,
             programError,
-            calculationError,
             eventDataItemError,
             programIndicatorError,
             periodTypeError,
@@ -410,14 +408,6 @@ class ThematicDialog extends Component {
                                     />
                                 ),
                             ]}
-                            {valueType === dimConf.calculation.objectName && (
-                                <CalculationSelect
-                                    calculation={dataItem}
-                                    onChange={setDataItem}
-                                    className={styles.select}
-                                    errorText={calculationError}
-                                />
-                            )}
                             <AggregationTypeSelect className={styles.select} />
                             <CompletedOnlyCheckbox valueType={valueType} />
                         </div>
@@ -619,14 +609,6 @@ class ThematicDialog extends Component {
             }
         }
 
-        if (valueType === dimConf.calculation.objectName && !dataItem) {
-            return this.setErrorState(
-                'calculationError',
-                i18n.t('Calculation is required'),
-                'data'
-            )
-        }
-
         if (!period && periodType !== START_END_DATES) {
             return this.setErrorState(
                 'periodError',

diff --git a/src/components/edit/thematic/ValueTypeSelect.js b/src/components/edit/thematic/ValueTypeSelect.js
@@ -1,44 +1,40 @@
 import i18n from '@dhis2/d2-i18n'
 import PropTypes from 'prop-types'
-import React, { useMemo } from 'react'
+import React from 'react'
 import { dimConf } from '../../../constants/dimension.js'
 import { SelectField } from '../../core/index.js'
 
-const getValueTypes = () => [
-    { id: dimConf.indicator.objectName, name: i18n.t('Indicator') },
-    { id: dimConf.dataElement.objectName, name: i18n.t('Data element') },
-    { id: dimConf.dataSet.objectName, name: i18n.t('Reporting rates') },
-    {
-        id: dimConf.eventDataItem.objectName,
-        name: i18n.t('Event data items'),
-    },
-    {
-        id: dimConf.programIndicator.objectName,
-        name: i18n.t('Program indicators'),
-    },
-    {
-        id: dimConf.calculation.objectName,
-        name: i18n.t('Calculations'),
-    },
-]
-
-const ValueTypeSelect = ({ value, onChange, className }) => {
-    const items = useMemo(() => getValueTypes(), [])
+const ValueTypeSelect = (props) => {
+    const { value, onChange, className } = props
 
     // If value type is data element operand, make it data element
     const type =
         value === dimConf.operand.objectName
             ? dimConf.dataElement.objectName
             : value
 
+    // TODO: Avoid creating on each render (needs to be created after i18next contains translations
+    const items = [
+        { id: dimConf.indicator.objectName, name: i18n.t('Indicator') },
+        { id: dimConf.dataElement.objectName, name: i18n.t('Data element') },
+        { id: dimConf.dataSet.objectName, name: i18n.t('Reporting rates') },
+        {
+            id: dimConf.eventDataItem.objectName,
+            name: i18n.t('Event data items'),
+        },
+        {
+            id: dimConf.programIndicator.objectName,
+            name: i18n.t('Program indicators'),
+        },
+    ]
+
     return (
         <SelectField
             label={i18n.t('Item type')}
             items={items}
             value={type}
             onChange={(valueType) => onChange(valueType.id)}
             className={className}
-            dataTest="thematic-layer-value-type-select"
         />
     )
 }

diff --git a/src/components/layers/overlays/OverlayCard.js b/src/components/layers/overlays/OverlayCard.js
@@ -105,10 +105,7 @@ const OverlayCard = ({
                               await set(currentAO)
 
                               // Open it in another app
-                              window.open(
-                                  `${baseUrl}/${APP_URLS[type]}/#/currentAnalyticalObject`,
-                                  '_blank'
-                              )
+                              window.location.href = `${baseUrl}/${APP_URLS[type]}/#/currentAnalyticalObject`
                           }
                         : undefined
                 }

diff --git a/src/components/orgunits/OrgUnitData.js b/src/components/orgunits/OrgUnitData.js
@@ -23,7 +23,7 @@ const ORGUNIT_PROFILE_QUERY = {
 // Only YEARLY period type is supported in first version
 const periodType = 'YEARLY'
 const currentYear = String(new Date().getFullYear())
-const periods = getFixedPeriodsByType({ periodType, currentYear })
+const periods = getFixedPeriodsByType(periodType, currentYear)
 const defaultPeriod = filterFuturePeriods(periods)[0] || periods[0]
 
 /*