Skip to content

Commit

Permalink
Merge branch 'dev' into dependabot/npm_and_yarn/get-func-name-2.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
jenniferarnesen authored Jan 23, 2024
2 parents 172d77a + 3518e64 commit e497c13
Show file tree
Hide file tree
Showing 12 changed files with 319 additions and 140 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
## [100.0.4](https://github.com/dhis2/dashboard-app/compare/v100.0.3...v100.0.4) (2023-11-06)


### Bug Fixes

* **translations:** sync translations from transifex (dev) ([9ebfa9f](https://github.com/dhis2/dashboard-app/commit/9ebfa9f06342d04dea506d146f0b686dea25e23e))
* **translations:** sync translations from transifex (dev) ([9c6c0c6](https://github.com/dhis2/dashboard-app/commit/9c6c0c65a20852fd0f1187cc5a359c9180d5b43b))
* **translations:** sync translations from transifex (dev) ([31fc356](https://github.com/dhis2/dashboard-app/commit/31fc356ff3fa0087cd8b91bfd9644e443b1e7c63))
* **translations:** sync translations from transifex (dev) ([b9e9499](https://github.com/dhis2/dashboard-app/commit/b9e9499e4c9a45071599338aecbcf75c8e3c0f14))
* **translations:** sync translations from transifex (dev) ([3fbcee7](https://github.com/dhis2/dashboard-app/commit/3fbcee74a5f6f12127f71770ae892ffb11a3a189))

## [100.0.3](https://github.com/dhis2/dashboard-app/compare/v100.0.2...v100.0.3) (2023-09-13)


Expand Down
15 changes: 8 additions & 7 deletions cypress/integration/edit/edit_dashboard/show_description.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ import { When, Then } from 'cypress-cucumber-preprocessor/steps'
import { clickViewActionButton } from '../../../elements/viewDashboard.js'
import { getApiBaseUrl } from '../../../support/utils.js'

const SHOW_DESC_RESP_CODE_SUCCESS = 201
const SHOW_DESC_RESP_CODE_FAIL = 409
const RESP_CODE_200 = 200
const RESP_CODE_201 = 201
const RESP_CODE_FAIL = 409

before(() => {
//ensure that the description is not currently shown
Expand All @@ -15,7 +16,7 @@ before(() => {
},
body: 'false',
}).then((response) =>
expect(response.status).to.equal(SHOW_DESC_RESP_CODE_SUCCESS)
expect(response.status).to.be.oneOf([RESP_CODE_201, RESP_CODE_200])
)
})

Expand All @@ -29,7 +30,7 @@ When('I click to show description', () => {

cy.wait('@toggleDescription')
.its('response.statusCode')
.should('eq', SHOW_DESC_RESP_CODE_SUCCESS)
.should('be.oneOf', [RESP_CODE_200, RESP_CODE_201])
})

When('I click to hide the description', () => {
Expand All @@ -38,20 +39,20 @@ When('I click to hide the description', () => {

cy.wait('@toggleDescription')
.its('response.statusCode')
.should('eq', SHOW_DESC_RESP_CODE_SUCCESS)
.should('be.oneOf', [RESP_CODE_200, RESP_CODE_201])
})

// Error scenario
When('clicking to show description fails', () => {
cy.intercept('PUT', 'userDataStore/dashboard/showDescription', {
statusCode: SHOW_DESC_RESP_CODE_FAIL,
statusCode: RESP_CODE_FAIL,
}).as('showDescriptionFails')

clickViewActionButton('More')
cy.contains('Show description').click()
cy.wait('@showDescriptionFails')
.its('response.statusCode')
.should('eq', SHOW_DESC_RESP_CODE_FAIL)
.should('eq', RESP_CODE_FAIL)
})

Then(
Expand Down
15 changes: 12 additions & 3 deletions cypress/integration/view/view_dashboard/resize_dashboards_bar.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ import {
} from '../../../elements/viewDashboard.js'
import { EXTENDED_TIMEOUT } from '../../../support/utils.js'

const RESP_CODE_200 = 200
const RESP_CODE_201 = 201

// Scenario: I change the height of the control bar
When('I drag to increase the height of the control bar', () => {
cy.intercept('PUT', '/userDataStore/dashboard/controlBarRows').as('putRows')
Expand All @@ -14,7 +17,9 @@ When('I drag to increase the height of the control bar', () => {
.trigger('mousemove', { clientY: 300 })
.trigger('mouseup')

cy.wait('@putRows').its('response.statusCode').should('eq', 201)
cy.wait('@putRows')
.its('response.statusCode')
.should('be.oneOf', [RESP_CODE_200, RESP_CODE_201])
})

Then('the control bar height should be updated', () => {
Expand All @@ -29,7 +34,9 @@ Then('the control bar height should be updated', () => {
.trigger('mousedown')
.trigger('mousemove', { clientY: 71 })
.trigger('mouseup')
cy.wait('@putRows').its('response.statusCode').should('eq', 201)
cy.wait('@putRows')
.its('response.statusCode')
.should('be.oneOf', [RESP_CODE_200, RESP_CODE_201])
})

When('I drag to decrease the height of the control bar', () => {
Expand All @@ -40,5 +47,7 @@ When('I drag to decrease the height of the control bar', () => {
.trigger('mousemove', { clientY: 300 })
.trigger('mouseup')

cy.wait('@putRows').its('response.statusCode').should('eq', 201)
cy.wait('@putRows')
.its('response.statusCode')
.should('be.oneOf', [RESP_CODE_200, RESP_CODE_201])
})
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ import { getApiBaseUrl, EXTENDED_TIMEOUT } from '../../../support/utils.js'
const MIN_DASHBOARDS_BAR_HEIGHT = 71
const MAX_DASHBOARDS_BAR_HEIGHT = 431

const RESP_CODE_200 = 200
const RESP_CODE_201 = 201

beforeEach(() => {
cy.request({
method: 'PUT',
Expand All @@ -17,7 +20,9 @@ beforeEach(() => {
'content-type': 'application/json',
},
body: '1',
}).then((response) => expect(response.status).to.equal(201))
}).then((response) =>
expect(response.status).to.be.oneOf([RESP_CODE_201, RESP_CODE_200])
)
})

When('I toggle show more dashboards', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import { When, Then } from 'cypress-cucumber-preprocessor/steps'
import { getApiBaseUrl } from '../../../support/utils.js'

const RESP_CODE_200 = 200
const RESP_CODE_201 = 201
const RESP_CODE_FAIL = 409

// Error scenario

before(() => {
Expand All @@ -12,20 +16,22 @@ before(() => {
'content-type': 'application/json',
},
body: 'false',
}).then((response) => expect(response.status).to.equal(201))
}).then((response) =>
expect(response.status).to.be.oneOf([RESP_CODE_201, RESP_CODE_200])
)
})

When('clicking to show description fails', () => {
cy.intercept('PUT', 'userDataStore/dashboard/showDescription', {
statusCode: 409,
statusCode: RESP_CODE_FAIL,
}).as('showDescriptionFails')

cy.get('button').contains('More').click()
cy.contains('Show description').click()

cy.wait('@showDescriptionFails')
.its('response.statusCode')
.should('eq', 409)
.should('eq', RESP_CODE_FAIL)
})

Then(
Expand Down
41 changes: 34 additions & 7 deletions i18n/cs.po
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#
# Translators:
# trendspotter <[email protected]>, 2021
# Jiří Podhorecký, 2023
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2021-12-21T08:20:25.327Z\n"
"POT-Creation-Date: 2023-05-03T11:08:21.315Z\n"
"PO-Revision-Date: 2019-06-25 12:37+0000\n"
"Last-Translator: trendspotter <[email protected]>, 2021\n"
"Language-Team: Czech (https://www.transifex.com/hisp-uio/teams/100509/cs/)\n"
"Last-Translator: Jiří Podhorecký, 2023\n"
"Language-Team: Czech (https://app.transifex.com/hisp-uio/teams/100509/cs/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand Down Expand Up @@ -72,6 +72,12 @@ msgstr "Textová položka"
msgid "Add text here"
msgstr "Sem přidat text"

msgid "Filters are not applied to line list dashboard items"
msgstr "Filtry se nepoužívají na položky ovládacího panelu řádkového seznamu"

msgid "Filters not applied"
msgstr "Filtry nejsou použity"

msgid "There was a problem loading this dashboard item"
msgstr "Při načítání této položky ovládacího panelu došlo k problému"

Expand Down Expand Up @@ -105,15 +111,33 @@ msgstr "Zobrazit jako mapu"
msgid "There was a problem loading interpretations for this item"
msgstr "Při načítání interpretací této položky došlo k problému"

msgid "The plugin for rendering this item is not available"
msgstr "Plugin pro vykreslení této položky není k dispozici"

msgid "Install the {{appName}} app from the App Hub"
msgstr "Nainstalujte si aplikaci {{appName}} z App Hub"

msgid "No data to display"
msgstr "Žádná data k zobrazení"

msgid ""
"Install Line Listing app version ${minLLVersion.join(\n"
" '.'\n"
" )} or higher in order to display this item."
msgstr ""
"Nainstalovat aplikaci Line Listing verze ${minLLVersion.join(\n"
" '.'\n"
" )} nebo vyšší pro zobrazení této položky."

msgid "Show without filters"
msgstr "Zobrazit bez filtrů"

msgid "Maps with Earth Engine layers cannot be displayed when offline"
msgstr "Mapy s vrstvami Earth Engine nelze zobrazit v režimu offline"

msgid "Unable to load the plugin for this item"
msgstr "Nelze načíst plugin pro tuto položku"

msgid "No data to display"
msgstr "Žádná data k zobrazení"

msgid "There was an error loading data for this item"
msgstr "Při načítání dat této položky došlo k chybě"

Expand Down Expand Up @@ -141,6 +165,9 @@ msgstr "Zprávy o událostech"
msgid "Event charts"
msgstr "Grafy událostí"

msgid "Line lists"
msgstr ""

msgid "Apps"
msgstr "Aplikace"

Expand Down
40 changes: 32 additions & 8 deletions i18n/lo.po
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
#
# Translators:
# Viktor Varland <[email protected]>, 2020
# phil_dhis2, 2021
# Philip Larsen Donnelly, 2021
# Somkhit Bouavong <[email protected]>, 2022
# Saysamone Sibounma, 2022
# Saysamone Sibounma, 2023
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2021-12-21T08:20:25.327Z\n"
"POT-Creation-Date: 2023-05-03T11:08:21.315Z\n"
"PO-Revision-Date: 2019-06-25 12:37+0000\n"
"Last-Translator: Saysamone Sibounma, 2022\n"
"Language-Team: Lao (https://www.transifex.com/hisp-uio/teams/100509/lo/)\n"
"Last-Translator: Saysamone Sibounma, 2023\n"
"Language-Team: Lao (https://app.transifex.com/hisp-uio/teams/100509/lo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand Down Expand Up @@ -73,6 +73,12 @@ msgstr "ລາຍການທີ່ເປັນໜັງສື"
msgid "Add text here"
msgstr "ເພີ້ມໜັງສືບ່ອນນີ້"

msgid "Filters are not applied to line list dashboard items"
msgstr ""

msgid "Filters not applied"
msgstr ""

msgid "There was a problem loading this dashboard item"
msgstr ""

Expand Down Expand Up @@ -106,15 +112,30 @@ msgstr ""
msgid "There was a problem loading interpretations for this item"
msgstr ""

msgid "Maps with Earth Engine layers cannot be displayed when offline"
msgid "The plugin for rendering this item is not available"
msgstr ""

msgid "Unable to load the plugin for this item"
msgid "Install the {{appName}} app from the App Hub"
msgstr ""

msgid "No data to display"
msgstr ""

msgid ""
"Install Line Listing app version ${minLLVersion.join(\n"
" '.'\n"
" )} or higher in order to display this item."
msgstr ""

msgid "Show without filters"
msgstr ""

msgid "Maps with Earth Engine layers cannot be displayed when offline"
msgstr ""

msgid "Unable to load the plugin for this item"
msgstr ""

msgid "There was an error loading data for this item"
msgstr ""

Expand Down Expand Up @@ -142,6 +163,9 @@ msgstr "ບົດລາຍງານເຫດການຕ່າງໆ"
msgid "Event charts"
msgstr "ບົດລາຍງານເຫດການແບບແຜ່ນວາດ"

msgid "Line lists"
msgstr ""

msgid "Apps"
msgstr "ແອັບ"

Expand Down Expand Up @@ -226,7 +250,7 @@ msgid "Yes, discard changes"
msgstr ""

msgid "No access"
msgstr ""
msgstr "ບໍ່ມີການເຂົ້າເຖີງ"

msgid "Not supported"
msgstr ""
Expand Down
Loading

0 comments on commit e497c13

Please sign in to comment.