Skip to content

Commit

Permalink
fix: event chart and event report interpretations was showing an error (
Browse files Browse the repository at this point in the history 
#3071)

Fixes: https://dhis2.atlassian.net/browse/DHIS2-17943
  • Loading branch information
@jenniferarnesen
jenniferarnesen authored Aug 27, 2024
1 parent 0a73169 commit c074cbf
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 20 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ jobs:
${{ !github.event.push.repository.fork &&
github.actor != 'dependabot[bot]' &&
!contains(github.event.head_commit.message, '[skip ci]') &&
!contains(github.event.head_commit.message, '[skip release]') &&
!startsWith(github.event.head_commit.message, 'chore') }}
!contains(github.event.head_commit.message, '[skip release]') }}
steps:
- name: Print GitHub event context
run: echo "$GITHUB_EVENT" | jq '.'
Expand Down Expand Up @@ -115,7 +114,7 @@ jobs:
"type": "section",
"text": {
"type": "mrkdwn",
"text": "Link to <https://github.com/dhis2/dashboard-app/actions/workflows/dhis2-verify-app.yml?query=branch%3Amaster+is%3Asuccess|build>"
"text": "Link to <https://github.com/dhis2/dashboard-app/actions/workflows/release.yml?query=branch%3Amaster+is%3Asuccess|build>"
}
}
]
Expand All @@ -131,13 +130,13 @@ jobs:
channel-id: ${{ secrets.SLACK_CHANNEL_ID }}
payload: |
{
"text": ":small_red_triangle_down: :dashboard-app: Dashboard release <https://github.com/dhis2/dashboard-app/actions/workflows/dhis2-verify-app.yml?query=branch%3Amaster+is%3Afailure|failed>",
"text": ":small_red_triangle_down: :dashboard-app: Dashboard release <https://github.com/dhis2/dashboard-app/actions/workflows/release.yml?query=branch%3Amaster+is%3Afailure|failed>",
"blocks": [
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": ":small_red_triangle_down: :dashboard-app: Dashboard release <https://github.com/dhis2/dashboard-app/actions/workflows/dhis2-verify-app.yml?query=branch%3Amaster+is%3Afailure|failed>"
"text": ":small_red_triangle_down: :dashboard-app: Dashboard release <https://github.com/dhis2/dashboard-app/actions/workflows/release.yml?query=branch%3Amaster+is%3Afailure|failed>"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"private": true,
"license": "BSD-3-Clause",
"dependencies": {
"@dhis2/analytics": "^26.7.0",
"@dhis2/analytics": "^26.8.2",
"@dhis2/app-runtime": "^3.10.2",
"@dhis2/app-runtime-adapter-d2": "^1.1.0",
"@dhis2/d2-i18n": "^1.1.3",
Expand Down
42 changes: 28 additions & 14 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2281,12 +2281,12 @@
classnames "^2.3.1"
prop-types "^15.7.2"

"@dhis2/analytics@^26.7.0":
version "26.7.0"
resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-26.7.0.tgz#12d314ad2a84423612ff0eb0e32c191552bd8db8"
integrity sha512-7ocy+Ke9fYG40rHsICuH35UgIH+ahAgba9xFea0UbRYUhGavMW90mSVpgCNjE+PlefjR0xuHXB2UHYlTjhEIQw==
"@dhis2/analytics@^26.8.2":
version "26.8.2"
resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-26.8.2.tgz#a7da752009aae277f5e8f485c7c96853ca535543"
integrity sha512-mJNr3V0sL7XgK9KssX9dGoO5GiuCcIe8epOtvJ8LPFmbfurNYtCcRANXCtybVe3yKfZshxOgXEYvtVqtZJ8TCg==
dependencies:
"@dhis2/multi-calendar-dates" "1.0.0"
"@dhis2/multi-calendar-dates" "^1.2.2"
"@dnd-kit/core" "^6.0.7"
"@dnd-kit/sortable" "^7.0.2"
"@dnd-kit/utilities" "^3.2.1"
Expand Down Expand Up @@ -2494,14 +2494,6 @@
i18next "^10.3"
moment "^2.24.0"

"@dhis2/multi-calendar-dates@1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@dhis2/multi-calendar-dates/-/multi-calendar-dates-1.0.0.tgz#bf7f49aecdffa9781837a5d60d56a094b74ab4df"
integrity sha512-IB9a+feuS6yE4lpZj/eZ9uBmpYI7Hxitl2Op0JjoRL4tP+p6uw4ns9cjoSdUeIU9sOAxVZV7oQqSyIw+9P6YjQ==
dependencies:
"@js-temporal/polyfill" "^0.4.2"
classnames "^2.3.2"

"@dhis2/multi-calendar-dates@1.0.2":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@dhis2/multi-calendar-dates/-/multi-calendar-dates-1.0.2.tgz#e54dc85e512aba93fceef3004e67e199077f3ba8"
Expand All @@ -2510,6 +2502,15 @@
"@js-temporal/polyfill" "^0.4.2"
classnames "^2.3.2"

"@dhis2/multi-calendar-dates@^1.2.2":
version "1.2.4"
resolved "https://registry.yarnpkg.com/@dhis2/multi-calendar-dates/-/multi-calendar-dates-1.2.4.tgz#bf90587c7a27b5ca7345ab63948ded0495e8f287"
integrity sha512-OTK4fxLMgTSERU16dof0pBqGBjmq+zen3HB1d4odxMHxykxbUXTmrRkYB7afIXrDrUA/pan5t6UVwmhe/O1BWw==
dependencies:
"@dhis2/d2-i18n" "^1.1.3"
"@js-temporal/polyfill" "0.4.3"
classnames "^2.3.2"

"@dhis2/prop-types@^3.1.2":
version "3.1.2"
resolved "https://registry.yarnpkg.com/@dhis2/prop-types/-/prop-types-3.1.2.tgz#65b8ad2da8cd2f72bc8b951049a6c9d1b97af3e9"
Expand Down Expand Up @@ -3240,6 +3241,14 @@
"@jridgewell/resolve-uri" "^3.1.0"
"@jridgewell/sourcemap-codec" "^1.4.14"

"@js-temporal/polyfill@0.4.3":
version "0.4.3"
resolved "https://registry.yarnpkg.com/@js-temporal/polyfill/-/polyfill-0.4.3.tgz#e8f8cf86745eb5050679c46a5ebedb9a9cc1f09b"
integrity sha512-6Fmjo/HlkyVCmJzAPnvtEWlcbQUSRhi8qlN9EtJA/wP7FqXsevLLrlojR44kzNzrRkpf7eDJ+z7b4xQD/Ycypw==
dependencies:
jsbi "^4.1.0"
tslib "^2.3.1"

"@js-temporal/polyfill@^0.4.2":
version "0.4.4"
resolved "https://registry.yarnpkg.com/@js-temporal/polyfill/-/polyfill-0.4.4.tgz#4c26b4a1a68c19155808363f520204712cfc2558"
Expand Down Expand Up @@ -11065,7 +11074,7 @@ js-yaml@^4.1.0:
dependencies:
argparse "^2.0.1"

jsbi@^4.3.0:
jsbi@^4.1.0, jsbi@^4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-4.3.0.tgz#b54ee074fb6fcbc00619559305c8f7e912b04741"
integrity sha512-SnZNcinB4RIcnEyZqFPdGPVgrg2AcnykiBy0sHVJQKHYeaLUvi3Exj+iaPpLnFVkDPZIV4U0yvgC9/R4uEAZ9g==
Expand Down Expand Up @@ -16779,6 +16788,11 @@ tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.1:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==

tslib@^2.3.1:
version "2.7.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01"
integrity sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==

tsutils@^3.21.0:
version "3.21.0"
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
Expand Down

0 comments on commit c074cbf

Please sign in to comment.