Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support new dashboard plugin architecture #3232

Closed
wants to merge 33 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
2131fe0
refactor: use shared dashboard plugin wrapper
edoardo Jun 3, 2024
0d776a5
chore: bump cli-app-scripts and app-runtime dependencies
edoardo Jun 3, 2024
dc26888
chore: use analytics build from d2-ci for testing
edoardo Jul 3, 2024
1a39155
chore: fix dependencies
edoardo Jul 11, 2024
7edef35
chore: run prettier
edoardo Jul 11, 2024
258354c
chore: use latest cli-app-scripts and app-runtime
edoardo Aug 2, 2024
56d3e52
chore: remove old webpack patch
edoardo Aug 7, 2024
2c9733f
chore: update patch for webpack
edoardo Aug 7, 2024
38ecc59
fix: indicate the plugin is for dashboard
edoardo Aug 13, 2024
c80a6ec
Merge remote-tracking branch 'origin/master' into refactor/use-platfo…
edoardo Aug 16, 2024
23591d2
fix: use uppercase for pluginType value
edoardo Aug 16, 2024
0eb0ab7
fix: disable translucent cover, remove unnecessary style
edoardo Aug 19, 2024
4fece4a
Merge remote-tracking branch 'origin/master' into refactor/use-platfo…
edoardo Aug 19, 2024
e904f3b
Merge remote-tracking branch 'origin/master' into refactor/use-platfo…
edoardo Oct 10, 2024
a3eb864
Merge remote-tracking branch 'origin/master' into refactor/use-platfo…
edoardo Oct 30, 2024
f38b20c
chore: use latest analytics build for testing
edoardo Oct 30, 2024
8e8f12b
Merge remote-tracking branch 'origin/master' into refactor/use-platfo…
edoardo Nov 11, 2024
381d4d2
chore: use latest analytics build for testing
edoardo Nov 15, 2024
3487a16
Merge remote-tracking branch 'origin/master' into refactor/use-platfo…
edoardo Nov 15, 2024
64147ae
refactor: remove unnecessary storing of props in local state
edoardo Nov 18, 2024
49fdcd5
Merge branch 'master' into refactor/use-platform-plugin-components
edoardo Nov 18, 2024
78ea2ac
Merge remote-tracking branch 'origin/master' into refactor/use-platfo…
edoardo Dec 4, 2024
5473c4c
Merge branch 'master' into refactor/use-platform-plugin-components
edoardo Dec 6, 2024
b5a8e35
Merge remote-tracking branch 'origin/master' into refactor/use-platfo…
edoardo Dec 11, 2024
1123096
chore: use latest analytics build for testing
edoardo Dec 11, 2024
f7a8eab
chore: update ui dependency
edoardo Dec 16, 2024
197fd7f
chore: use latest analytics build for testing
edoardo Dec 16, 2024
2169a92
chore: upgrade app-runtime and cli-app-scripts
jenniferarnesen Jan 27, 2025
d87e103
chore: remove krakenjs/post-robot
jenniferarnesen Jan 27, 2025
422c366
chore: lock webpack to version with working patch
jenniferarnesen Jan 28, 2025
95992bb
chore: yarn dedupe
jenniferarnesen Jan 28, 2025
0d7b99d
Merge branch 'master' into refactor/use-platform-plugin-components
jenniferarnesen Jan 28, 2025
a9368de
chore: set final test version name
jenniferarnesen Jan 29, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/master' into refactor/use-platfo…
…rm-plugin-components
edoardo committed Oct 10, 2024
commit e904f3bf36c2da65c9b934260671d898aadd50ee
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@
"start-server-and-test": "^2.0.3"
},
"dependencies": {
"@dhis2/analytics": "git+https://github.com/d2-ci/analytics.git#aeb044f99c37f435a707c1d6369f1aa8c032a0ad",
"@dhis2/analytics": "git+https://github.com/d2-ci/analytics.git#c1762b7776ae0a0a37872351dabee6545a3da980",
"@dhis2/app-runtime": "^3.10.6",
"@dhis2/app-runtime-adapter-d2": "^1.1.0",
"@dhis2/app-service-datastore": "^1.0.0-beta.3",
59 changes: 35 additions & 24 deletions yarn.lock
Original file line number Diff line number Diff line change
@@ -2118,9 +2118,9 @@
classnames "^2.3.1"
prop-types "^15.7.2"

"@dhis2/analytics@git+https://github.com/d2-ci/analytics.git#aeb044f99c37f435a707c1d6369f1aa8c032a0ad":
version "26.7.6"
resolved "git+https://github.com/d2-ci/analytics.git#aeb044f99c37f435a707c1d6369f1aa8c032a0ad"
"@dhis2/analytics@git+https://github.com/d2-ci/analytics.git#c1762b7776ae0a0a37872351dabee6545a3da980":
version "26.8.6"
resolved "git+https://github.com/d2-ci/analytics.git#c1762b7776ae0a0a37872351dabee6545a3da980"
dependencies:
"@dhis2/multi-calendar-dates" "^1.2.2"
"@dnd-kit/core" "^6.0.7"
@@ -5668,7 +5668,7 @@ braces@^2.3.1:
split-string "^3.0.2"
to-regex "^3.0.1"

braces@^3.0.3, braces@~3.0.2:
braces@^3.0.2, braces@^3.0.3, braces@~3.0.2:
version "3.0.3"
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
@@ -8017,7 +8017,20 @@ electron-to-chromium@^1.5.4:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.4.tgz#cd477c830dd6fca41fbd5465c1ff6ce08ac22343"
integrity sha512-orzA81VqLyIGUEA77YkVA1D+N+nNfl2isJVjjmOyrlxuooZ19ynb+dOlaDTqd/idKRS9lDCSBmtzM+kyCsMnkA==

elliptic@^6.5.3, elliptic@^6.5.5:
elliptic@^6.5.3:
version "6.5.7"
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.7.tgz#8ec4da2cb2939926a1b9a73619d768207e647c8b"
integrity sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==
dependencies:
bn.js "^4.11.9"
brorand "^1.1.0"
hash.js "^1.0.0"
hmac-drbg "^1.0.1"
inherits "^2.0.4"
minimalistic-assert "^1.0.1"
minimalistic-crypto-utils "^1.0.1"

elliptic@^6.5.5:
version "6.5.6"
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.6.tgz#ee5f7c3a00b98a2144ac84d67d01f04d438fa53e"
integrity sha512-mpzdtpeCLuS3BmE3pO3Cpp5bbjlOPY2Q0PgoF+Od1XZrHLYI28Xe3ossCmYCQt11FQKEYd9+PF8jymTvtWJSHQ==
@@ -8235,7 +8248,7 @@ error-stack-parser@^2.0.6:
dependencies:
stackframe "^1.3.4"

es-abstract@^1.17.2, es-abstract@^1.17.5, es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.1, es-abstract@^1.23.2, es-abstract@^1.23.3:
es-abstract@^1.17.2, es-abstract@^1.17.5, es-abstract@^1.19.0, es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.1, es-abstract@^1.23.2, es-abstract@^1.23.3:
version "1.23.3"
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0"
integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==
@@ -9336,7 +9349,12 @@ flush-write-stream@^1.0.2:
inherits "^2.0.3"
readable-stream "^2.3.6"

follow-redirects@^1.0.0, follow-redirects@^1.14.7, follow-redirects@^1.15.6:
follow-redirects@^1.0.0, follow-redirects@^1.14.7:
version "1.15.9"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1"
integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==

follow-redirects@^1.15.6:
version "1.15.6"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
@@ -9556,7 +9574,7 @@ functional-red-black-tree@^1.0.1:
resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==

functions-have-names@^1.2.3:
functions-have-names@^1.2.2, functions-have-names@^1.2.3:
version "1.2.3"
resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
@@ -14440,10 +14458,10 @@ path-scurry@^1.11.1:
lru-cache "^10.2.0"
minipass "^5.0.0 || ^6.0.2 || ^7.0.0"

[email protected].7:
version "0.1.7"
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==
[email protected].10:
version "0.1.10"
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.10.tgz#67e9108c5c0551b9e5326064387de4763c4d5f8b"
integrity sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==

path-type@^4.0.0:
version "4.0.0"
@@ -15414,14 +15432,7 @@ qrcode-terminal@^0.12.0:
resolved "https://registry.yarnpkg.com/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz#bb5b699ef7f9f0505092a3748be4464fe71b5819"
integrity sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ==

[email protected]:
version "6.13.0"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906"
integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==
dependencies:
side-channel "^1.0.6"

qs@^6.12.3:
[email protected], qs@^6.12.3:
version "6.13.0"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906"
integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==
@@ -16660,10 +16671,10 @@ semver@^7.5.3, semver@^7.5.4:
resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==

send@0.18.0:
version "0.18.0"
resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
send@0.19.0:
version "0.19.0"
resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8"
integrity sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==
dependencies:
debug "2.6.9"
depd "2.0.0"
You are viewing a condensed version of this merge commit. You can view the full changes here.