Merge branch 'dev' into fix-viz-menu-icon

dhis2 · Feb 1, 2024 · e2b691c · e2b691c
2 parents bbba5f6 + 5872a5a
commit e2b691c
Show file tree

Hide file tree

Showing 10 changed files with 125 additions and 19 deletions.
diff --git a/.github/workflows/dhis2-verify-app.yml b/.github/workflows/dhis2-verify-app.yml
@@ -82,6 +82,7 @@ jobs:
                   REPORTPORTAL_PROJECT: ${{ vars.REPORTPORTAL_PROJECT }}
 
     call-workflow-e2e-prod:
+        if: "!contains(github.event.head_commit.message, '[skip ci]')"
         needs: [build, lint, test]
         uses: dhis2/workflows/.github/workflows/analytics-e2e-tests-prod.yml@master
         secrets:
@@ -133,13 +134,70 @@ jobs:
         if: |
             failure() &&
             !cancelled() &&
-            github.ref == 'refs/heads/master'
+            github.ref == 'refs/heads/master' &&
+            contains(github.event.head_commit.message, 'chore(release)')
         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: Data-visualizer-app release <https://github.com/dhis2/data-visualizer-app/actions/workflows/dhis2-verify-app.yml?query=branch%3Amaster+is%3Afailure>'
+                  payload: |
+                      {
+                        "text": ":small_red_triangle_down: :data-visualizer-app: DV release <https://github.com/dhis2/data-visualizer-app/actions/workflows/dhis2-verify-app.yml?query=branch%3Amaster+is%3Afailure|failed>",
+                        "blocks": [
+                          {
+                            "type": "section",
+                            "text": {
+                              "type": "mrkdwn",
+                              "text": ":small_red_triangle_down: :data-visualizer-app: DV release <https://github.com/dhis2/maps-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' &&
+            contains(github.event.head_commit.message, 'chore(release)')
+        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: :data-visualizer-app: :tada: DV app release succeeded for version: ${{ steps.extract_version.outputs.version }}",
+                        "blocks": [
+                          {
+                            "type": "section",
+                            "text": {
+                              "type": "mrkdwn",
+                              "text": ":large_green_circle: :data-visualizer-app: :tada: DV version ${{ steps.extract_version.outputs.version }} released <https://github.com/dhis2/data-visualizer-app/actions/workflows/dhis2-verify-app.yml?query=branch%3Amaster+is%3Asuccess|successfully>"
+                            }
+                          }
+                        ]
+                      }
               env:
                   SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
diff --git a/i18n/fr.po b/i18n/fr.po
@@ -4,19 +4,19 @@
 # Matthieu Pinard <[email protected]>, 2019
 # Karoline Tufte Lien <[email protected]>, 2020
 # Djibril Dione <[email protected]>, 2020
-# Philip Larsen Donnelly, 2020
 # Gabriela Rodriguez <[email protected]>, 2020
 # Viktor Varland <[email protected]>, 2021
 # Yayra Gomado <[email protected]>, 2022
 # Yao Selom SAKA (HISP WCA) <[email protected]>, 2022
 # Edem Kossi <[email protected]>, 2023
+# Philip Larsen Donnelly, 2024
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-09-06T13:41:14.540Z\n"
+"POT-Creation-Date: 2023-11-13T12:11:28.959Z\n"
 "PO-Revision-Date: 2019-06-25 18:46+0000\n"
-"Last-Translator: Edem Kossi <[email protected]>, 2023\n"
+"Last-Translator: Philip Larsen Donnelly, 2024\n"
 "Language-Team: French (https://app.transifex.com/hisp-uio/teams/100509/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -56,7 +56,7 @@ msgid "Yes, leave"
 msgstr "Oui, quitter"
 
 msgid "Add to {{axisName}}"
-msgstr "Ajouter à {{nomdel'axe}} "
+msgstr "Ajouter à {{axisName}}"
 
 msgid ""
 "'{{visualizationType}}' is intended to show a single data item. Only the "
@@ -400,6 +400,9 @@ msgstr "Inclure cumulatif"
 msgid "Cumulative values"
 msgstr "Valeurs cumulées"
 
+msgid "Accumulate cell values along rows"
+msgstr ""
+
 msgid "Show data item icon"
 msgstr ""
 
@@ -725,7 +728,7 @@ msgid "Change org unit"
 msgstr "Changer d'unité d'organisation"
 
 msgid "{{level}} level in {{orgunit}}"
-msgstr "{niveau}} niveau dans {{unité d'org.}}"
+msgstr "{{level}} niveau dans {{orgunit}}"
 
 msgid "Open as Map"
 msgstr "Ouvrir comme carte"
@@ -736,6 +739,9 @@ msgstr ""
 "Tracez graphiquement les données sur une carte du monde. Les éléments de "
 "données utilisent des couches de carte distinctes."
 
+msgid "Not supported when using cumulative values"
+msgstr ""
+
 msgid "No data available"
 msgstr "Pas de données disponibles"
 
@@ -877,6 +883,14 @@ msgstr ""
 msgid "Something went wrong"
 msgstr "Quelque chose a mal tourné"
 
+msgid ""
+"There's a problem with the generated analytics. Contact a system "
+"administrator."
+msgstr ""
+
+msgid "There's a syntax problem with the analytics request."
+msgstr ""
+
 msgid "or"
 msgstr "ou"
 
@@ -1048,6 +1062,9 @@ msgstr "Lignes"
 msgid "Totals"
 msgstr "Totaux"
 
+msgid "Totals are not supported when using cumulative values"
+msgstr ""
+
 msgid "Vertical (y) axis {{axisId}}"
 msgstr "Axe vertical (y) {{axisId}}"
 

diff --git a/i18n/nb.po b/i18n/nb.po
@@ -1,14 +1,14 @@
 # 
 # Translators:
 # Caroline Hesthagen Holen <[email protected]>, 2022
-# Karoline Tufte Lien <[email protected]>, 2023
+# Karoline Tufte Lien <[email protected]>, 2024
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-09-06T13:41:14.540Z\n"
+"POT-Creation-Date: 2023-11-13T12:11:28.959Z\n"
 "PO-Revision-Date: 2019-06-25 18:46+0000\n"
-"Last-Translator: Karoline Tufte Lien <[email protected]>, 2023\n"
+"Last-Translator: Karoline Tufte Lien <[email protected]>, 2024\n"
 "Language-Team: Norwegian Bokmål (https://app.transifex.com/hisp-uio/teams/100509/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -195,7 +195,7 @@ msgid "Only '{{- name}}' in use"
 msgstr "Bare '{{- name}}' er i bruk"
 
 msgid "Only '{{number}}' in use"
-msgstr "Bare '{{nummer}}' er i bruk"
+msgstr "Bare '{{number}}' er i bruk"
 
 msgid "All items are selected"
 msgstr "Alle elementer er valgt"
@@ -389,6 +389,9 @@ msgstr "Inkluder kumulativ"
 msgid "Cumulative values"
 msgstr "Kumulative verdier"
 
+msgid "Accumulate cell values along rows"
+msgstr ""
+
 msgid "Show data item icon"
 msgstr ""
 
@@ -711,6 +714,9 @@ msgid ""
 msgstr ""
 "Vis data på et verdenskart visuelt. Dataelementer bruker separate kartlag."
 
+msgid "Not supported when using cumulative values"
+msgstr ""
+
 msgid "No data available"
 msgstr "Ingen data tilgjengelig"
 
@@ -842,6 +848,14 @@ msgstr ""
 msgid "Something went wrong"
 msgstr "Noe gikk galt"
 
+msgid ""
+"There's a problem with the generated analytics. Contact a system "
+"administrator."
+msgstr ""
+
+msgid "There's a syntax problem with the analytics request."
+msgstr ""
+
 msgid "or"
 msgstr "eller"
 
@@ -1008,6 +1022,9 @@ msgstr "Linjer"
 msgid "Totals"
 msgstr "Totalsummer"
 
+msgid "Totals are not supported when using cumulative values"
+msgstr ""
+
 msgid "Vertical (y) axis {{axisId}}"
 msgstr ""
 

diff --git a/i18n/zh.po b/i18n/zh.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-09-06T13:41:14.540Z\n"
+"POT-Creation-Date: 2023-11-13T12:11:28.959Z\n"
 "PO-Revision-Date: 2019-06-25 18:46+0000\n"
 "Last-Translator: easylin <[email protected]>, 2023\n"
 "Language-Team: Chinese (https://app.transifex.com/hisp-uio/teams/100509/zh/)\n"
@@ -379,6 +379,9 @@ msgstr "包括累计"
 msgid "Cumulative values"
 msgstr "汇总值"
 
+msgid "Accumulate cell values along rows"
+msgstr "沿行累积单元格的值"
+
 msgid "Show data item icon"
 msgstr "显示数据项图标"
 
@@ -694,6 +697,9 @@ msgid ""
 "Visually plot data on a world map. Data elements use separate map layers."
 msgstr "在世界地图上直观地绘制数据。数据元素使用单独的地图图层。"
 
+msgid "Not supported when using cumulative values"
+msgstr "使用累积值时不支持"
+
 msgid "No data available"
 msgstr "没有值"
 
@@ -976,6 +982,9 @@ msgstr "线"
 msgid "Totals"
 msgstr "总共"
 
+msgid "Totals are not supported when using cumulative values"
+msgstr "使用累积值时不支持总计"
+
 msgid "Vertical (y) axis {{axisId}}"
 msgstr "垂直 (y) 轴 {{axisId}}"
 

diff --git a/jest.config.js b/jest.config.js
@@ -5,7 +5,6 @@ module.exports = {
     setupFilesAfterEnv: ['./config/testSetup.js'],
 
     testRunner: 'jest-circus/runner',
-    testRegex: ['/src/modules/__tests__/.*.spec.js?$'],
     reporters: [
         'default',
         [

diff --git a/package.json b/package.json
@@ -41,7 +41,7 @@
         "start-server-and-test": "^2.0.0"
     },
     "dependencies": {
-        "@dhis2/analytics": "^26.2.0",
+        "@dhis2/analytics": "^26.3.0",
         "@dhis2/app-runtime": "^3.7.0",
         "@dhis2/app-runtime-adapter-d2": "^1.1.0",
         "@dhis2/app-service-datastore": "^1.0.0-beta.3",

diff --git a/src/components/DownloadMenu/GraphicsMenu.js b/src/components/DownloadMenu/GraphicsMenu.js
@@ -27,6 +27,7 @@ export const GraphicsMenu = ({ hoverable, onDownload }) => {
                 icon={<IconImage24 color={colors.grey600} />}
                 label={i18n.t('Image (.png)')}
                 onClick={() => onDownload({ format: FILE_FORMAT_PNG })}
+                className="push-analytics-download-menu-item"
             />
             <MenuItemComponent
                 key="pdf"

diff --git a/src/components/DownloadMenu/TableMenu.js b/src/components/DownloadMenu/TableMenu.js
@@ -44,6 +44,7 @@ export const TableMenu = ({ hoverable, onDownload }) => {
             <MenuItemComponent
                 key="html"
                 label={i18n.t('HTML (.html)')}
+                className="push-analytics-download-menu-item"
                 onClick={() =>
                     onDownload({
                         type: DOWNLOAD_TYPE_TABLE,

diff --git a/src/components/DownloadMenu/ToolbarDownloadDropdown.js b/src/components/DownloadMenu/ToolbarDownloadDropdown.js
@@ -8,7 +8,11 @@ const ToolbarDownloadDropdown = () => {
     const { disabled, doDownloadData, doDownloadImage, visType } = useDownload()
 
     return (
-        <HoverMenuDropdown label={i18n.t('Download')} disabled={disabled}>
+        <HoverMenuDropdown
+            label={i18n.t('Download')}
+            disabled={disabled}
+            className="push-analytics-download-dropdown-menu-button"
+        >
             <DownloadMenu
                 hoverable
                 onDownloadData={doDownloadData}

diff --git a/yarn.lock b/yarn.lock
@@ -2028,10 +2028,10 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2/analytics@^26.2.0":
-  version "26.2.0"
-  resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-26.2.0.tgz#36a7f258ac96ddab90f4001e62257e2cc64f202e"
-  integrity sha512-YcJu6EHnor6pbHmwXKYumLRVy/9TxuLtBDv9JIzjt9/APZa8kbak6sT2/53pnWDnbUjzDwR8EV1UIz24vAX+ig==
+"@dhis2/analytics@^26.3.0":
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-26.3.0.tgz#ada2fe27442f19704fa704e334546416c85ea1d6"
+  integrity sha512-B/pUh8K8wyivL4yBiwqPoQ94pMWwCqh0xu3Uak4jmJqS+jO0slUlyDLtAmXU/jqRlRgRg1nR4u18npjd511Q7A==
   dependencies:
     "@dhis2/d2-ui-rich-text" "^7.4.1"
     "@dhis2/multi-calendar-dates" "1.0.0"