From 51860761542a6848ce7c48267b66c5f4db2866f9 Mon Sep 17 00:00:00 2001 From: HendrikThePendric Date: Wed, 24 Jan 2024 13:39:45 +0100 Subject: [PATCH 1/3] feat: add class-names for push-analytics --- src/components/DownloadMenu/GraphicsMenu.js | 1 + src/components/DownloadMenu/TableMenu.js | 1 + src/components/DownloadMenu/ToolbarDownloadDropdown.js | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/components/DownloadMenu/GraphicsMenu.js b/src/components/DownloadMenu/GraphicsMenu.js index 83537ebf52..4d0702f22d 100644 --- a/src/components/DownloadMenu/GraphicsMenu.js +++ b/src/components/DownloadMenu/GraphicsMenu.js @@ -27,6 +27,7 @@ export const GraphicsMenu = ({ hoverable, onDownload }) => { icon={} label={i18n.t('Image (.png)')} onClick={() => onDownload({ format: FILE_FORMAT_PNG })} + className="download-menuitemn" /> { onDownload({ type: DOWNLOAD_TYPE_TABLE, diff --git a/src/components/DownloadMenu/ToolbarDownloadDropdown.js b/src/components/DownloadMenu/ToolbarDownloadDropdown.js index 5dcbae0948..473465f0f0 100644 --- 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 ( - + Date: Wed, 24 Jan 2024 16:57:20 +0100 Subject: [PATCH 2/3] chore: apply consistent naming to push analytics class names --- src/components/DownloadMenu/GraphicsMenu.js | 2 +- src/components/DownloadMenu/TableMenu.js | 2 +- src/components/DownloadMenu/ToolbarDownloadDropdown.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/DownloadMenu/GraphicsMenu.js b/src/components/DownloadMenu/GraphicsMenu.js index 4d0702f22d..e765a0dda5 100644 --- a/src/components/DownloadMenu/GraphicsMenu.js +++ b/src/components/DownloadMenu/GraphicsMenu.js @@ -27,7 +27,7 @@ export const GraphicsMenu = ({ hoverable, onDownload }) => { icon={} label={i18n.t('Image (.png)')} onClick={() => onDownload({ format: FILE_FORMAT_PNG })} - className="download-menuitemn" + className="push-analytics-download-menu-item" /> { onDownload({ type: DOWNLOAD_TYPE_TABLE, diff --git a/src/components/DownloadMenu/ToolbarDownloadDropdown.js b/src/components/DownloadMenu/ToolbarDownloadDropdown.js index 473465f0f0..3f0038764a 100644 --- a/src/components/DownloadMenu/ToolbarDownloadDropdown.js +++ b/src/components/DownloadMenu/ToolbarDownloadDropdown.js @@ -11,7 +11,7 @@ const ToolbarDownloadDropdown = () => { Date: Fri, 26 Jan 2024 10:47:05 +0100 Subject: [PATCH 3/3] chore: upgrade @dhis2/analytics --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 4226931bb1..2151d1306e 100644 --- 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/yarn.lock b/yarn.lock index ac4840ccc5..bdccf01e0b 100644 --- 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"