Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): bump @dhis2/ui from 8.13.15 to 8.14.4 #2972

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .tx/config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[main]
host = https://www.transifex.com
lang_map = fa_AF: prs, uz@Cyrl: uz, uz@Latn: uz_Latn
lang_map = fa_AF: prs, uz@Cyrl: uz_UZ_Cyrl, uz@Latn: uz_UZ_Latn


[o:hisp-uio:p:app-maps:r:en-pot]
Expand Down
81 changes: 80 additions & 1 deletion cypress/integration/layers/thematiclayer.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
expectContextMenuOptions,
} from '../../elements/map_context_menu.js'
import { ThematicLayer } from '../../elements/thematic_layer.js'
import { CURRENT_YEAR } from '../../support/util.js'
import { CURRENT_YEAR, getApiBaseUrl } from '../../support/util.js'

const INDICATOR_NAME = 'VCCT post-test counselling rate'

Expand Down Expand Up @@ -136,4 +136,83 @@ 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}`
)
})
})
})
25 changes: 20 additions & 5 deletions i18n/ar.po
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#
# Translators:
# phil_dhis2, 2021
# Philip Larsen Donnelly, 2021
# Hamza Assada <[email protected]>, 2022
# Viktor Varland <[email protected]>, 2023
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2023-04-12T09:23:26.646Z\n"
"POT-Creation-Date: 2023-09-06T13:08:55.205Z\n"
"PO-Revision-Date: 2019-06-25 18:35+0000\n"
"Last-Translator: Viktor Varland <[email protected]>, 2023\n"
"Language-Team: Arabic (https://app.transifex.com/hisp-uio/teams/100509/ar/)\n"
Expand All @@ -26,6 +26,15 @@ msgstr ""
msgid "Failed to save map: {{message}}"
msgstr ""

msgid "Calculation"
msgstr ""

msgid "No calculations found"
msgstr ""

msgid "Calculations can be created in the Data Visualizer app."
msgstr ""

msgid "Classification"
msgstr "تصنيف"

Expand Down Expand Up @@ -429,6 +438,9 @@ msgstr "عنصر بيانات الحدث مطلوب"
msgid "Program indicator is required"
msgstr "مؤشر البرنامج مطلوب"

msgid "Calculation is required"
msgstr ""

msgid "Period is required"
msgstr "الفترة مطلوبة"

Expand All @@ -444,6 +456,9 @@ msgstr "عناصر بيانات الحدث"
msgid "Program indicators"
msgstr "مؤشرات البرنامج"

msgid "Calculations"
msgstr ""

msgid "Item type"
msgstr "نوع العنصر"

Expand Down Expand Up @@ -509,9 +524,6 @@ msgstr ""
msgid "Indicator group"
msgstr "مجموعة المؤشرات"

msgid "Interpretations"
msgstr "التفسيرات"

msgid "Collapse"
msgstr "انهيار"

Expand Down Expand Up @@ -1273,6 +1285,9 @@ msgstr ""
msgid "You don't have access to this layer data"
msgstr "ليس لديك حق الوصول إلى بيانات الطبقة هذه"

msgid "The event filter is not supported"
msgstr ""

msgid "An unknown error occurred while reading layer data"
msgstr "حدث خطأ غير معروف أثناء قراءة بيانات الطبقة"

Expand Down
23 changes: 19 additions & 4 deletions i18n/ar_IQ.po
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2023-04-12T09:23:26.646Z\n"
"POT-Creation-Date: 2023-09-06T13:08:55.205Z\n"
"PO-Revision-Date: 2019-06-25 18:35+0000\n"
"Last-Translator: KRG HIS <[email protected]>, 2021\n"
"Language-Team: Arabic (Iraq) (https://app.transifex.com/hisp-uio/teams/100509/ar_IQ/)\n"
Expand All @@ -24,6 +24,15 @@ msgstr ""
msgid "Failed to save map: {{message}}"
msgstr ""

msgid "Calculation"
msgstr ""

msgid "No calculations found"
msgstr ""

msgid "Calculations can be created in the Data Visualizer app."
msgstr ""

msgid "Classification"
msgstr ""

Expand Down Expand Up @@ -426,6 +435,9 @@ msgstr ""
msgid "Program indicator is required"
msgstr ""

msgid "Calculation is required"
msgstr ""

msgid "Period is required"
msgstr ""

Expand All @@ -441,6 +453,9 @@ msgstr ""
msgid "Program indicators"
msgstr ""

msgid "Calculations"
msgstr ""

msgid "Item type"
msgstr ""

Expand Down Expand Up @@ -506,9 +521,6 @@ msgstr ""
msgid "Indicator group"
msgstr ""

msgid "Interpretations"
msgstr "التفسيرات"

msgid "Collapse"
msgstr ""

Expand Down Expand Up @@ -1260,6 +1272,9 @@ msgstr ""
msgid "You don't have access to this layer data"
msgstr ""

msgid "The event filter is not supported"
msgstr ""

msgid "An unknown error occurred while reading layer data"
msgstr ""

Expand Down
27 changes: 21 additions & 6 deletions i18n/cs.po
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#
#
# Translators:
# Jiří Podhorecký, 2023
#
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2023-04-12T09:23:26.646Z\n"
"POT-Creation-Date: 2023-09-06T13:08:55.205Z\n"
"PO-Revision-Date: 2019-06-25 18:35+0000\n"
"Last-Translator: Jiří Podhorecký, 2023\n"
"Language-Team: Czech (https://app.transifex.com/hisp-uio/teams/100509/cs/)\n"
Expand All @@ -24,6 +24,15 @@ msgstr "Mapa \"{{- name}}\" je uložena."
msgid "Failed to save map: {{message}}"
msgstr "Nepodařilo se uložit mapu: {{message}}"

msgid "Calculation"
msgstr "Výpočet"

msgid "No calculations found"
msgstr ""

msgid "Calculations can be created in the Data Visualizer app."
msgstr ""

msgid "Classification"
msgstr "Klasifikace"

Expand Down Expand Up @@ -435,6 +444,9 @@ msgstr "Položka dat události je povinná"
msgid "Program indicator is required"
msgstr "Je vyžadován indikátor programu"

msgid "Calculation is required"
msgstr ""

msgid "Period is required"
msgstr "Období je vyžadováno"

Expand All @@ -450,6 +462,9 @@ msgstr "Položky dat události"
msgid "Program indicators"
msgstr "Ukazatele programu"

msgid "Calculations"
msgstr "Výpočty"

msgid "Item type"
msgstr "Typ položky"

Expand Down Expand Up @@ -516,9 +531,6 @@ msgstr "Styl podle sady skupiny"
msgid "Indicator group"
msgstr "Skupina indikátorů"

msgid "Interpretations"
msgstr "Interpretace"

msgid "Collapse"
msgstr "Sbalit"

Expand Down Expand Up @@ -1292,6 +1304,9 @@ msgstr "Chyba {{message}}"
msgid "You don't have access to this layer data"
msgstr "K datům této vrstvy nemáte přístup"

msgid "The event filter is not supported"
msgstr ""

msgid "An unknown error occurred while reading layer data"
msgstr "Při čtení dat vrstvy došlo k neznámé chybě"

Expand Down
27 changes: 21 additions & 6 deletions i18n/da.po
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#
# Translators:
# phil_dhis2, 2021
# Philip Larsen Donnelly, 2021
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2023-04-12T09:23:26.646Z\n"
"POT-Creation-Date: 2023-09-06T13:08:55.205Z\n"
"PO-Revision-Date: 2019-06-25 18:35+0000\n"
"Last-Translator: phil_dhis2, 2021\n"
"Last-Translator: Philip Larsen Donnelly, 2021\n"
"Language-Team: Danish (https://app.transifex.com/hisp-uio/teams/100509/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -24,6 +24,15 @@ msgstr ""
msgid "Failed to save map: {{message}}"
msgstr ""

msgid "Calculation"
msgstr ""

msgid "No calculations found"
msgstr ""

msgid "Calculations can be created in the Data Visualizer app."
msgstr ""

msgid "Classification"
msgstr ""

Expand Down Expand Up @@ -426,6 +435,9 @@ msgstr ""
msgid "Program indicator is required"
msgstr ""

msgid "Calculation is required"
msgstr ""

msgid "Period is required"
msgstr ""

Expand All @@ -441,6 +453,9 @@ msgstr ""
msgid "Program indicators"
msgstr ""

msgid "Calculations"
msgstr ""

msgid "Item type"
msgstr ""

Expand Down Expand Up @@ -506,9 +521,6 @@ msgstr ""
msgid "Indicator group"
msgstr "Indicator group"

msgid "Interpretations"
msgstr "Interpretations"

msgid "Collapse"
msgstr ""

Expand Down Expand Up @@ -1260,6 +1272,9 @@ msgstr ""
msgid "You don't have access to this layer data"
msgstr ""

msgid "The event filter is not supported"
msgstr ""

msgid "An unknown error occurred while reading layer data"
msgstr ""

Expand Down
Loading