Merge pull request #2801 from dhis2/dev

fix: merge translations from past 3 weeks

.github/workflows/dhis2-verify-app.yml

@@ -163,11 +163,66 @@ jobs:
             !cancelled() &&
             github.ref == 'refs/heads/master'
         steps:
+            - name: Checkout code
+              uses: actions/checkout@master
+
+            - name: Extract version
+              id: extract_version
+              uses: Saionaro/[email protected]
+
             - name: Send failure message to analytics-internal-bot slack channel
               id: slack
               uses: slackapi/[email protected]
               with:
                   channel-id: ${{ secrets.SLACK_CHANNEL_ID }}
-                  slack-message: ':small_red_triangle_down: :dashboard-app: Dashboard-app release <https://github.com/dhis2/dashboard-app/actions/workflows/dhis2-verify-app.yml?query=branch%3Amaster+is%3Afailure>'
+                  payload: |
+                      {
+                        "text": ":small_red_triangle_down: :dashboard-app: Dashboard version ${{ steps.extract_version.outputs.version }} release <https://github.com/dhis2/dashboard-app/actions/workflows/dhis2-verify-app.yml?query=branch%3Amaster+is%3Afailure|failed>",
+                        "blocks": [
+                          {
+                            "type": "section",
+                            "text": {
+                              "type": "mrkdwn",
+                              "text": ":small_red_triangle_down: :dashboard-app: Dashboard version ${{ steps.extract_version.outputs.version }} release <https://github.com/dhis2/dashboard-app/actions/workflows/dhis2-verify-app.yml?query=branch%3Amaster+is%3Afailure|failed>"
+                            }
+                          }
+                        ]
+                      }
+              env:
+                  SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+
+    report-release-success:
+        runs-on: ubuntu-latest
+        needs: release
+        if: |
+            success() &&
+            !cancelled()  &&
+            github.ref == 'refs/heads/master'
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@master
+
+            - name: Extract version
+              id: extract_version
+              uses: Saionaro/[email protected]
+
+            - name: Send success message to analytics-internal-bot slack channel
+              id: slack
+              uses: slackapi/[email protected]
+              with:
+                  channel-id: ${{ secrets.SLACK_CHANNEL_ID }}
+                  payload: |
+                      {
+                        "text": ":large_green_circle: :dashboard-app: :tada: Dashboard app release succeeded for version: ${{ steps.extract_version.outputs.version }}",
+                        "blocks": [
+                          {
+                            "type": "section",
+                            "text": {
+                              "type": "mrkdwn",
+                              "text": ":large_green_circle: :dashboard-app: :tada: Dashboard version ${{ steps.extract_version.outputs.version }} released <https://github.com/dhis2/dashboard-app/actions/workflows/dhis2-verify-app.yml?query=branch%3Amaster+is%3Asuccess|successfully>"
+                            }
+                          }
+                        ]
+                      }
               env:
                   SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}

.tx/config

@@ -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-dashboards-app:r:en-pot]

README.md

@@ -44,12 +44,10 @@ CYPRESS_DHIS2_PASSWORD=district
 
 The following commands can be used to run the tests:
 
-| Command             |  Backend   | Environment |        Tests |
-| ------------------- | :--------: | ----------: | -----------: |
-| `yarn cy:open-live` | API server |  Cypress UI |          All |
-| `yarn cy:run-live`  | API server |    Headless |          All |
-| `yarn cy:open-stub` |  Fixtures  |  Cypress UI | Non-mutating |
-| `yarn cy:run-stub`  |  Fixtures  |    Headless | Non-mutating |
+| Comman         |  Backend   | Environment | Tests |
+| -------------- | :--------: | ----------: | ----: |
+| `yarn cy:open` | API server |  Cypress UI |   All |
+| `yarn cy:run`  | API server |    Headless |   All |
 
 ### `yarn test`
 

cypress/integration/edit/edit_dashboard/show_description.js

@@ -1,9 +1,10 @@
 import { When, Then } from 'cypress-cucumber-preprocessor/steps'
 import { clickViewActionButton } from '../../../elements/viewDashboard.js'
-import { getApiBaseUrl } from '../../../support/server/utils.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
@@ -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])
     )
 })
 
@@ -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', () => {
@@ -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(

cypress/integration/edit/edit_dashboard/translate_dashboard.js

@@ -5,8 +5,7 @@ import {
     dashboardDescriptionSel,
     clickViewActionButton,
 } from '../../../elements/viewDashboard.js'
-import { getApiBaseUrl } from '../../../support/server/utils.js'
-import { EXTENDED_TIMEOUT } from '../../../support/utils.js'
+import { getApiBaseUrl, EXTENDED_TIMEOUT } from '../../../support/utils.js'
 
 let norwegianTitle = ''
 let norwegianDesc = ''

cypress/integration/view/dashboard_filter/create_dashboard.js

@@ -9,10 +9,10 @@ import {
     dashboardChipSel,
     dashboardTitleSel,
 } from '../../../elements/viewDashboard.js'
-import { getApiBaseUrl } from '../../../support/server/utils.js'
 import {
     EXTENDED_TIMEOUT,
     createDashboardTitle,
+    getApiBaseUrl,
 } from '../../../support/utils.js'
 
 const TEST_DASHBOARD_TITLE = createDashboardTitle('af')

cypress/integration/view/view_dashboard/resize_dashboards_bar.js

@@ -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')
@@ -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', () => {
@@ -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', () => {
@@ -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])
 })

cypress/integration/view/view_dashboard/toggle_show_more_dashboards.js

@@ -4,12 +4,14 @@ import {
     dashboardsBarContainerSel,
     showMoreLessSel,
 } from '../../../elements/viewDashboard.js'
-import { getApiBaseUrl } from '../../../support/server/utils.js'
-import { EXTENDED_TIMEOUT } from '../../../support/utils.js'
+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',
@@ -18,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', () => {

cypress/integration/view/view_errors/error_while_show_description.js

@@ -1,5 +1,9 @@
 import { When, Then } from 'cypress-cucumber-preprocessor/steps'
-import { getApiBaseUrl } from '../../../support/server/utils.js'
+import { getApiBaseUrl } from '../../../support/utils.js'
+
+const RESP_CODE_200 = 200
+const RESP_CODE_201 = 201
+const RESP_CODE_FAIL = 409
 
 // Error scenario
 
@@ -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(

cypress/support/index.js

@@ -1,14 +1,7 @@
 import { enableAutoLogin } from '@dhis2/cypress-commands'
-import { enableNetworkShim } from './server/index.js'
-import { getDefaultMode, isStubMode } from './server/utils.js'
 import './commands.js'
 
-enableNetworkShim()
-
-if (!isStubMode(getDefaultMode())) {
-    // log in if using a live backend
-    enableAutoLogin()
-}
+enableAutoLogin()
 
 const resizeObserverLoopErrRe = /^[^(ResizeObserver loop limit exceeded)]/
 Cypress.on('uncaught:exception', (err) => {