Merge branch 'dev' into feat/router-latest

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

@@ -78,7 +78,7 @@ jobs:
                   REPORTPORTAL_PROJECT: ${{ vars.REPORTPORTAL_PROJECT }}
                   CI_BUILD_ID: ${{ github.sha }}-${{ github.workflow }}-${{ github.event_name }}
                   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
-                  PR_TITLE: ${{ github.event.pull_request.title }}
+                  PR_TITLE: ${{ github.event_name == 'pull_request' && github.event.pull_request.title || format('Direct push to {0}', github.ref_name) }}
 
     call-workflow-e2e-prod:
         if: "!contains(github.event.head_commit.message, '[skip ci]')"

CHANGELOG.md

@@ -1,3 +1,14 @@
+## [100.2.3](https://github.com/dhis2/maps-app/compare/v100.2.2...v100.2.3) (2023-12-21)
+
+
+### Bug Fixes
+
+* conditionally set PR title in dhis2-verify-app workflow ([#3089](https://github.com/dhis2/maps-app/issues/3089)) ([03eed2d](https://github.com/dhis2/maps-app/commit/03eed2d6fd3f697686183743ba30b079eb175f62))
+* report as MAP_VIEW not VISUALIZATION_VIEW ([#3086](https://github.com/dhis2/maps-app/issues/3086)) ([008e7fe](https://github.com/dhis2/maps-app/commit/008e7fe32508b403d251cb1b617c23c5feaf8063))
+* **translations:** sync translations from transifex (dev) ([dcf7743](https://github.com/dhis2/maps-app/commit/dcf7743af6ddbb4c12cef377e982c1ea0f45d3c6))
+* **translations:** sync translations from transifex (dev) ([7d98a8a](https://github.com/dhis2/maps-app/commit/7d98a8abab9d71d90c2f51b1cb4eb01598661c3f))
+* **translations:** sync translations from transifex (dev) ([6e8b82b](https://github.com/dhis2/maps-app/commit/6e8b82bbbb338883358e9c69311f0b3bbbe94224))
+
 ## [100.2.2](https://github.com/dhis2/maps-app/compare/v100.2.1...v100.2.2) (2023-11-03)
 
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "maps-app",
-    "version": "100.2.2",
+    "version": "100.2.3",
     "description": "DHIS2 Maps",
     "license": "BSD-3-Clause",
     "author": "Bjørn Sandvik",
@@ -20,7 +20,7 @@
         "postinstall": "patch-package"
     },
     "devDependencies": {
-        "@dhis2/cli-app-scripts": "^10.3.10",
+        "@dhis2/cli-app-scripts": "^10.3.11",
         "@dhis2/cli-style": "^10.5.1",
         "@dhis2/cypress-commands": "^10.0.3",
         "@dhis2/cypress-plugins": "^10.0.3",
@@ -32,24 +32,24 @@
         "enzyme": "^3.11.0",
         "enzyme-adapter-react-16": "^1.15.7",
         "enzyme-to-json": "^3.6.2",
-        "eslint-plugin-cypress": "^2.13.3",
+        "eslint-plugin-cypress": "^2.15.1",
         "patch-package": "^6.5.1",
         "redux-devtools": "^3.7.0",
         "redux-mock-store": "^1.5.4",
-        "start-server-and-test": "^2.0.1"
+        "start-server-and-test": "^2.0.3"
     },
     "dependencies": {
         "@dhis2/analytics": "^26.2.0",
         "@dhis2/app-runtime": "^3.9.4",
         "@dhis2/app-runtime-adapter-d2": "^1.1.0",
         "@dhis2/app-service-alerts": "^3.9.4",
         "@dhis2/app-service-datastore": "^1.0.0-beta.3",
-        "@dhis2/d2-i18n": "^1.1.1",
+        "@dhis2/d2-i18n": "^1.1.3",
         "@dhis2/maps-gl": "^3.8.6",
-        "@dhis2/ui": "^8.13.15",
+        "@dhis2/ui": "^8.16.0",
         "@krakenjs/post-robot": "^11.0.0",
         "@reportportal/agent-js-cypress": "git+https://github.com/dhis2/agent-js-cypress.git#develop",
-        "@reportportal/agent-js-jest": "^5.0.6",
+        "@reportportal/agent-js-jest": "^5.0.7",
         "abortcontroller-polyfill": "^1.7.5",
         "array-move": "^4.0.0",
         "classnames": "^2.3.2",

src/components/layers/download/__tests__/DataDownloadDialogActions.spec.js

@@ -2,8 +2,28 @@ import { render } from '@testing-library/react'
 import React from 'react'
 import DataDownloadDialogActions from '../DataDownloadDialogActions.js'
 
+/* eslint-disable react/prop-types */
+jest.mock('@dhis2/ui', () => {
+    const originalModule = jest.requireActual('@dhis2/ui')
+
+    return {
+        __esModule: true,
+        ...originalModule,
+        Button: function Mock({ children }) {
+            return <div className="ui-Button">{children}</div>
+        },
+        ButtonStrip: function Mock({ children }) {
+            return <div className="ui-ButtonStrip">{children}</div>
+        },
+        CircularLoader: function Mock({ children }) {
+            return <div className="ui-CircularLoader">{children}</div>
+        },
+    }
+})
+/* eslint-enable react/prop-types */
+
 describe('DataDownloadDialogActions', () => {
-    it('Should render two buttons and NO loading spinner', () => {
+    it('Should render two buttons and NO loading spinner when not loading', () => {
         const { container } = render(
             <DataDownloadDialogActions
                 downloading={false}
@@ -14,7 +34,7 @@ describe('DataDownloadDialogActions', () => {
         expect(container).toMatchSnapshot()
     })
 
-    it('Should disable buttons and show loading spinner when loading', () => {
+    it('Should render two buttons and show loading spinner when loading', () => {
         const { container } = render(
             <DataDownloadDialogActions
                 downloading={true}

src/components/layers/download/__tests__/__snapshots__/DataDownloadDialogActions.spec.js.snap

@@ -1,73 +1,41 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`DataDownloadDialogActions Should disable buttons and show loading spinner when loading 1`] = `
+exports[`DataDownloadDialogActions Should render two buttons and NO loading spinner when not loading 1`] = `
 <div>
   <div
-    class="jsx-1994200789 end"
-    data-test="dhis2-uicore-buttonstrip"
+    class="ui-ButtonStrip"
   >
     <div
-      class="jsx-1994200789 box"
+      class="ui-Button"
     >
-      <button
-        class="jsx-441677069 secondary"
-        data-test="dhis2-uicore-button"
-        disabled=""
-        type="button"
-      >
-        Cancel
-      </button>
+      Cancel
     </div>
     <div
-      class="jsx-1994200789 box"
+      class="ui-Button"
     >
-      <button
-        class="jsx-441677069 primary"
-        data-test="dhis2-uicore-button"
-        disabled=""
-        name="download-button"
-        type="button"
-      >
-        Download
-        <div
-          class="jsx-1838964138 btnProgress small"
-          data-test="dhis2-uicore-circularloader"
-          role="progressbar"
-        />
-      </button>
+      Download
     </div>
   </div>
 </div>
 `;
 
-exports[`DataDownloadDialogActions Should render two buttons and NO loading spinner 1`] = `
+exports[`DataDownloadDialogActions Should render two buttons and show loading spinner when loading 1`] = `
 <div>
   <div
-    class="jsx-1994200789 end"
-    data-test="dhis2-uicore-buttonstrip"
+    class="ui-ButtonStrip"
   >
     <div
-      class="jsx-1994200789 box"
+      class="ui-Button"
     >
-      <button
-        class="jsx-441677069 secondary"
-        data-test="dhis2-uicore-button"
-        type="button"
-      >
-        Cancel
-      </button>
+      Cancel
     </div>
     <div
-      class="jsx-1994200789 box"
+      class="ui-Button"
     >
-      <button
-        class="jsx-441677069 primary"
-        data-test="dhis2-uicore-button"
-        name="download-button"
-        type="button"
-      >
-        Download
-      </button>
+      Download
+      <div
+        class="ui-CircularLoader"
+      />
     </div>
   </div>
 </div>

src/util/apiDataStatistics.js

@@ -2,7 +2,7 @@ export const dataStatisticsMutation = {
     resource: 'dataStatistics',
     params: ({ id }) => ({
         favorite: id,
-        eventType: 'VISUALIZATION_VIEW',
+        eventType: 'MAP_VIEW',
     }),
     type: 'create',
 }