From 908c7dd7b577dedcd4b5c53e746a14a56466b4e9 Mon Sep 17 00:00:00 2001 From: Adel Bensaad Date: Thu, 28 Nov 2024 05:29:16 +0100 Subject: [PATCH 1/5] chore: remove ReportPortal integration (#3409) --- .github/workflows/verify-pr.yml | 10 -- cypress.config.js | 28 --- jest.config.js | 52 +----- package.json | 2 - yarn.lock | 291 ++++++-------------------------- 5 files changed, 49 insertions(+), 334 deletions(-) diff --git a/.github/workflows/verify-pr.yml b/.github/workflows/verify-pr.yml index 9c11eb4bb..bf1637df2 100644 --- a/.github/workflows/verify-pr.yml +++ b/.github/workflows/verify-pr.yml @@ -78,13 +78,6 @@ jobs: - name: Test run: yarn d2-app-scripts test - env: - REPORTPORTAL_API_KEY: ${{ secrets.REPORTPORTAL_API_KEY }} - REPORTPORTAL_ENDPOINT: ${{ vars.REPORTPORTAL_ENDPOINT }} - 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_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]') }} @@ -97,6 +90,3 @@ jobs: username: ${{ secrets.CYPRESS_DHIS2_USERNAME }} password: ${{ secrets.CYPRESS_DHIS2_PASSWORD }} recordkey: ${{ secrets.CYPRESS_RECORD_KEY }} - reportportal_api_key: ${{ secrets.REPORTPORTAL_API_KEY }} - reportportal_endpoint: ${{ vars.REPORTPORTAL_ENDPOINT }} - reportportal_project: ${{ vars.REPORTPORTAL_PROJECT }} diff --git a/cypress.config.js b/cypress.config.js index d1e2ac60d..31b596bb7 100644 --- a/cypress.config.js +++ b/cypress.config.js @@ -23,34 +23,6 @@ async function setupNodeEvents(on, config) { module.exports = defineConfig({ projectId: 'r5jduj', - reporter: '@reportportal/agent-js-cypress', - reporterOptions: { - endpoint: process.env.REPORTPORTAL_ENDPOINT, - apiKey: process.env.REPORTPORTAL_API_KEY, - launch: 'maps_app', - project: process.env.REPORTPORTAL_PROJECT, - description: '', - autoMerge: true, - parallel: true, - debug: false, - restClientConfig: { - timeout: 660000, - }, - attributes: [ - { - key: 'version', - value: 'master', - }, - { - key: 'app_name', - value: 'maps-app', - }, - { - key: 'test_level', - value: 'e2e', - }, - ], - }, e2e: { setupNodeEvents, baseUrl: 'http://localhost:3000', diff --git a/jest.config.js b/jest.config.js index bfe87539f..6b45170f2 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,48 +1,3 @@ -const reportPortalConfig = [ - '@reportportal/agent-js-jest', - { - apiKey: process.env.REPORTPORTAL_API_KEY, - endpoint: process.env.REPORTPORTAL_ENDPOINT, - project: process.env.REPORTPORTAL_PROJECT, - launch: 'maps_app', - attributes: [ - { - key: 'dhis2_version', - value: 'master', - }, - { - key: 'app_name', - value: 'maps-app', - }, - { - key: 'test_level', - value: 'unit/integration', - }, - { - key: 'BRANCH_NAME', - value: process.env.BRANCH_NAME, - }, - { - key: 'CI_BUILD_ID', - value: process.env.CI_BUILD_ID, - }, - { - key: 'PR_TITLE', - value: process.env.PR_TITLE, - }, - ], - description: '', - debug: false, - }, -] - -const isDependabotPR = process.env.GITHUB_ACTOR === 'dependabot[bot]' -const isGithubActionsRun = process.env.CI === 'true' -const isReportPortalSetup = - process.env.REPORTPORTAL_API_KEY !== undefined && - process.env.REPORTPORTAL_ENDPOINT !== undefined && - process.env.REPORTPORTAL_PROJECT !== undefined - module.exports = { setupFilesAfterEnv: ['/config/testSetup.js'], collectCoverageFrom: ['src/**/*.js'], @@ -57,10 +12,5 @@ module.exports = { snapshotSerializers: ['enzyme-to-json/serializer'], testRunner: 'jest-circus/runner', - reporters: [ - 'default', - ...(isGithubActionsRun && isReportPortalSetup && !isDependabotPR - ? [reportPortalConfig] - : []), - ], + reporters: ['default'], } diff --git a/package.json b/package.json index 0ef32edb1..4d07bd50b 100644 --- a/package.json +++ b/package.json @@ -48,8 +48,6 @@ "@dhis2/maps-gl": "^4.0.0", "@dhis2/ui": "^9.13.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.7", "@testing-library/react-hooks": "^8.0.1", "abortcontroller-polyfill": "^1.7.5", "array-move": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index 47963db33..c617fd3b6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3256,36 +3256,6 @@ "@react-hook/passive-layout-effect" "^1.2.0" "@react-hook/resize-observer" "^1.2.1" -"@reportportal/agent-js-cypress@git+https://github.com/dhis2/agent-js-cypress.git#develop": - version "5.1.4" - resolved "git+https://github.com/dhis2/agent-js-cypress.git#d3afea4e74abdbef39c1121f820f23deca2368f4" - dependencies: - "@reportportal/client-javascript" "^5.0.14" - glob "^7.2.3" - minimatch "^3.1.2" - mocha "^10.2.0" - node-ipc "9.1.1" - -"@reportportal/agent-js-jest@^5.0.7": - version "5.0.7" - resolved "https://registry.yarnpkg.com/@reportportal/agent-js-jest/-/agent-js-jest-5.0.7.tgz#e87382b4dffc5b01d54cfdca64bfdc70ece2bfeb" - integrity sha512-yqWcKi0UJSKUImfFClRTGGL14DE9RZW94YWnekfZXry4Rlh8y+zOgncV3qeE/2X2c5FHlvVUhZnkH/++RLvamw== - dependencies: - "@reportportal/client-javascript" "^5.0.15" - strip-ansi "^6.0.1" - -"@reportportal/client-javascript@^5.0.14", "@reportportal/client-javascript@^5.0.15": - version "5.0.15" - resolved "https://registry.yarnpkg.com/@reportportal/client-javascript/-/client-javascript-5.0.15.tgz#57080be5bdb347ab0019aeb385f9f282349f7ac4" - integrity sha512-ry6euqCOoJLXCUuBhlRMjCYKhbgU+9EYdZ8jpTuagoBVxS8V8nJed9ODnS4bXX61g+pJm+NP/0DrN2Ptq+DgQQ== - dependencies: - axios "^0.27.2" - axios-retry "^3.4.0" - glob "^7.2.3" - ini "^2.0.0" - uniqid "^5.4.0" - uuid "^9.0.0" - "@rollup/plugin-babel@^5.2.0": version "5.3.1" resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz#04bc0608f4aa4b2e4b1aebf284344d0f68fda283" @@ -4630,11 +4600,6 @@ ansi-align@^3.0.0: dependencies: string-width "^4.1.0" -ansi-colors@4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" - integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== - ansi-colors@^4.1.1: version "4.1.3" resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b" @@ -5042,14 +5007,6 @@ axe-core@^4.6.2: resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.6.3.tgz#fc0db6fdb65cc7a80ccf85286d91d64ababa3ece" integrity sha512-/BQzOX780JhsxDnPpH4ZiyrJAzcd8AfzFPkv+89veFSr1rcMjuq2JDCwypKaPeB6ljHp9KjXhPpjgCvQlWYuqg== -axios-retry@^3.4.0: - version "3.8.1" - resolved "https://registry.yarnpkg.com/axios-retry/-/axios-retry-3.8.1.tgz#4bb53f87ea537bce904c477e5c2808571066acbb" - integrity sha512-4XseuArB4CEbfLRtMpUods2q8MLBvD4r8ifKgK4SP2FRgzQIPUDpzZ+cjQ/19eu3w2UpKgkJA+myEh2BYDSjqQ== - dependencies: - "@babel/runtime" "^7.15.4" - is-retry-allowed "^2.2.0" - axios@^0.25.0: version "0.25.0" resolved "https://registry.yarnpkg.com/axios/-/axios-0.25.0.tgz#349cfbb31331a9b4453190791760a8d35b093e0a" @@ -5057,14 +5014,6 @@ axios@^0.25.0: dependencies: follow-redirects "^1.14.7" -axios@^0.27.2: - version "0.27.2" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972" - integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ== - dependencies: - follow-redirects "^1.14.9" - form-data "^4.0.0" - axios@^1.6.1: version "1.6.2" resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.2.tgz#de67d42c755b571d3e698df1b6504cde9b0ee9f2" @@ -5502,11 +5451,6 @@ browser-resolve@^2.0.0: dependencies: resolve "^1.17.0" -browser-stdout@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" - integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== - browserify-aes@^1.0.0, browserify-aes@^1.0.4: version "1.2.0" resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" @@ -5871,7 +5815,7 @@ camelcase@^5.0.0, camelcase@^5.3.1: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -camelcase@^6.0.0, camelcase@^6.2.0, camelcase@^6.2.1: +camelcase@^6.2.0, camelcase@^6.2.1: version "6.3.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== @@ -5989,7 +5933,7 @@ cheerio@^1.0.0-rc.3: parse5 "^7.0.0" parse5-htmlparser2-tree-adapter "^7.0.0" -chokidar@3.5.3, chokidar@^3.3.0, chokidar@^3.4.0, chokidar@^3.4.2, chokidar@^3.5.3: +chokidar@^3.3.0, chokidar@^3.4.0, chokidar@^3.4.2, chokidar@^3.5.3: version "3.5.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -7220,11 +7164,6 @@ decamelize@^1.1.0, decamelize@^1.2.0: resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA== -decamelize@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837" - integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ== - decimal.js@^10.2.1, decimal.js@^10.3.1: version "10.4.3" resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23" @@ -7478,11 +7417,6 @@ diff-sequences@^27.5.1: resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.5.1.tgz#eaecc0d327fd68c8d9672a1e64ab8dccb2ef5327" integrity sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ== -diff@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b" - integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== - diff@^5.1.0: version "5.2.0" resolved "https://registry.yarnpkg.com/diff/-/diff-5.2.0.tgz#26ded047cd1179b78b9537d5ef725503ce1ae531" @@ -7717,11 +7651,6 @@ earcut@^2.2.4: resolved "https://registry.yarnpkg.com/earcut/-/earcut-2.2.4.tgz#6d02fd4d68160c114825d06890a92ecaae60343a" integrity sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ== -easy-stack@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/easy-stack/-/easy-stack-1.0.1.tgz#8afe4264626988cabb11f3c704ccd0c835411066" - integrity sha512-wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w== - ecc-jsbn@~0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" @@ -8080,11 +8009,6 @@ escape-latex@^1.2.0: resolved "https://registry.yarnpkg.com/escape-latex/-/escape-latex-1.2.0.tgz#07c03818cf7dac250cce517f4fda1b001ef2bca1" integrity sha512-nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw== -escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== - escape-string-regexp@5.0.0, escape-string-regexp@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz#4683126b500b61762f2dbebace1806e8be31b1c8" @@ -8100,6 +8024,11 @@ escape-string-regexp@^2.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + escodegen@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" @@ -8466,11 +8395,6 @@ etag@~1.8.1: resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== -event-pubsub@4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/event-pubsub/-/event-pubsub-4.3.0.tgz#f68d816bc29f1ec02c539dc58c8dd40ce72cb36e" - integrity sha512-z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ== - event-stream@=3.3.4: version "3.3.4" resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571" @@ -8909,14 +8833,6 @@ find-cache-dir@^3.3.1: make-dir "^3.0.2" pkg-dir "^4.1.0" -find-up@5.0.0, find-up@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" - integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== - dependencies: - locate-path "^6.0.0" - path-exists "^4.0.0" - find-up@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" @@ -8939,6 +8855,14 @@ find-up@^4.0.0, find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" +find-up@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" + integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== + dependencies: + locate-path "^6.0.0" + path-exists "^4.0.0" + find-up@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-6.3.0.tgz#2abab3d3280b2dc7ac10199ef324c4e002c8c790" @@ -8969,11 +8893,6 @@ flat-cache@^3.0.4: flatted "^3.1.0" rimraf "^3.0.2" -flat@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" - integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== - flatted@^3.1.0: version "3.2.7" resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787" @@ -8992,7 +8911,7 @@ flush-write-stream@^1.0.2: inherits "^2.0.3" readable-stream "^2.3.6" -follow-redirects@^1.0.0, follow-redirects@^1.14.7, follow-redirects@^1.14.9, follow-redirects@^1.15.0: +follow-redirects@^1.0.0, follow-redirects@^1.14.7, follow-redirects@^1.15.0: version "1.15.9" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1" integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ== @@ -9397,19 +9316,7 @@ glob-to-regexp@^0.4.1: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== -glob@7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" - integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.3: +glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -9718,7 +9625,7 @@ hasown@^2.0.0, hasown@^2.0.2: dependencies: function-bind "^1.1.2" -he@1.2.0, he@^1.2.0: +he@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== @@ -10211,7 +10118,7 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw== -ini@2.0.0, ini@^2.0.0: +ini@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== @@ -10631,11 +10538,6 @@ is-plain-obj@^1.1.0: resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg== -is-plain-obj@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" - integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== - is-plain-obj@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" @@ -10678,11 +10580,6 @@ is-relative@^1.0.0: dependencies: is-unc-path "^1.0.0" -is-retry-allowed@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz#88f34cbd236e043e71b6932d09b0c65fb7b4d71d" - integrity sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg== - is-root@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c" @@ -11427,18 +11324,6 @@ joi@^17.11.0: "@sideway/formula" "^3.0.1" "@sideway/pinpoint" "^2.0.0" -js-message@1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/js-message/-/js-message-1.0.5.tgz#2300d24b1af08e89dd095bc1a4c9c9cfcb892d15" - integrity sha512-hTqHqrm7jrZ+iN93QsKcNOTSgX3F+2NSgdnF+xvf8FfhC2MPqYRzzgXQ1LlhfyIzPTS6hL6Zea0/gIb6hktkHw== - -js-queue@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/js-queue/-/js-queue-2.0.0.tgz#362213cf860f468f0125fc6c96abc1742531f948" - integrity sha512-SW0rTTG+TBPVD1Kp6HtnOr9kX3//EWA6qMlP2Y/WxbKsSNCBuJbWv3EDB5noKJBEkHYi2mDY+xqMn4Y0QHyjyg== - dependencies: - easy-stack "^1.0.0" - js-sdsl@^4.1.4: version "4.3.0" resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.3.0.tgz#aeefe32a451f7af88425b11fdb5f58c90ae1d711" @@ -11454,13 +11339,6 @@ js-sha3@0.8.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@4.1.0, js-yaml@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" - integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== - dependencies: - argparse "^2.0.1" - js-yaml@^3.13.1: version "3.14.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" @@ -11469,6 +11347,13 @@ js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" +js-yaml@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== + dependencies: + argparse "^2.0.1" + jsbi@^4.1.0: version "4.3.0" resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-4.3.0.tgz#b54ee074fb6fcbc00619559305c8f7e912b04741" @@ -12184,7 +12069,7 @@ lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.1 resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -log-symbols@4.1.0, log-symbols@^4.0.0: +log-symbols@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== @@ -12606,13 +12491,6 @@ minimalistic-crypto-utils@^1.0.1: resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg== -minimatch@5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b" - integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g== - dependencies: - brace-expansion "^2.0.1" - minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" @@ -12764,33 +12642,6 @@ mkdirp@^1.0.3, mkdirp@^1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -mocha@^10.2.0: - version "10.2.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.2.0.tgz#1fd4a7c32ba5ac372e03a17eef435bd00e5c68b8" - integrity sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg== - dependencies: - ansi-colors "4.1.1" - browser-stdout "1.3.1" - chokidar "3.5.3" - debug "4.3.4" - diff "5.0.0" - escape-string-regexp "4.0.0" - find-up "5.0.0" - glob "7.2.0" - he "1.2.0" - js-yaml "4.1.0" - log-symbols "4.1.0" - minimatch "5.0.1" - ms "2.1.3" - nanoid "3.3.3" - serialize-javascript "6.0.0" - strip-json-comments "3.1.1" - supports-color "8.1.1" - workerpool "6.2.1" - yargs "16.2.0" - yargs-parser "20.2.4" - yargs-unparser "2.0.0" - modify-values@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022" @@ -12867,11 +12718,6 @@ nano-time@1.0.0: dependencies: big-integer "^1.6.16" -nanoid@3.3.3: - version "3.3.3" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25" - integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w== - nanoid@^3.3.4: version "3.3.4" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" @@ -13013,15 +12859,6 @@ node-int64@^0.4.0: resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw== -node-ipc@9.1.1: - version "9.1.1" - resolved "https://registry.yarnpkg.com/node-ipc/-/node-ipc-9.1.1.tgz#4e245ed6938e65100e595ebc5dc34b16e8dd5d69" - integrity sha512-FAyICv0sIRJxVp3GW5fzgaf9jwwRQxAKDJlmNFUL5hOy+W4X/I5AypyHoq0DXXbo9o/gt79gj++4cMr4jVWE/w== - dependencies: - event-pubsub "4.3.0" - js-message "1.0.5" - js-queue "2.0.0" - node-releases@^2.0.8: version "2.0.10" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz#c311ebae3b6a148c89b1813fd7c4d3c024ef537f" @@ -16088,13 +15925,6 @@ send@0.19.0: range-parser "~1.2.1" statuses "2.0.1" -serialize-javascript@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" - integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== - dependencies: - randombytes "^2.1.0" - serialize-javascript@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa" @@ -16871,7 +16701,7 @@ strip-indent@^3.0.0: dependencies: min-indent "^1.0.0" -strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: +strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== @@ -16940,13 +16770,6 @@ supercluster@^7.1.5: dependencies: kdbush "^3.0.0" -supports-color@8.1.1, supports-color@^8.0.0, supports-color@^8.1.1: - version "8.1.1" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" - integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== - dependencies: - has-flag "^4.0.0" - supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" @@ -16961,6 +16784,13 @@ supports-color@^7.0.0, supports-color@^7.1.0: dependencies: has-flag "^4.0.0" +supports-color@^8.0.0, supports-color@^8.1.1: + version "8.1.1" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" + supports-hyperlinks@^2.0.0, supports-hyperlinks@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624" @@ -17644,11 +17474,6 @@ union-value@^1.0.0: is-extendable "^0.1.1" set-value "^2.0.1" -uniqid@^5.4.0: - version "5.4.0" - resolved "https://registry.yarnpkg.com/uniqid/-/uniqid-5.4.0.tgz#4e17bfcab66dfe33563411ae0c801f46ef964e66" - integrity sha512-38JRbJ4Fj94VmnC7G/J/5n5SC7Ab46OM5iNtSstB/ko3l1b5g7ALt4qzHFgGciFkyiRNtDXtLNb+VsxtMSE77A== - unique-filename@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2" @@ -18508,11 +18333,6 @@ workbox-window@6.5.4: "@types/trusted-types" "^2.0.2" workbox-core "6.5.4" -workerpool@6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343" - integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw== - wrap-ansi@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" @@ -18632,11 +18452,6 @@ yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2: resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== -yargs-parser@20.2.4: - version "20.2.4" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" - integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== - yargs-parser@^13.1.2: version "13.1.2" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" @@ -18655,29 +18470,6 @@ yargs-parser@^21.1.1: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== -yargs-unparser@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb" - integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA== - dependencies: - camelcase "^6.0.0" - decamelize "^4.0.0" - flat "^5.0.2" - is-plain-obj "^2.1.0" - -yargs@16.2.0, yargs@^16.2.0: - version "16.2.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" - integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== - dependencies: - cliui "^7.0.2" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.0" - y18n "^5.0.5" - yargs-parser "^20.2.2" - yargs@^13.1.0: version "13.3.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" @@ -18694,6 +18486,19 @@ yargs@^13.1.0: y18n "^4.0.0" yargs-parser "^13.1.2" +yargs@^16.2.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" + yargs@^17.5.1: version "17.7.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" From d774e7a2a849cf40bca3d039aca2d1c6ce1f5331 Mon Sep 17 00:00:00 2001 From: Bruno Raimbault Date: Fri, 29 Nov 2024 16:05:13 +0100 Subject: [PATCH 2/5] fix: update 'No data' handling (#3408) Fix: https://dhis2.atlassian.net/browse/DHIS2-18427 Update maps-gl dependency. Update getLabelStyle to return labelNoData for labelSource in maps-gl. Update ThematicLayer pop-up 'No data' logic. --- cypress/elements/thematic_layer.js | 13 ++++ .../integration/layers/thematiclayer.cy.js | 73 ++++++++++++++++++- package.json | 2 +- src/components/map/layers/ThematicLayer.js | 2 +- src/util/labels.js | 2 + yarn.lock | 8 +- 6 files changed, 93 insertions(+), 7 deletions(-) diff --git a/cypress/elements/thematic_layer.js b/cypress/elements/thematic_layer.js index 432792c4b..4aed7bb38 100644 --- a/cypress/elements/thematic_layer.js +++ b/cypress/elements/thematic_layer.js @@ -48,10 +48,23 @@ export class ThematicLayer extends Layer { return this } + selectRelativePeriod(period) { + cy.get('[data-test="relative-period-select"]').click() + cy.contains(period).click() + + return this + } + selectPeriodType(periodType) { cy.get('[data-test="periodtypeselect"]').click() cy.contains(periodType).click() return this } + + selectIncludeNoDataOU() { + cy.contains('Include org units with no data').click() + + return this + } } diff --git a/cypress/integration/layers/thematiclayer.cy.js b/cypress/integration/layers/thematiclayer.cy.js index c4dc455fc..37028a313 100644 --- a/cypress/integration/layers/thematiclayer.cy.js +++ b/cypress/integration/layers/thematiclayer.cy.js @@ -6,7 +6,11 @@ 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, + getApiBaseUrl, + EXTENDED_TIMEOUT, +} from '../../support/util.js' const INDICATOR_NAME = 'VCCT post-test counselling rate' @@ -95,6 +99,73 @@ context('Thematic Layers', () => { getMaps().should('have.length', 1) }) + it('opens a thematic layer popup with data and nodata', () => { + Layer.openDialog('Thematic') + .selectIndicatorGroup('Stock') + .selectIndicator('BCG Stock PHU') + .selectTab('Period') + .selectRelativePeriod('This month') + .selectTab('Style') + .selectIncludeNoDataOU() + .selectTab('Org Units') + .unselectOuLevel('District') + .selectOuLevel('Facility') + + cy.getByDataTest('org-unit-tree-node') + .contains('Western Area') + .parents('[data-test="org-unit-tree-node"]') + .first() + .within(() => { + cy.getByDataTest('org-unit-tree-node-toggle').click() + }) + + cy.getByDataTest('org-unit-tree-node') + .contains('Rural Western Area') + .parents('[data-test="org-unit-tree-node"]') + .first() + .within(() => { + cy.getByDataTest('org-unit-tree-node-toggle').click() + }) + + // Value: 0 + cy.getByDataTest('org-unit-tree-node').contains('Tokeh MCHP').click() + + cy.getByDataTest('layeredit-addbtn').click() + + Layer.validateDialogClosed(true) + + cy.wait(5000) // eslint-disable-line cypress/no-unnecessary-waiting + cy.get('#dhis2-map-container') + .findByDataTest('dhis2-uicore-componentcover', EXTENDED_TIMEOUT) + .should('not.exist') + cy.get('.dhis2-map').click('center') //Click somewhere on the map + + cy.get('.maplibregl-popup').contains('Value: 0').should('be.visible') + + // Value: No data + cy.getByDataTest('layer-edit-button').click() + Layer.selectTab('Org Units') + + cy.getByDataTest('org-unit-tree-node').contains('Tokeh MCHP').click() + cy.getByDataTest('org-unit-tree-node') + .contains('Lakka Hospital') + .click() + + cy.getByDataTest('layeredit-addbtn').click() + + Layer.validateDialogClosed(true) + + cy.wait(5000) // eslint-disable-line cypress/no-unnecessary-waiting + cy.get('#dhis2-map-container') + .findByDataTest('dhis2-uicore-componentcover', EXTENDED_TIMEOUT) + .should('not.exist') + cy.get('.dhis2-map').click('center') //Click somewhere on the map + + cy.get('.maplibregl-popup') + .contains('Value: No data') + .should('be.visible') + }) + it('adds a thematic layer with split view period', () => { Layer.openDialog('Thematic') .selectIndicatorGroup('ANC') diff --git a/package.json b/package.json index 4d07bd50b..0b1b8ee60 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "@dhis2/app-runtime": "^3.11.2", "@dhis2/app-runtime-adapter-d2": "^1.1.0", "@dhis2/app-service-datastore": "^1.0.0-beta.3", - "@dhis2/maps-gl": "^4.0.0", + "@dhis2/maps-gl": "^4.0.1", "@dhis2/ui": "^9.13.0", "@krakenjs/post-robot": "^11.0.0", "@testing-library/react-hooks": "^8.0.1", diff --git a/src/components/map/layers/ThematicLayer.js b/src/components/map/layers/ThematicLayer.js index 176f9028a..5d61c2122 100644 --- a/src/components/map/layers/ThematicLayer.js +++ b/src/components/map/layers/ThematicLayer.js @@ -179,7 +179,7 @@ class ThematicLayer extends Layer {
{indicator}
{periodName}
- {i18n.t('Value')}: {value ? value : i18n.t('No data')} + {i18n.t('Value')}: {value ?? i18n.t('No data')}
{aggregationType && aggregationType !== 'DEFAULT' && (
{aggregationType}
diff --git a/src/util/labels.js b/src/util/labels.js index 78be8dee7..c82e50db3 100644 --- a/src/util/labels.js +++ b/src/util/labels.js @@ -1,3 +1,4 @@ +import i18n from '@dhis2/d2-i18n' import { LABEL_FONT_SIZE, LABEL_FONT_STYLE, @@ -20,5 +21,6 @@ export const getLabelStyle = ({ lineHeight: parseInt(fontSize, 10) * 1.2 + 'px', color: cssColor(labelFontColor) || LABEL_FONT_COLOR, paddingTop: '10px', + labelNoData: i18n.t('No data'), } } diff --git a/yarn.lock b/yarn.lock index c617fd3b6..ee5aa6897 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2246,10 +2246,10 @@ i18next "^10.3" moment "^2.24.0" -"@dhis2/maps-gl@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@dhis2/maps-gl/-/maps-gl-4.0.0.tgz#e97df2fbc78f787a0916224d7d54fb96b9c376db" - integrity sha512-TDEIBT6rFuEZGXnBxAqKhSmCXk3wtuCf/OrVZBKxT1qk0kHau71f3lzAXbWhYAuop8t6/DyJaIcQrUYMi1Xy3w== +"@dhis2/maps-gl@^4.0.1": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@dhis2/maps-gl/-/maps-gl-4.0.1.tgz#227a856c9a5dd0a38a8a3ea0ebd6327872850f3e" + integrity sha512-4Q9zxzPhV81zSZyWYyX7iOufUvSfqHWjXkpYUqgPq8uxhpCNj9vVwb6l5FaU/0ZbWC+wusiYeMAkLvsUpoR51g== dependencies: "@mapbox/sphericalmercator" "^1.2.0" "@turf/area" "^6.5.0" From 32a2fe94a58af40713781d7546bf9c64cfacf4fb Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Fri, 29 Nov 2024 15:08:29 +0000 Subject: [PATCH 3/5] chore(release): cut 100.7.7 [skip release] ## [100.7.7](https://github.com/dhis2/maps-app/compare/v100.7.6...v100.7.7) (2024-11-29) ### Bug Fixes * update 'No data' handling ([#3408](https://github.com/dhis2/maps-app/issues/3408)) ([d774e7a](https://github.com/dhis2/maps-app/commit/d774e7a2a849cf40bca3d039aca2d1c6ce1f5331)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c652ff86f..b5cf66506 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [100.7.7](https://github.com/dhis2/maps-app/compare/v100.7.6...v100.7.7) (2024-11-29) + + +### Bug Fixes + +* update 'No data' handling ([#3408](https://github.com/dhis2/maps-app/issues/3408)) ([d774e7a](https://github.com/dhis2/maps-app/commit/d774e7a2a849cf40bca3d039aca2d1c6ce1f5331)) + ## [100.7.6](https://github.com/dhis2/maps-app/compare/v100.7.5...v100.7.6) (2024-11-17) diff --git a/package.json b/package.json index 0b1b8ee60..17aa4f2fe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "maps-app", - "version": "100.7.6", + "version": "100.7.7", "description": "DHIS2 Maps", "license": "BSD-3-Clause", "author": "Bjørn Sandvik", From 4cd5d456ce8669ef975c1fd4a0d0321c60685085 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Tue, 3 Dec 2024 02:51:52 +0100 Subject: [PATCH 4/5] fix(translations): sync translations from transifex (master) Automatically merged. --- i18n/pt.po | 173 ++++++++++++++++++++++++++++------------------------- 1 file changed, 92 insertions(+), 81 deletions(-) diff --git a/i18n/pt.po b/i18n/pt.po index f0ab43fde..1b63374db 100644 --- a/i18n/pt.po +++ b/i18n/pt.po @@ -8,15 +8,15 @@ # Gabriela Rodriguez , 2024 # Ge Joao , 2024 # Shelsea Chumaio, 2024 -# António Fernando Macaringue, 2024 # Helton Dias, 2024 +# António Fernando Macaringue, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" "POT-Creation-Date: 2024-10-23T12:50:51.401Z\n" "PO-Revision-Date: 2019-06-25 18:35+0000\n" -"Last-Translator: Helton Dias, 2024\n" +"Last-Translator: António Fernando Macaringue, 2024\n" "Language-Team: Portuguese (https://app.transifex.com/hisp-uio/teams/100509/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -109,14 +109,14 @@ msgid "Organisation unit location" msgstr "Localização da unidade organizacional" msgid "Fallback coordinate field" -msgstr "Campo de coordenadas de recurso" +msgstr "substituir Campo de coordenadas" msgid "Coordinate field" msgstr "Campo de coordenadas" msgid "Enrollment > event > tracked entity > org unit coordinate" msgstr "" -"Inscrição > evento > entidade controlada > coordenada da unidade " +"Inscrição > evento > entidade rastreada> coordenada da unidade " "organizacional" msgid "Event > org unit coordinate" @@ -202,7 +202,7 @@ msgid "Level" msgstr "Nível" msgid "Parent" -msgstr "Parentes" +msgstr "Pai" msgid "Type" msgstr "Tipo" @@ -229,7 +229,7 @@ msgid "Download" msgstr "Transferir" msgid "Exit download mode" -msgstr "Sair do modo de descarregamento" +msgstr "Sair do modo de tranferência" msgid "Download map" msgstr "Transferir mapas " @@ -246,7 +246,7 @@ msgstr "A descrição pode ser alterada no menu Ficheiro > Mudar o nome" msgid "" "Set the map description when you save the map or from File > Rename menu" msgstr "" -"Defina a descrição do mapa quando guardar o mapa ou a partir do menu " +"Escreva a descrição do mapa quando guardar o mapa ou a partir do menu " "Ficheiro > Mudar o nome" msgid "Show legend" @@ -263,7 +263,7 @@ msgstr "Incluir margens na transferência" msgid "Resize your browser window to change the map dimensions." msgstr "" -"Redimensione a janela do seu browser para alterar as dimensões do mapa." +"Redimensione a janela do seu navegador para alterar as dimensões do mapa." msgid "" "Map download is not supported by your browser. Try Google Chrome or Firefox." @@ -311,7 +311,7 @@ msgid "Earth Engine" msgstr "Earth Engine" msgid "feature" -msgstr "" +msgstr "caraterística" msgid "Edit {{name}} layer" msgstr "Editar a camada {{name}}" @@ -361,13 +361,13 @@ msgid "Unit" msgstr "Unidade" msgid "Spatial resolution" -msgstr "" +msgstr "Resolução espacial" msgid "Temporal resolution" -msgstr "" +msgstr "Resolução temporal" msgid "Temporal coverage" -msgstr "" +msgstr "Cobertura temporal" msgid "Source" msgstr "Fonte" @@ -406,7 +406,7 @@ msgid "Steps" msgstr "Passos" msgid "Facility buffer" -msgstr "" +msgstr "Buffer da Instalação" msgid "Org Units" msgstr "Unidades organizacionais" @@ -444,7 +444,7 @@ msgid "Event status" msgstr "Estado do evento " msgid "Boundary color" -msgstr "Cor do limite" +msgstr "Cor dos limites" msgid "Buffer" msgstr "Buffer" @@ -456,16 +456,16 @@ msgid "Buffer can't be combined with associated geometry." msgstr "O buffer não pode ser combinado com a geometria associada." msgid "Fill color" -msgstr "" +msgstr "Cor de preenchimento" msgid "Line/stroke color" -msgstr "" +msgstr "Cor da linha/traço" msgid "Line/stroke width" -msgstr "" +msgstr "Largura da linha/traço" msgid "Line/stroke width must be between 0-10." -msgstr "" +msgstr "A largura da linha/traço deve estar compreendida entre 0-10." msgid "Labels" msgstr "Etiquetas" @@ -477,7 +477,7 @@ msgid "Only show completed events" msgstr "Mostrar apenas eventos concluídos" msgid "Include org units with no data" -msgstr "Incluir unidades orgânicas sem dados" +msgstr "Incluir unidades organizacionais sem dados" msgid "Low radius" msgstr "Raio baixo" @@ -513,7 +513,7 @@ msgid "Program indicator is required" msgstr "Indicador de programa é obrigatório" msgid "Calculation is required" -msgstr "" +msgstr "É necessário efectuar um cálculo" msgid "Period is required" msgstr "Período é obrigatório" @@ -593,10 +593,10 @@ msgid "Relationship type" msgstr "Tipo de Relação" msgid "No data to show for this feature." -msgstr "" +msgstr "Não há dados a apresentar para esta caraterística." msgid "Feature profile" -msgstr "" +msgstr "Perfil da caraterística" msgid "Remove filter" msgstr "Remover filtro " @@ -614,15 +614,17 @@ msgid "Indicator group" msgstr "Grupo de Indicador" msgid "Manage available layer sources" -msgstr "" +msgstr "Gerir as fontes de camadas disponíveis" msgid "Configure available layer sources" -msgstr "" +msgstr "Configurar as fontes de camadas disponíveis" msgid "" "Choose which layer sources are available to add to maps. This selection " "applies to all users." msgstr "" +"Escolha quais as fontes de camadas disponíveis para adicionar aos mapas. " +"Esta seleção aplica-se a todos os utilizadores." msgid "Collapse" msgstr "Ocultar" @@ -640,7 +642,7 @@ msgid "Download Layer Data" msgstr "Transferir dados da camada" msgid "Downloading GeoJSON data for \"{{layerName}}\"" -msgstr "A tranferir dados GeoJSON para \"{{layerName}}\"" +msgstr "Transferindo dados GeoJSON para \"{{layerName}}\"" msgid "" "GeoJSON is supported by most GIS software, including QGIS and ArcGIS " @@ -666,7 +668,7 @@ msgstr "" "A exibição dividida não pode ser combinada com outros tipos de camada." msgid "Failed to load layer" -msgstr "" +msgstr "Falha no carregamento da camada" msgid "Loading layer" msgstr "Carregando Camada" @@ -681,7 +683,7 @@ msgid "Toggle visibility" msgstr "Alternar visibilidade" msgid "Layer is invalid" -msgstr "" +msgstr "A camada é inválida" msgid "Set layer opacity" msgstr "Definir opacidade da camada" @@ -690,7 +692,7 @@ msgid "More actions" msgstr "Mais acções" msgid "Toggle layer menu" -msgstr "" +msgstr "Alternar o menu de camadas" msgid "Hide data table" msgstr "Ocultar tabela de dados" @@ -720,7 +722,7 @@ msgid "Filters" msgstr "Filtros" msgid "{{layername}}: {{message}}" -msgstr "" +msgstr "{{layername}}: {{message}}" msgid "No data found" msgstr "Dado não encontrado" @@ -756,13 +758,13 @@ msgid "Latitude" msgstr "Latitude" msgid "Basemap could not be added: {{message}}" -msgstr "" +msgstr "Não foi possível adicionar o mapa de base: {{message}}" msgid "Not set" msgstr "Não definido" msgid "Could not retrieve event data" -msgstr "" +msgstr "Não foi possível recuperar os dados do evento" msgid "Organisation unit" msgstr "Unidade organizacional" @@ -774,7 +776,7 @@ msgid "No data" msgstr "Não ha dados" msgid "Could not retrieve tracked entity data" -msgstr "" +msgstr "Não foi possível recuperar os dados da entidade rastreada" msgid "Last updated" msgstr "Última actualização" @@ -793,7 +795,7 @@ msgid "All groups" msgstr "Todos os grupos" msgid "Loading data" -msgstr "Carregamento de dados" +msgstr "Carregando dados" msgid "acres" msgstr "acres" @@ -890,7 +892,7 @@ msgid "Use associated geometry" msgstr "Utilizar a geometria associada" msgid "None (default)" -msgstr "" +msgstr "Nenhum (predefinição)" msgid "No data found for this period." msgstr "Não foram encontrados dados para este período." @@ -1065,12 +1067,15 @@ msgid "" "Only for Sub-Saharan Africa, South and South-East Asia, Latin America and " "the Caribbean." msgstr "" +"Os contornos dos edifícios derivados de imagens de satélite de alta " +"resolução. Apenas para a África Subsariana, Sul e Sudeste Asiático, América " +"Latina e Caraíbas." msgid "" "Building counts are only available for smaller organisation unit areas." msgstr "" -"As contagens de edifícios só estão disponíveis para áreas de unidades " -"organizacionais mais pequenas." +"A contagem de edifícios só está disponível para unidades organizacionais com" +" áreas pequenas." msgid "" "Select a smaller area or single organization unit to see the count of " @@ -1083,13 +1088,13 @@ msgid "Number of buildings" msgstr "Número de edifícios" msgid "0.5 meter" -msgstr "" +msgstr "0,5 metros" msgid "Single point in time" -msgstr "" +msgstr "Ponto único no tempo" msgid "May 2023" -msgstr "" +msgstr "Maio de 2023" msgid "Elevation" msgstr "Elevação" @@ -1098,13 +1103,13 @@ msgid "Elevation above sea-level." msgstr "Elevação acima do nível do mar." msgid "meters" -msgstr "contadores" +msgstr "metros" msgid "~30 meters" -msgstr "" +msgstr "~30 metros" msgid "Febuary 2000" -msgstr "" +msgstr "Fevereiro de 2000" msgid "Landcover" msgstr "Cobertura do solo" @@ -1190,7 +1195,7 @@ msgid "people per km²" msgstr "População por km²" msgid "Estimated number of people living in an area." -msgstr "Estimated number of people living in an area." +msgstr "Número estimado de pessoas que vivem em uma área." msgid "people per hectare" msgstr "pessoas por hectare" @@ -1211,7 +1216,7 @@ msgstr "" "mensalmente, durante a 3ª semana do mês seguinte." msgid "Temperature MODIS" -msgstr "" +msgstr "Temperatura MODIS" msgid "°C during daytime" msgstr "° C durante o dia" @@ -1224,69 +1229,70 @@ msgstr "" "branco aparecerão em áreas com uma cobertura de nuvens persistente." msgid "Population age groups" -msgstr "Population age groups" +msgstr "Faixas etárias da população" msgid "" "Estimated number of people living in an area, grouped by age and gender." msgstr "" -"Estimated number of people living in an area, grouped by age and gender." +"Número estimado de pessoas que vivem em uma área, agrupadas por idade e " +"sexo." msgid "~100 meters" -msgstr "" +msgstr "~100 metros" msgid "Male 0 - 1 years" -msgstr "Homem 0 - 1 anos" +msgstr "Masculino 0 - 1 anos" msgid "Male 1 - 4 years" -msgstr "Homem 1 - 4 anos" +msgstr "Masculino 1 - 4 anos" msgid "Male 5 - 9 years" -msgstr "Homem 5 - 9 anos" +msgstr "Masculino 5 - 9 anos" msgid "Male 10 - 14 years" -msgstr "Homem 10 - 14 anos" +msgstr "Masculino 10 - 14 anos" msgid "Male 15 - 19 years" -msgstr "Homem 15 - 19 anos" +msgstr "Masculino 15 - 19 anos" msgid "Male 20 - 24 years" -msgstr "Homem 20 - 24 anos" +msgstr "Masculino 20 - 24 anos" msgid "Male 25 - 29 years" -msgstr "Homem 25 - 29 anos" +msgstr "Masculino 25 - 29 anos" msgid "Male 30 - 34 years" -msgstr "Homem 30 - 34 anos" +msgstr "Masculino 30 - 34 anos" msgid "Male 35 - 39 years" -msgstr "Homem 35 - 39 anos" +msgstr "Masculino 35 - 39 anos" msgid "Male 40 - 44 years" -msgstr "Homem 40 - 44 anos" +msgstr "Masculino 40 - 44 anos" msgid "Male 45 - 49 years" -msgstr "Homem 45 - 49 anos" +msgstr "Masculino 45 - 49 anos" msgid "Male 50 - 54 years" -msgstr "Homem 50 - 54 anos" +msgstr "Masculino 50 - 54 anos" msgid "Male 55 - 59 years" -msgstr "Homem 55 - 59 anos" +msgstr "Masculino 55 - 59 anos" msgid "Male 60 - 64 years" -msgstr "Homem 60 - 64 anos" +msgstr "Masculino 60 - 64 anos" msgid "Male 65 - 69 years" -msgstr "Homem 65 - 69 anos" +msgstr "Masculino 65 - 69 anos" msgid "Male 70 - 74 years" -msgstr "Homem 70 - 74 anos" +msgstr "Masculino 70 - 74 anos" msgid "Male 75 - 79 years" -msgstr "Homem 75 - 79 anos" +msgstr "Masculino 75 - 79 anos" msgid "Male 80 years and above" -msgstr "Homens com 80 anos ou mais" +msgstr "Masculino com 80 anos ou mais" msgid "Female 0 - 1 years" msgstr "Feminino 0 - 1 anos" @@ -1325,47 +1331,51 @@ msgid "Female 50 - 54 years" msgstr "Feminino 50 - 54 anos" msgid "Female 55 - 59 years" -msgstr "Mulher 55 - 59 anos" +msgstr "Feminino 55 - 59 anos" msgid "Female 60 - 64 years" -msgstr "Mulher 60 - 64 anos" +msgstr "Feminino 60 - 64 anos" msgid "Female 65 - 69 years" -msgstr "Mulher 65 - 69 anos" +msgstr "Feminino 65 - 69 anos" msgid "Female 70 - 74 years" -msgstr "Mulher 70 - 74 anos" +msgstr "Feminino 70 - 74 anos" msgid "Female 75 - 79 years" msgstr "Feminino 75 - 79 anos" msgid "Female 80 years and above" -msgstr "Mulheres com 80 anos ou mais" +msgstr "Feminino com 80 anos ou mais" msgid "Precipitation monthly" -msgstr "" +msgstr "Precipitação mensal" msgid "" "Accumulated liquid and frozen water, including rain and snow, that falls to " "the surface. Combines model data with observations from across the world." msgstr "" +"Água líquida e congelada acumulada, incluindo chuva e neve, que cai à " +"superfície. Combina dados de modelos com observações de todo o mundo." msgid "~11 kilometers" -msgstr "" +msgstr "~11 quilómetros" msgid "Monthly" msgstr "Mensal" msgid "Febuary 1950 - One month ago" -msgstr "" +msgstr "Fevereiro de 1950 - Um mês atrás" msgid "Temperature monthly" -msgstr "" +msgstr "Temperatura mensal" msgid "" "Temperature at 2m above the surface. Combines model data with observations " "from across the world." msgstr "" +"Temperatura a 2 m acima da superfície. Combina dados de modelos com " +"observações de todo o mundo." msgid "All" msgstr "Tudo" @@ -1455,13 +1465,13 @@ msgid "Cancelled" msgstr "Cancelado" msgid "Earth Engine layer" -msgstr "" +msgstr "Camada do Earth Engine" msgid "You don't have access to this layer data" msgstr "Não tem acesso a esta camada de dados" msgid "The event filter is not supported" -msgstr "" +msgstr "O filtro de eventos não é suportado" msgid "An unknown error occurred while reading layer data" msgstr "Ocorreu um erro desconhecido durante a leitura dos dados da camada" @@ -1476,13 +1486,14 @@ msgid "Facilities" msgstr "Instalações" msgid "No coordinates found for selected facilities" -msgstr "" +msgstr "Não foram encontradas coordenadas para as instalações selecionadas" msgid "There was a problem with this layer. Contact a system administrator." msgstr "" +"Houve um problema com esta camada. Contacte um administrador do sistema." msgid "Feature" -msgstr "" +msgstr "Caraterística" msgid "Polygon" msgstr "Poligono" @@ -1497,10 +1508,10 @@ msgid "Organisation units" msgstr "Unidades organizacionais" msgid "Org unit layer" -msgstr "" +msgstr "Camada da unidade organizacional" msgid "Data item was not found" -msgstr "" +msgstr "O item de dados não foi encontrado" msgid "Thematic layer" msgstr "Camada temática" @@ -1550,7 +1561,7 @@ msgid "Org units" msgstr "Unidades organizacionais" msgid "Facility" -msgstr "Unidade sanitaria" +msgstr "Instalação" msgid "Start date is invalid" msgstr "A data de início é inválida" From 32b01ed1577c2d52cb75c644f1db466730e1fd9f Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Tue, 3 Dec 2024 01:55:07 +0000 Subject: [PATCH 5/5] chore(release): cut 100.7.8 [skip release] ## [100.7.8](https://github.com/dhis2/maps-app/compare/v100.7.7...v100.7.8) (2024-12-03) ### Bug Fixes * **translations:** sync translations from transifex (master) ([4cd5d45](https://github.com/dhis2/maps-app/commit/4cd5d456ce8669ef975c1fd4a0d0321c60685085)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5cf66506..aaa03d5b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [100.7.8](https://github.com/dhis2/maps-app/compare/v100.7.7...v100.7.8) (2024-12-03) + + +### Bug Fixes + +* **translations:** sync translations from transifex (master) ([4cd5d45](https://github.com/dhis2/maps-app/commit/4cd5d456ce8669ef975c1fd4a0d0321c60685085)) + ## [100.7.7](https://github.com/dhis2/maps-app/compare/v100.7.6...v100.7.7) (2024-11-29) diff --git a/package.json b/package.json index 17aa4f2fe..715ee0531 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "maps-app", - "version": "100.7.7", + "version": "100.7.8", "description": "DHIS2 Maps", "license": "BSD-3-Clause", "author": "Bjørn Sandvik",