Merge branch 'master' into feat/use-highcharts-clientside-downloads-D…

…HIS2-17722
dhis2 · Nov 6, 2024 · 5e362e0 · 5e362e0
2 parents 2e2120f + d2c5b0d
commit 5e362e0
Show file tree

Hide file tree

Showing 10 changed files with 422 additions and 232 deletions.
diff --git a/.github/workflows/dhis2-preview-pr.yml b/.github/workflows/dhis2-preview-pr.yml
@@ -21,8 +21,8 @@ jobs:
         runs-on: ubuntu-latest
         if: "!github.event.push.repository.fork && github.actor != 'dependabot[bot]'"
         steps:
-            - uses: actions/checkout@v3
-            - uses: actions/setup-node@v3
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v4
               with:
                   node-version: 18.x
 
@@ -34,7 +34,7 @@ jobs:
 
             - name: Deploy
               id: netlify-deploy
-              uses: nwtgck/actions-netlify@v1.2.2
+              uses: nwtgck/actions-netlify@v3
               timeout-minutes: 1
               with:
                   github-token: ${{ secrets.DHIS2_BOT_GITHUB_TOKEN }}

diff --git a/.github/workflows/dhis2-verify-commits.yml b/.github/workflows/dhis2-verify-commits.yml
@@ -8,7 +8,7 @@ jobs:
     lint-pr-title:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
             - uses: c-hive/gha-yarn-cache@v1
             - run: yarn install --frozen-lockfile
             - id: commitlint
@@ -20,13 +20,15 @@ jobs:
     lint-commits:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
               with:
                   fetch-depth: 0
             - uses: c-hive/gha-yarn-cache@v1
             - run: yarn install --frozen-lockfile
             - id: commitlint
+              # This will return a config file with a .js extensions for @dhis2/cli-style v10
               run: echo ::set-output name=config_path::$(node -e "process.stdout.write(require('@dhis2/cli-style').config.commitlint)")
-            - uses: wagoid/commitlint-github-action@v4
+              # commitlint-github-action@v6+ requires a .mjs extension for the config file, so the highest version we can use is 5
+            - uses: wagoid/commitlint-github-action@v5
               with:
                   configFile: ${{ steps.commitlint.outputs.config_path }}
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -33,7 +33,7 @@ jobs:
         steps:
             - name: Send failure message to analytics-internal-kfmt slack channel
               id: slack
-              uses: slackapi/slack-github-action@v1.23.0
+              uses: slackapi/slack-github-action@v1.27.0
               with:
                   channel-id: ${{ secrets.SLACK_CHANNEL_ID }}
                   slack-message: ':data-visualizer-app: Data-visualizer-app e2e nightly run <https://cloud.cypress.io/projects/sojh88/runs?branches=[{"label":"dev","suggested":false,"value":"dev"}]|failed>'

diff --git a/.github/workflows/publish-d2-ci.yml b/.github/workflows/publish-d2-ci.yml
@@ -31,9 +31,9 @@ jobs:
             - name: Print GitHub ref
               run: echo "GITHUB_REF is $GITHUB_REF"
 
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
                   node-version: 18.x
 
@@ -56,7 +56,7 @@ jobs:
         steps:
             - name: Send failure message to analytics-internal-bot slack channel
               id: slack_publish_failure
-              uses: slackapi/slack-github-action@v1.23.0
+              uses: slackapi/slack-github-action@v1.27.0
               with:
                   channel-id: ${{ secrets.SLACK_CHANNEL_ID }}
                   payload: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,11 +24,11 @@ jobs:
             !contains(github.event.head_commit.message, '[skip release]') &&
             !startsWith(github.event.head_commit.message, 'chore') }}
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
               with:
                   token: ${{ secrets.DHIS2_BOT_GITHUB_TOKEN }}
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
                   node-version: 18.x
 
@@ -62,12 +62,12 @@ jobs:
             - name: Extract version
               if: success()
               id: extract_version
-              uses: Saionaro/extract-package-version@v1.2.1
+              uses: Saionaro/extract-package-version@1.3.0
 
             - name: Send success message to analytics-internal-bot slack channel
               if: success()
               id: slack_success
-              uses: slackapi/slack-github-action@v1.23.0
+              uses: slackapi/slack-github-action@v1.27.0
               with:
                   channel-id: ${{ secrets.SLACK_CHANNEL_ID }}
                   payload: |
@@ -117,7 +117,7 @@ jobs:
             - name: Send failure message to analytics-internal-bot slack channel
               if: ${{ failure() && !cancelled() }}
               id: slack_failure
-              uses: slackapi/slack-github-action@v1.23.0
+              uses: slackapi/slack-github-action@v1.27.0
               with:
                   channel-id: ${{ secrets.SLACK_CHANNEL_ID }}
                   payload: |

diff --git a/.github/workflows/verify-pr.yml b/.github/workflows/verify-pr.yml
@@ -18,16 +18,16 @@ jobs:
         outputs:
             matrix: ${{ steps.set-matrix.outputs.specs }}
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
             - name: Generate Test matrix
               id: set-matrix
               run: echo "::set-output name=specs::$(node cypress/support/generateTestMatrix.js)"
 
     build:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
-            - uses: actions/setup-node@v3
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v4
               with:
                   node-version: 18.x
 
@@ -37,7 +37,7 @@ jobs:
             - name: Build
               run: yarn d2-app-scripts build
 
-            - uses: actions/upload-artifact@v3
+            - uses: actions/upload-artifact@v4
               with:
                   name: app-build
                   path: |
@@ -48,8 +48,8 @@ jobs:
     lint:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
-            - uses: actions/setup-node@v3
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v4
               with:
                   node-version: 18.x
 
@@ -65,8 +65,8 @@ jobs:
     test:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
-            - uses: actions/setup-node@v3
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v4
               with:
                   node-version: 18.x
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [100.8.3](https://github.com/dhis2/data-visualizer-app/compare/v100.8.2...v100.8.3) (2024-10-24)
+
+
+### Bug Fixes
+
+* show error UI when plugin has no data [DHIS2-16793] ([#3131](https://github.com/dhis2/data-visualizer-app/issues/3131)) ([83f8a0a](https://github.com/dhis2/data-visualizer-app/commit/83f8a0a5a730272ffba796bb23ebf2686ea84b9e))
+
 ## [100.8.2](https://github.com/dhis2/data-visualizer-app/compare/v100.8.1...v100.8.2) (2024-10-22)
 
 

diff --git a/jest.config.js b/jest.config.js
@@ -36,14 +36,24 @@ const reportPortalConfig = [
     },
 ]
 
+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 = {
     transformIgnorePatterns: [
         'node_modules/(?!(lodash-es|@dhis2/d2-ui-[a-z-]+)/)',
     ],
-    setupFilesAfterEnv: ['./config/testSetup.js'],
+    setupFilesAfterEnv: ['<rootDir>/config/testSetup.js'],
 
     testRunner: 'jest-circus/runner',
-    reporters: ['default', ...(isGithubActionsRun ? [reportPortalConfig] : [])],
+    reporters: [
+        'default',
+        ...(isGithubActionsRun && isReportPortalSetup && !isDependabotPR
+            ? [reportPortalConfig]
+            : []),
+    ],
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "data-visualizer-app",
-    "version": "100.8.2",
+    "version": "100.8.3",
     "description": "DHIS2 Data Visualizer",
     "license": "BSD-3-Clause",
     "private": true,