fix: get default relative periods labels

dhis2 · Nov 25, 2024 · 7b3545a · 7b3545a
1 parent 67ff60d
commit 7b3545a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -41,7 +41,7 @@
         "start-server-and-test": "^2.0.3"
     },
     "dependencies": {
-        "@dhis2/analytics": "git+https://github.com/d2-ci/analytics.git#feat/DHIS2-15796",
+        "@dhis2/analytics": "git+https://github.com/d2-ci/analytics.git#223ec5f2dd57fc9190aae3882ed8bbb51dde46fa",
         "@dhis2/app-runtime": "^3.11.2",
         "@dhis2/app-runtime-adapter-d2": "^1.1.0",
         "@dhis2/app-service-datastore": "^1.0.0-beta.3",

diff --git a/src/components/edit/thematic/ThematicDialog.js b/src/components/edit/thematic/ThematicDialog.js
@@ -1,4 +1,4 @@
-import { PeriodDimension } from '@dhis2/analytics'
+import { PeriodDimension, getRelativePeriodsMap } from '@dhis2/analytics'
 import i18n from '@dhis2/d2-i18n'
 import PropTypes from 'prop-types'
 import React, { Component } from 'react'
@@ -188,6 +188,7 @@ class ThematicDialog extends Component {
             const defaultPeriods = [
                 {
                     id: defaultPeriod,
+                    name: getRelativePeriodsMap()[defaultPeriod],
                 },
             ]
             setPeriods(defaultPeriods)

diff --git a/yarn.lock b/yarn.lock
@@ -2018,9 +2018,9 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2/analytics@git+https://github.com/d2-ci/analytics.git#feat/DHIS2-15796":
-  version "26.9.2"
-  resolved "git+https://github.com/d2-ci/analytics.git#c3860a94bfbb927719fcef4f8eaa57a7950018b2"
+"@dhis2/analytics@git+https://github.com/d2-ci/analytics.git#223ec5f2dd57fc9190aae3882ed8bbb51dde46fa":
+  version "26.9.3"
+  resolved "git+https://github.com/d2-ci/analytics.git#223ec5f2dd57fc9190aae3882ed8bbb51dde46fa"
   dependencies:
     "@dhis2/multi-calendar-dates" "^1.2.2"
     "@dnd-kit/core" "^6.0.7"