From 70cfaa8c9c0e5b0c4f28519b7387c4b7e0e59d5a Mon Sep 17 00:00:00 2001 From: Eduardo Peredo Rivero Date: Thu, 18 Jan 2024 12:01:27 -0500 Subject: [PATCH 1/2] update app dependencies --- package.json | 12 +++++----- yarn.lock | 66 +++++++++++++++++++++++++++++++--------------------- 2 files changed, 46 insertions(+), 32 deletions(-) diff --git a/package.json b/package.json index 321eefa..0880e0e 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@dhis2/app-runtime": "2.8.0", - "@dhis2/d2-i18n": "1.1.0", + "@dhis2/d2-i18n": "1.1.3", "@dhis2/d2-i18n-extract": "1.0.8", "@dhis2/d2-i18n-generate": "1.2.0", "@dhis2/ui": "6.12.0", @@ -22,11 +22,11 @@ "@material-ui/icons": "4.11.3", "@material-ui/lab": "4.0.0-alpha.60", "@material-ui/styles": "4.11.5", - "classnames": "2.3.1", + "classnames": "2.5.1", "d2": "31.10.2", "d2-manifest": "1.0.0", "font-awesome": "4.7.0", - "purify-ts": "1.2.0", + "purify-ts": "2.0.3", "purify-ts-extra-codec": "0.6.0", "react": "^18.2.0", "react-dom": "^18.2.0", @@ -35,7 +35,7 @@ "styled-components": "5.3.5", "styled-jsx": "3.4.5", "typed-immutable-map": "^0.1.1", - "zustand": "^4.3.7" + "zustand": "4.4.7" }, "devDependencies": { "@babel/core": "^7.0.0-0", @@ -56,7 +56,7 @@ "@vitejs/plugin-react": "^3.1.0", "@vitest/coverage-v8": "^0.32.4", "bundle-phobia-cli": "^0.14.14", - "cmd-ts": "^0.12.1", + "cmd-ts": "0.13.0", "eslint": "^8.37.0", "eslint-config-react-app": "7.1.0-next.14", "eslint-plugin-testing-library": "^5.11.1", @@ -71,7 +71,7 @@ "source-map-explorer": "^2.5.3", "ts-node": "^10.9.1", "ts-prune": "^0.10.3", - "typedoc": "^0.25.1", + "typedoc": "0.25.7", "typescript": "5.2.2", "vite": "^4.2.0", "vite-bundle-visualizer": "^0.6.0", diff --git a/yarn.lock b/yarn.lock index cbc7da5..0e5ca86 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2741,6 +2741,15 @@ i18next "^10.3" moment "^2.24.0" +"@dhis2/d2-i18n@1.1.3": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@dhis2/d2-i18n/-/d2-i18n-1.1.3.tgz#ad73030f7cfceeed1b5bcaad86a9b336130bdfb1" + integrity sha512-vOu6RDNumOJM396mHt35bETk9ai9b6XJyAwlUy1HstUZNvfET61F8rjCmMuXZU6zJ8ELux8kMFqlH8IG0vDJmA== + dependencies: + "@types/i18next" "^11.9.0" + i18next "^10.3" + moment "^2.24.0" + "@dhis2/d2-i18n@^1.0.5": version "1.1.2" resolved "https://registry.yarnpkg.com/@dhis2/d2-i18n/-/d2-i18n-1.1.2.tgz#6073df1fae5a638646272baff188e1d75ce6ae47" @@ -3903,10 +3912,10 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.13.tgz#02c24f4363176d2d18fc8b70b9f3c54aba178a85" integrity sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ== -"@types/json-schema@7.0.9": - version "7.0.9" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" - integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== +"@types/json-schema@7.0.15": + version "7.0.15" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" + integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== "@types/json5@^0.0.29": version "0.0.29" @@ -5156,6 +5165,11 @@ classnames@2.3.1: resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e" integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA== +classnames@2.5.1: + version "2.5.1" + resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.5.1.tgz#ba774c614be0f016da105c858e7159eae8e7687b" + integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow== + clean-stack@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" @@ -5274,10 +5288,10 @@ clsx@^1.0.2, clsx@^1.0.4: resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12" integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg== -cmd-ts@^0.12.1: - version "0.12.1" - resolved "https://registry.yarnpkg.com/cmd-ts/-/cmd-ts-0.12.1.tgz#5ddf69f27887e7380ce6d50a07a3850cb82ea3f7" - integrity sha512-k93f6LgFEzx7/vBy5qV+tu1VI8YuH0DZmwNXPvRaDR4Qp7Fl9+pUSylX/CKHrWoKqHMJjNOLb1NeYTvHOjQ2Kw== +cmd-ts@0.13.0: + version "0.13.0" + resolved "https://registry.yarnpkg.com/cmd-ts/-/cmd-ts-0.13.0.tgz#57bdbc5dc95eb5a3503ab3ac9591c91427a79fa1" + integrity sha512-nsnxf6wNIM/JAS7T/x/1JmbEsjH0a8tezXqqpaL0O6+eV0/aDEnRxwjxpu0VzDdRcaC1ixGSbRlUuf/IU59I4g== dependencies: chalk "^4.0.0" debug "^4.3.4" @@ -9186,12 +9200,12 @@ purify-ts-extra-codec@0.6.0: date-fns "^2.14.0" warning "^4.0.3" -purify-ts@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/purify-ts/-/purify-ts-1.2.0.tgz#103f088798c55b78b0ba49d82714f912c5d35b4c" - integrity sha512-CTiMFDCaJ9vKXOnl13sRktbb6KMYB0NuQD0LPUYfEZO5YIKcN7uxIb7maSe0Ywzcm9O8LDcz7dQK1p6ZWDCvaQ== +purify-ts@2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/purify-ts/-/purify-ts-2.0.3.tgz#c359fa9a956ad18e8334802e26af1b46c603b90f" + integrity sha512-RiPOlX4L+eggnbEdwGV34t7iRSPK5d37nKPZXSu8G5mTUhxbEjPpThRFuEV4GL/T6zEJQ+ZeiuNoBk61VJvszg== dependencies: - "@types/json-schema" "7.0.9" + "@types/json-schema" "7.0.15" qs@6.11.0: version "6.11.0" @@ -9946,10 +9960,10 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -shiki@^0.14.1: - version "0.14.4" - resolved "https://registry.yarnpkg.com/shiki/-/shiki-0.14.4.tgz#2454969b466a5f75067d0f2fa0d7426d32881b20" - integrity sha512-IXCRip2IQzKwxArNNq1S+On4KPML3Yyn8Zzs/xRgcgOWIr8ntIK3IKzjFPfjy/7kt9ZMjc+FItfqHRBg8b6tNQ== +shiki@^0.14.7: + version "0.14.7" + resolved "https://registry.yarnpkg.com/shiki/-/shiki-0.14.7.tgz#c3c9e1853e9737845f1d2ef81b31bcfb07056d4e" + integrity sha512-dNPAPrxSc87ua2sKJ3H5dQ/6ZaY8RNnaAqK+t0eG7p0Soi2ydiqbGOTaZCqaYvA/uZYfS1LJnemt3Q+mSfcPCg== dependencies: ansi-sequence-parser "^1.1.0" jsonc-parser "^3.2.0" @@ -10674,15 +10688,15 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" -typedoc@^0.25.1: - version "0.25.1" - resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.25.1.tgz#50de2d8fb93623fbfb59e2fa6407ff40e3d3f438" - integrity sha512-c2ye3YUtGIadxN2O6YwPEXgrZcvhlZ6HlhWZ8jQRNzwLPn2ylhdGqdR8HbyDRyALP8J6lmSANILCkkIdNPFxqA== +typedoc@0.25.7: + version "0.25.7" + resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.25.7.tgz#11e3f527ca80ca3c029cb8e15f362e6d9f715e25" + integrity sha512-m6A6JjQRg39p2ZVRIN3NKXgrN8vzlHhOS+r9ymUYtcUP/TIQPvWSq7YgE5ZjASfv5Vd5BW5xrir6Gm2XNNcOow== dependencies: lunr "^2.3.9" marked "^4.3.0" minimatch "^9.0.3" - shiki "^0.14.1" + shiki "^0.14.7" typescript@5.2.2: version "5.2.2" @@ -11474,9 +11488,9 @@ yocto-queue@^1.0.0: resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251" integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g== -zustand@^4.3.7: - version "4.4.1" - resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.4.1.tgz#0cd3a3e4756f21811bd956418fdc686877e8b3b0" - integrity sha512-QCPfstAS4EBiTQzlaGP1gmorkh/UL1Leaj2tdj+zZCZ/9bm0WS7sI2wnfD5lpOszFqWJ1DcPnGoY8RDL61uokw== +zustand@4.4.7: + version "4.4.7" + resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.4.7.tgz#355406be6b11ab335f59a66d2cf9815e8f24038c" + integrity sha512-QFJWJMdlETcI69paJwhSMJz7PPWjVP8Sjhclxmxmxv/RYI7ZOvR5BHX+ktH0we9gTWQMxcne8q1OY8xxz604gw== dependencies: use-sync-external-store "1.2.0" From 1347ccd9f860b1d5096ac394134c0bf421b109e5 Mon Sep 17 00:00:00 2001 From: Eduardo Peredo Rivero Date: Thu, 18 Jan 2024 12:17:21 -0500 Subject: [PATCH 2/2] update application name and typescript version --- index.html | 13 ++++++++++--- package.json | 14 +++++++------- public/manifest.json | 4 ++-- src/app-config.ts | 4 ++-- src/webapp/pages/app/App.tsx | 2 +- yarn.lock | 8 ++++---- 6 files changed, 26 insertions(+), 19 deletions(-) diff --git a/index.html b/index.html index 492d83d..dc7c453 100644 --- a/index.html +++ b/index.html @@ -4,15 +4,22 @@ - + - + - Vite + React + TS + Data Quality diff --git a/package.json b/package.json index 0880e0e..39ea047 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,13 @@ { - "name": "dhis2-app-skeleton", - "description": "DHIS2 Skeleton App", + "name": "data-quality", + "description": "Data Quality", "version": "0.0.1", "license": "GPL-3.0", "author": "EyeSeeTea team", "homepage": ".", "repository": { "type": "git", - "url": "git+https://github.com/eyeseetea/dhis2-app-skeleton.git" + "url": "git+https://github.com/EyeSeeTea/data-quality-dev" }, "dependencies": { "@dhis2/app-runtime": "2.8.0", @@ -72,7 +72,7 @@ "ts-node": "^10.9.1", "ts-prune": "^0.10.3", "typedoc": "0.25.7", - "typescript": "5.2.2", + "typescript": "5.3.3", "vite": "^4.2.0", "vite-bundle-visualizer": "^0.6.0", "vite-plugin-checker": "^0.6.2", @@ -102,14 +102,14 @@ "build": "VITE_DHIS2_BASE_URL='' VITE_DHIS2_AUTH='' yarn build-folder && rm -f $npm_package_name.zip && cd build && zip --quiet -r ../$npm_package_name.zip *", "prettify": "prettier \"./**/*.{js,jsx,json,css,ts,tsx}\" --write", "extract-pot": "yarn d2-i18n-extract -p src/ -o i18n/", - "localize": "yarn update-po && d2-i18n-generate -n dhis2-skeleton-app -p ./i18n/ -o ./src/locales/", + "localize": "yarn update-po && d2-i18n-generate -n data-quality -p ./i18n/ -o ./src/locales/", "update-po": "yarn extract-pot && find i18n/ -name '*.po' -exec msgmerge --backup=off -U {} i18n/en.pot \\;", "prepare": "husky install", "script-example": "npx ts-node src/scripts/example.ts" }, "manifest.webapp": { - "name": "DHIS2 Skeleton App", - "description": "DHIS2 Skeleton App", + "name": "Data Quality", + "description": "Data Quality", "icons": { "48": "icon.png" }, diff --git a/public/manifest.json b/public/manifest.json index e4bf3f0..3363958 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -1,6 +1,6 @@ { - "short_name": "DHIS2 Skeleton App", - "name": "DHIS2 Skeleton App", + "short_name": "Data Quality", + "name": "Data Quality", "icons": [ { "src": "favicon.ico", diff --git a/src/app-config.ts b/src/app-config.ts index 2e08350..2612e22 100644 --- a/src/app-config.ts +++ b/src/app-config.ts @@ -1,7 +1,7 @@ import { FeedbackOptions } from "@eyeseetea/feedback-component"; export const appConfig: AppConfig = { - appKey: "dhis2-app-skeleton", + appKey: "data-quality", appearance: { showShareButton: true, }, @@ -9,7 +9,7 @@ export const appConfig: AppConfig = { repositories: { clickUp: { // https://app.clickup.com/${workspace}/v/b/N-${listId}-M - // Web development -> Common resources -> app-skeleton + // Web development -> Common resources -> data-quality listId: "42597084", title: "[User feedback] {title}", body: "## dhis2\n\nUsername: {username}\n\n{body}", diff --git a/src/webapp/pages/app/App.tsx b/src/webapp/pages/app/App.tsx index a61f17c..cc32d28 100644 --- a/src/webapp/pages/app/App.tsx +++ b/src/webapp/pages/app/App.tsx @@ -43,7 +43,7 @@ function App(props: AppProps) { - + {appConfig.feedback && appContext && (