refactor: port plugin and app to app-platform #327

amcgee · 2019-10-03T15:08:38Z

This ports the data-visualizer app and plugin to use the app platform. It gives us a much cleaner package.json and quite a few deleted (unnecessary) files. The application initialization pieces are also simpler.

~~Two features in app-platform are currently blocking this port:~~

We don't support named imports from cjs modules in rollup yet, this will be required (the alternative would be to modify a ton of import statements in the codebase here, which is also possible) - see Named imports from CJS modules with * re-exports are failing app-platform#69
We don't currently support import x from 'y.png' static asset imports yet. There's only one case of this in data-visualizer, but it would be good to support image loading as a first-class platform feature.

Feel free to take a gander or dig in to help!

* chore: remove references to chart, use visualization instead Now that the visualization can be also a pivot table, we should not use chart when referring to the visualization. * feat: add pivot table as possible visualization type Make it the default one too (at least for now), since the AO does not have the "type" property yet, otherwise the default (previously COLUMN) would be used as type also for reportTable AOs. * feat: allow for loading of reportTable AOs Instead of always pass "chart" in the File Menu, change to "reportTable" when Pivot table is selected as visualization type. This does not always currently work due to FileMenu not refreshing the file list (it needs to be fixed in FileMenu component). The "apiObjectName" passed around is not computed from the visualization type, instead of just being set to "chart". * feat: load a different plugin for PIVOT_TABLE vis type (Currently the pivot plugin is a copy of the chart one). * chore: regenerate pot file * fix: fix failing tests

packages/app/src/D2Shim.js

@dhis2-bot

commit a3dbb9f Author: Jan Henrik Øverland <jan@dhis2.org> Date: Mon Nov 11 14:46:30 2019 +0100 feat: use layout rules for add-to-layout ui (#362) * feat: generate add to layout button/menu based on rules * feat: refactor logic to use rules * upgrade @dhis2/analytics dep * tmp fix add to button tests * TODO fix tests * remove comment * replace local fn with analytics fn * todo: tmp commented out tests * remove folder commit d6ba4a3 Author: Jan Henrik Øverland <jan@dhis2.org> Date: Mon Nov 11 14:09:50 2019 +0100 refactor: use dimension menu from @dhis2/analytics (#364) * refactor: Use DimensionMenu and rules logic from @dhis2/analytics for all occurrences of such duplicated menus * refactor: upgraded @dhis2/analytics to v2.5.1 commit 204fe7a Author: Jan Henrik Overland <janhenrik.overland@gmail.com> Date: Tue Nov 5 14:02:06 2019 +0100 fix: use axisName instead of axisKey commit dd8b563 Author: Martin <martin@moid.se> Date: Tue Nov 5 11:22:22 2019 +0100 updated analytics repo (#363) commit 8c0ed13 Author: Martin <martin@moid.se> Date: Tue Nov 5 11:20:18 2019 +0100 fix: changed height to min-height for the axes area (#361) commit 74edb3c Author: Viktor Varland <viktor@dhis2.org> Date: Thu Oct 24 19:39:35 2019 +0200 chore(deps): upgrade d2-i18n(-generate) deps (master) (#359) * chore(deps): upgrade d2-i18n(-generate) deps (master) * chore(deps): update i18n for packages commit 4bcb913 Author: @dhis2-bot <apps@dhis2.org> Date: Thu Oct 24 12:22:35 2019 +0200 chore(translations): sync Russian translations from transifex (master) Automatically merged to resolve the avalance commit 2941ee9 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:02:24 2019 +0200 chore(translations): sync Arabic translations from transifex (master) Automatically merged to resolve the avalance commit 6067063 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:02:21 2019 +0200 chore(translations): sync Danish translations from transifex (master) Automatically merged to resolve the avalance commit 5f8ec50 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:02:19 2019 +0200 chore(translations): sync Spanish translations from transifex (master) Automatically merged to resolve the avalance commit ee07b7b Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:02:16 2019 +0200 chore(translations): sync PersianAfghanistan translations from transifex (master) Automatically merged to resolve the avalance commit 3e5ab95 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:02:14 2019 +0200 chore(translations): sync French translations from transifex (master) Automatically merged to resolve the avalance commit 754984e Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:02:11 2019 +0200 chore(translations): sync Indonesian translations from transifex (master) Automatically merged to resolve the avalance commit b0c23c8 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:02:07 2019 +0200 chore(translations): sync Lao translations from transifex (master) Automatically merged to resolve the avalance commit e1531d0 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:02:01 2019 +0200 chore(translations): sync Burmese translations from transifex (master) Automatically merged to resolve the avalance commit 9af084b Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:58 2019 +0200 chore(translations): sync Pushto translations from transifex (master) Automatically merged to resolve the avalance commit 21f72cb Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:56 2019 +0200 chore(translations): sync Portuguese translations from transifex (master) Automatically merged to resolve the avalance commit e0d1207 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:53 2019 +0200 chore(translations): sync PortugueseBrazil translations from transifex (master) Automatically merged to resolve the avalance commit a9c2ace Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:51 2019 +0200 chore(translations): sync Swedish translations from transifex (master) Automatically merged to resolve the avalance commit 8e8e467 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:49 2019 +0200 chore(translations): sync TetumTetun translations from transifex (master) Automatically merged to resolve the avalance commit cdce03b Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:46 2019 +0200 chore(translations): sync Tajik translations from transifex (master) Automatically merged to resolve the avalance commit a63b9ec Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:44 2019 +0200 chore(translations): sync Ukrainian translations from transifex (master) Automatically merged to resolve the avalance commit c37f5a2 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:42 2019 +0200 chore(translations): sync Urdu translations from transifex (master) Automatically merged to resolve the avalance commit bbc8ebf Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:39 2019 +0200 chore(translations): sync Vietnamese translations from transifex (master) Automatically merged to resolve the avalance commit 8c5b0c7 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:36 2019 +0200 chore(translations): sync Chinese translations from transifex (master) Automatically merged to resolve the avalance

@dhis2-bot

commit 7fa8693 Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:31:29 2019 +0100 chore(translations): sync Arabic translations from transifex (master) Automatically merged to resolve the avalance commit c3c5753 Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:31:27 2019 +0100 chore(translations): sync Spanish translations from transifex (master) Automatically merged to resolve the avalance commit 84e30cf Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:31:25 2019 +0100 chore(translations): sync PersianAfghanistan translations from transifex (master) Automatically merged to resolve the avalance commit 613e818 Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:31:22 2019 +0100 chore(translations): sync French translations from transifex (master) Automatically merged to resolve the avalance commit f0a73e7 Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:31:19 2019 +0100 chore(translations): sync Lao translations from transifex (master) Automatically merged to resolve the avalance commit a251cc0 Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:31:16 2019 +0100 chore(translations): sync Burmese translations from transifex (master) Automatically merged to resolve the avalance commit a9d70dd Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:31:13 2019 +0100 chore(translations): sync Pushto translations from transifex (master) Automatically merged to resolve the avalance commit bf94c6d Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:31:11 2019 +0100 chore(translations): sync Portuguese translations from transifex (master) Automatically merged to resolve the avalance commit 41c2f38 Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:31:09 2019 +0100 chore(translations): sync PortugueseBrazil translations from transifex (master) Automatically merged to resolve the avalance commit 782e55a Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:31:06 2019 +0100 chore(translations): sync Russian translations from transifex (master) Automatically merged to resolve the avalance commit c6d5f76 Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:31:03 2019 +0100 chore(translations): sync Swedish translations from transifex (master) Automatically merged to resolve the avalance commit 3ed9dcb Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:31:00 2019 +0100 chore(translations): sync TetumTetun translations from transifex (master) Automatically merged to resolve the avalance commit 6b76689 Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:30:56 2019 +0100 chore(translations): sync Tajik translations from transifex (master) Automatically merged to resolve the avalance commit f95ef04 Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:30:54 2019 +0100 chore(translations): sync Ukrainian translations from transifex (master) Automatically merged to resolve the avalance commit ecbf268 Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:30:51 2019 +0100 chore(translations): sync Vietnamese translations from transifex (master) Automatically merged to resolve the avalance commit e6c7fa6 Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:13:48 2019 +0100 chore(translations): sync Chinese translations from transifex (master) Automatically merged to resolve the avalance commit c96ac09 Author: Martin <martin@moid.se> Date: Fri Nov 15 14:11:55 2019 +0100 fix: changed incorrect prop types and tests (#372) * fix: changed incorrect prop types and tests * fix: upgraded to Analytics v2.6.2 commit 22c36e2 Author: Martin <martin@moid.se> Date: Fri Nov 15 13:06:07 2019 +0100 fix: map is not vis type (#371) * fix: extracted map from vis type to a static item * fix: renamed chart to vis * refactor: removed legacy native type to use only vis type instead * fix: issue with 'selected' prop * fix: added missing comment from Analytics * fix: added prop types * fix: added more prop types * fix: removed unnecessary prop type commit 91847d2 Author: Martin <martin@moid.se> Date: Thu Nov 14 15:57:02 2019 +0100 Fix: Implement disallowed dims from Analytics UI rules (#370) * fix: using Analytics to calculate disallowed dimensions * fix: Analytics v2.6.0 commit 26d12c6 Author: Martin <martin@moid.se> Date: Thu Nov 14 11:30:20 2019 +0100 fix: use shared vis types (#368) * use vis types from analytics * upgrades to and depends on @dhis2/analytics to v2.5.2 * implemented layout rules for the "add to layout" button commit a3dbb9f Author: Jan Henrik Øverland <jan@dhis2.org> Date: Mon Nov 11 14:46:30 2019 +0100 feat: use layout rules for add-to-layout ui (#362) * feat: generate add to layout button/menu based on rules * feat: refactor logic to use rules * upgrade @dhis2/analytics dep * tmp fix add to button tests * TODO fix tests * remove comment * replace local fn with analytics fn * todo: tmp commented out tests * remove folder commit d6ba4a3 Author: Jan Henrik Øverland <jan@dhis2.org> Date: Mon Nov 11 14:09:50 2019 +0100 refactor: use dimension menu from @dhis2/analytics (#364) * refactor: Use DimensionMenu and rules logic from @dhis2/analytics for all occurrences of such duplicated menus * refactor: upgraded @dhis2/analytics to v2.5.1 commit 204fe7a Author: Jan Henrik Overland <janhenrik.overland@gmail.com> Date: Tue Nov 5 14:02:06 2019 +0100 fix: use axisName instead of axisKey commit dd8b563 Author: Martin <martin@moid.se> Date: Tue Nov 5 11:22:22 2019 +0100 updated analytics repo (#363) commit 8c0ed13 Author: Martin <martin@moid.se> Date: Tue Nov 5 11:20:18 2019 +0100 fix: changed height to min-height for the axes area (#361) commit 74edb3c Author: Viktor Varland <viktor@dhis2.org> Date: Thu Oct 24 19:39:35 2019 +0200 chore(deps): upgrade d2-i18n(-generate) deps (master) (#359) * chore(deps): upgrade d2-i18n(-generate) deps (master) * chore(deps): update i18n for packages commit 4bcb913 Author: @dhis2-bot <apps@dhis2.org> Date: Thu Oct 24 12:22:35 2019 +0200 chore(translations): sync Russian translations from transifex (master) Automatically merged to resolve the avalance commit 2941ee9 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:02:24 2019 +0200 chore(translations): sync Arabic translations from transifex (master) Automatically merged to resolve the avalance commit 6067063 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:02:21 2019 +0200 chore(translations): sync Danish translations from transifex (master) Automatically merged to resolve the avalance commit 5f8ec50 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:02:19 2019 +0200 chore(translations): sync Spanish translations from transifex (master) Automatically merged to resolve the avalance commit ee07b7b Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:02:16 2019 +0200 chore(translations): sync PersianAfghanistan translations from transifex (master) Automatically merged to resolve the avalance commit 3e5ab95 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:02:14 2019 +0200 chore(translations): sync French translations from transifex (master) Automatically merged to resolve the avalance commit 754984e Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:02:11 2019 +0200 chore(translations): sync Indonesian translations from transifex (master) Automatically merged to resolve the avalance commit b0c23c8 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:02:07 2019 +0200 chore(translations): sync Lao translations from transifex (master) Automatically merged to resolve the avalance commit e1531d0 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:02:01 2019 +0200 chore(translations): sync Burmese translations from transifex (master) Automatically merged to resolve the avalance commit 9af084b Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:58 2019 +0200 chore(translations): sync Pushto translations from transifex (master) Automatically merged to resolve the avalance commit 21f72cb Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:56 2019 +0200 chore(translations): sync Portuguese translations from transifex (master) Automatically merged to resolve the avalance commit e0d1207 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:53 2019 +0200 chore(translations): sync PortugueseBrazil translations from transifex (master) Automatically merged to resolve the avalance commit a9c2ace Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:51 2019 +0200 chore(translations): sync Swedish translations from transifex (master) Automatically merged to resolve the avalance commit 8e8e467 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:49 2019 +0200 chore(translations): sync TetumTetun translations from transifex (master) Automatically merged to resolve the avalance commit cdce03b Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:46 2019 +0200 chore(translations): sync Tajik translations from transifex (master) Automatically merged to resolve the avalance commit a63b9ec Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:44 2019 +0200 chore(translations): sync Ukrainian translations from transifex (master) Automatically merged to resolve the avalance commit c37f5a2 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:42 2019 +0200 chore(translations): sync Urdu translations from transifex (master) Automatically merged to resolve the avalance commit bbc8ebf Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:39 2019 +0200 chore(translations): sync Vietnamese translations from transifex (master) Automatically merged to resolve the avalance commit 8c5b0c7 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:36 2019 +0200 chore(translations): sync Chinese translations from transifex (master) Automatically merged to resolve the avalance

@dhis2-bot

commit 26a95e8 Author: Martin <martin@moid.se> Date: Thu Nov 21 10:25:25 2019 +0100 fix: added icons to tooltip for warning and locked (#447) * added icons for warning and locked to dimension tooltip commit 445f1d8 Author: Martin <martin@moid.se> Date: Thu Nov 21 10:13:48 2019 +0100 fix: rules dim handling (#446) * fix: passing dimension id instead of whole dimension object * fix: updated imports to follow latest Analytics signature * fix: Updated Analytics dep to v2.6.9 commit b75967a Author: Jan Henrik Øverland <jan@dhis2.org> Date: Thu Nov 21 08:14:04 2019 +0100 fix: rename axis name constants (#445) * fix: rename axis name to axis id * fix: rename axis display name to axis name * fix: Updated Analytics dep to v2.6.8 commit 883304f Author: Jan Henrik Øverland <jan@dhis2.org> Date: Wed Nov 20 16:52:43 2019 +0100 fix: use locked dimensions rule from analytics (#444) * fix: use locked dimensions rule from Analytics in chip * fix: show locked in tooltip * fix: use axis constants * fix: Updated Analytics dep to v2.6.6 commit ded0ee9 Author: Martin <martin@moid.se> Date: Wed Nov 20 10:09:54 2019 +0100 fix: use max items rule (#373) * feat: use max items rule * fix: use layout rules in DialogManager * fix: use rules logic for single value items * fix: Updated Analytics dep to v2.6.5 commit 7fa8693 Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:31:29 2019 +0100 chore(translations): sync Arabic translations from transifex (master) Automatically merged to resolve the avalance commit c3c5753 Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:31:27 2019 +0100 chore(translations): sync Spanish translations from transifex (master) Automatically merged to resolve the avalance commit 84e30cf Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:31:25 2019 +0100 chore(translations): sync PersianAfghanistan translations from transifex (master) Automatically merged to resolve the avalance commit 613e818 Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:31:22 2019 +0100 chore(translations): sync French translations from transifex (master) Automatically merged to resolve the avalance commit f0a73e7 Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:31:19 2019 +0100 chore(translations): sync Lao translations from transifex (master) Automatically merged to resolve the avalance commit a251cc0 Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:31:16 2019 +0100 chore(translations): sync Burmese translations from transifex (master) Automatically merged to resolve the avalance commit a9d70dd Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:31:13 2019 +0100 chore(translations): sync Pushto translations from transifex (master) Automatically merged to resolve the avalance commit bf94c6d Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:31:11 2019 +0100 chore(translations): sync Portuguese translations from transifex (master) Automatically merged to resolve the avalance commit 41c2f38 Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:31:09 2019 +0100 chore(translations): sync PortugueseBrazil translations from transifex (master) Automatically merged to resolve the avalance commit 782e55a Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:31:06 2019 +0100 chore(translations): sync Russian translations from transifex (master) Automatically merged to resolve the avalance commit c6d5f76 Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:31:03 2019 +0100 chore(translations): sync Swedish translations from transifex (master) Automatically merged to resolve the avalance commit 3ed9dcb Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:31:00 2019 +0100 chore(translations): sync TetumTetun translations from transifex (master) Automatically merged to resolve the avalance commit 6b76689 Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:30:56 2019 +0100 chore(translations): sync Tajik translations from transifex (master) Automatically merged to resolve the avalance commit f95ef04 Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:30:54 2019 +0100 chore(translations): sync Ukrainian translations from transifex (master) Automatically merged to resolve the avalance commit ecbf268 Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:30:51 2019 +0100 chore(translations): sync Vietnamese translations from transifex (master) Automatically merged to resolve the avalance commit e6c7fa6 Author: @dhis2-bot <apps@dhis2.org> Date: Tue Nov 19 09:13:48 2019 +0100 chore(translations): sync Chinese translations from transifex (master) Automatically merged to resolve the avalance commit c96ac09 Author: Martin <martin@moid.se> Date: Fri Nov 15 14:11:55 2019 +0100 fix: changed incorrect prop types and tests (#372) * fix: changed incorrect prop types and tests * fix: upgraded to Analytics v2.6.2 commit 22c36e2 Author: Martin <martin@moid.se> Date: Fri Nov 15 13:06:07 2019 +0100 fix: map is not vis type (#371) * fix: extracted map from vis type to a static item * fix: renamed chart to vis * refactor: removed legacy native type to use only vis type instead * fix: issue with 'selected' prop * fix: added missing comment from Analytics * fix: added prop types * fix: added more prop types * fix: removed unnecessary prop type commit 91847d2 Author: Martin <martin@moid.se> Date: Thu Nov 14 15:57:02 2019 +0100 Fix: Implement disallowed dims from Analytics UI rules (#370) * fix: using Analytics to calculate disallowed dimensions * fix: Analytics v2.6.0 commit 26d12c6 Author: Martin <martin@moid.se> Date: Thu Nov 14 11:30:20 2019 +0100 fix: use shared vis types (#368) * use vis types from analytics * upgrades to and depends on @dhis2/analytics to v2.5.2 * implemented layout rules for the "add to layout" button commit a3dbb9f Author: Jan Henrik Øverland <jan@dhis2.org> Date: Mon Nov 11 14:46:30 2019 +0100 feat: use layout rules for add-to-layout ui (#362) * feat: generate add to layout button/menu based on rules * feat: refactor logic to use rules * upgrade @dhis2/analytics dep * tmp fix add to button tests * TODO fix tests * remove comment * replace local fn with analytics fn * todo: tmp commented out tests * remove folder commit d6ba4a3 Author: Jan Henrik Øverland <jan@dhis2.org> Date: Mon Nov 11 14:09:50 2019 +0100 refactor: use dimension menu from @dhis2/analytics (#364) * refactor: Use DimensionMenu and rules logic from @dhis2/analytics for all occurrences of such duplicated menus * refactor: upgraded @dhis2/analytics to v2.5.1 commit 204fe7a Author: Jan Henrik Overland <janhenrik.overland@gmail.com> Date: Tue Nov 5 14:02:06 2019 +0100 fix: use axisName instead of axisKey commit dd8b563 Author: Martin <martin@moid.se> Date: Tue Nov 5 11:22:22 2019 +0100 updated analytics repo (#363) commit 8c0ed13 Author: Martin <martin@moid.se> Date: Tue Nov 5 11:20:18 2019 +0100 fix: changed height to min-height for the axes area (#361) commit 74edb3c Author: Viktor Varland <viktor@dhis2.org> Date: Thu Oct 24 19:39:35 2019 +0200 chore(deps): upgrade d2-i18n(-generate) deps (master) (#359) * chore(deps): upgrade d2-i18n(-generate) deps (master) * chore(deps): update i18n for packages commit 4bcb913 Author: @dhis2-bot <apps@dhis2.org> Date: Thu Oct 24 12:22:35 2019 +0200 chore(translations): sync Russian translations from transifex (master) Automatically merged to resolve the avalance commit 2941ee9 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:02:24 2019 +0200 chore(translations): sync Arabic translations from transifex (master) Automatically merged to resolve the avalance commit 6067063 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:02:21 2019 +0200 chore(translations): sync Danish translations from transifex (master) Automatically merged to resolve the avalance commit 5f8ec50 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:02:19 2019 +0200 chore(translations): sync Spanish translations from transifex (master) Automatically merged to resolve the avalance commit ee07b7b Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:02:16 2019 +0200 chore(translations): sync PersianAfghanistan translations from transifex (master) Automatically merged to resolve the avalance commit 3e5ab95 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:02:14 2019 +0200 chore(translations): sync French translations from transifex (master) Automatically merged to resolve the avalance commit 754984e Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:02:11 2019 +0200 chore(translations): sync Indonesian translations from transifex (master) Automatically merged to resolve the avalance commit b0c23c8 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:02:07 2019 +0200 chore(translations): sync Lao translations from transifex (master) Automatically merged to resolve the avalance commit e1531d0 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:02:01 2019 +0200 chore(translations): sync Burmese translations from transifex (master) Automatically merged to resolve the avalance commit 9af084b Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:58 2019 +0200 chore(translations): sync Pushto translations from transifex (master) Automatically merged to resolve the avalance commit 21f72cb Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:56 2019 +0200 chore(translations): sync Portuguese translations from transifex (master) Automatically merged to resolve the avalance commit e0d1207 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:53 2019 +0200 chore(translations): sync PortugueseBrazil translations from transifex (master) Automatically merged to resolve the avalance commit a9c2ace Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:51 2019 +0200 chore(translations): sync Swedish translations from transifex (master) Automatically merged to resolve the avalance commit 8e8e467 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:49 2019 +0200 chore(translations): sync TetumTetun translations from transifex (master) Automatically merged to resolve the avalance commit cdce03b Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:46 2019 +0200 chore(translations): sync Tajik translations from transifex (master) Automatically merged to resolve the avalance commit a63b9ec Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:44 2019 +0200 chore(translations): sync Ukrainian translations from transifex (master) Automatically merged to resolve the avalance commit c37f5a2 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:42 2019 +0200 chore(translations): sync Urdu translations from transifex (master) Automatically merged to resolve the avalance commit bbc8ebf Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:39 2019 +0200 chore(translations): sync Vietnamese translations from transifex (master) Automatically merged to resolve the avalance commit 8c5b0c7 Author: @dhis2-bot <apps@dhis2.org> Date: Wed Oct 23 15:01:36 2019 +0200 chore(translations): sync Chinese translations from transifex (master) Automatically merged to resolve the avalance

…7687' into refactor/platform-port

amcgee · 2019-11-26T18:24:24Z

@edoardo This should be fully functional, jest and cypress tests also pass. We need to wait for dhis2/app-platform#187 to be merged before we can merge this, but for now I'm pointing at the pre-release version so everything should work locally!

…a-visualizer-app into refactor/platform-port

amcgee · 2019-11-26T20:06:25Z

NOTE: we'll need to replace or update the deploy-build script to make this work on master, it won't find the new build output (@varl)

amcgee · 2019-11-26T20:34:26Z

A standalone Netlify deployment is available here - you can test against the server https://debug.dhis2.org/dev

varl · 2019-11-27T06:35:12Z

NOTE: we'll need to replace or update the deploy-build script to make this work on master, it won't find the new build output (@varl)

Would be nice if we could deprecate the deploy-build script by moving the functionality to d2 CLI. 🤔

It would be easier to configure what build directory to upload in e.g. d2.config.js.

edoardo

LGTM.
Looking forward to merge the options branch, this should solve the problems I got after bumping react version.

packages/app/package.json

amcgee · 2019-11-27T11:25:12Z

Would be nice if we could deprecate the deploy-build script by moving the functionality to d2 CLI. 🤔

Agreed! d2 utils release --publish d2-ci should be quite possible (just need to write a d2-ci plugin for semantic-release)

amcgee · 2019-11-27T11:28:28Z

@varl actually maybe this will work with the third parameter we added - https://github.com/dhis2/usage-analytics-app/blob/master/.travis.yml#L13

… dependencies

…7687' into refactor/platform-port

Re-requesting review

amcgee · 2019-11-28T14:34:11Z

@janhenrikoverland @edoardo I had to make some functional changes to get the merge working, it looks like there were some things broken on the epic branch. Does this change and the merge commit look OK? If so feel free to approve and merge this branch to the epic branch.

janhenrikoverland · 2019-11-28T14:59:12Z

@amcgee Looks good. We should import all vis types (previously chart types) from analytics instead now, but we could refactor that properly in a separate PR.

edoardo · 2019-11-28T15:18:54Z

Yes. I agree with Jan. We can remove chartTypes from the plugin in a separate PR.

dhis2-bot · 2020-02-12T12:06:28Z

🎉 This PR is included in version 33.0.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

amcgee added 3 commits October 3, 2019 17:04

WIP: start porting plugin and app to app-platform

3e50428

chore: remove punycode peerdep

4bbb10a

chore: remove loglevel (for now)

7311167

jenniferarnesen added the WIP label Oct 15, 2019

jenniferarnesen reviewed Oct 21, 2019

View reviewed changes

packages/app/src/D2Shim.js Outdated Show resolved Hide resolved

amcgee and others added 10 commits October 22, 2019 00:57

fix: typo in baseUrl reference

c07320b

chore: add icon for PT vis type (#369)

7ca2022

fix: solve problems after merge

df7e3f5

chore: update @dhis2/analytics for PT support

fe435d5

chore: fix some things

6917e74

Merge remote-tracking branch 'origin/epic/merge-dv-and-pt-apps-DHIS2-…

e7e13a2

…7687' into refactor/platform-port

chore: set ENV and use beta app-scripts

d9cd99d

amcgee changed the base branch from master to epic/merge-dv-and-pt-apps-DHIS2-7687 November 26, 2019 17:16

chore: fix jest and cypress configs

79eea1f

amcgee requested review from edoardo and janhenrikoverland November 26, 2019 18:24

amcgee added 3 commits November 26, 2019 19:25

chore: re-add semicolon

af13673

chore: re-add image import

d67f973

Merge branch 'refactor/platform-port' of https://github.com/dhis2/dat…

1ffc601

…a-visualizer-app into refactor/platform-port

amcgee changed the title ~~WIP: start porting plugin and app to app-platform~~ WIP: port plugin and app to app-platform Nov 26, 2019

amcgee added 2 commits November 26, 2019 20:43

chore: clean up some things

01ba198

chore: add latest cli-style

4204ed4

amcgee requested a review from varl November 26, 2019 20:01

chore: update netlify.toml

aec4136

varl mentioned this pull request Nov 27, 2019

feat: remove rollup application compiler, delegate compilation to the shell dhis2/app-platform#187

Merged

6 tasks

edoardo requested a review from jenniferarnesen November 27, 2019 08:54

edoardo previously approved these changes Nov 27, 2019

View reviewed changes

packages/app/package.json Outdated Show resolved Hide resolved

chore: remove unused jest transform pattern

4b9ae3c

amcgee added 5 commits November 27, 2019 12:38

chore: update deploy-build to work with platform app

09facc6

chore: use plain yarn workspaces instead of lerna, remove unused root…

0b981d1

… dependencies

docs: update start script instructions

d987bfc

docs: update cypress instructions

0ab71fe

chore: upgrade to released app-platform

0a1c585

amcgee changed the title ~~WIP: port plugin and app to app-platform~~ chore: port plugin and app to app-platform Nov 28, 2019

amcgee changed the title ~~chore: port plugin and app to app-platform~~ refactor: port plugin and app to app-platform Nov 28, 2019

edoardo force-pushed the epic/merge-dv-and-pt-apps-DHIS2-7687 branch from ae8e741 to 15ae8a8 Compare November 28, 2019 13:58

amcgee marked this pull request as ready for review November 28, 2019 14:05

amcgee added 2 commits November 28, 2019 15:30

Merge remote-tracking branch 'origin/epic/merge-dv-and-pt-apps-DHIS2-…

cdacf50

…7687' into refactor/platform-port

fix: change bad module reference, load schemas on startup

e224251

amcgee requested a review from edoardo November 28, 2019 14:33

amcgee mentioned this pull request Nov 28, 2019

TODO: Fix app height calculation #494

Closed

edoardo approved these changes Nov 28, 2019

View reviewed changes

amcgee merged commit cb169c7 into epic/merge-dv-and-pt-apps-DHIS2-7687 Nov 28, 2019

amcgee removed the WIP label Dec 11, 2019

dhis2-bot added the released label Feb 12, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: port plugin and app to app-platform #327

refactor: port plugin and app to app-platform #327

amcgee commented Oct 3, 2019 •

edited

Loading

amcgee commented Nov 26, 2019

amcgee commented Nov 26, 2019

amcgee commented Nov 26, 2019

varl commented Nov 27, 2019

edoardo left a comment

amcgee commented Nov 27, 2019

amcgee commented Nov 27, 2019

amcgee commented Nov 28, 2019

janhenrikoverland commented Nov 28, 2019 •

edited

Loading

edoardo commented Nov 28, 2019

dhis2-bot commented Feb 12, 2020

refactor: port plugin and app to app-platform #327

refactor: port plugin and app to app-platform #327

Conversation

amcgee commented Oct 3, 2019 • edited Loading

amcgee commented Nov 26, 2019

amcgee commented Nov 26, 2019

amcgee commented Nov 26, 2019

varl commented Nov 27, 2019

edoardo left a comment

Choose a reason for hiding this comment

amcgee commented Nov 27, 2019

amcgee commented Nov 27, 2019

amcgee commented Nov 28, 2019

janhenrikoverland commented Nov 28, 2019 • edited Loading

edoardo commented Nov 28, 2019

dhis2-bot commented Feb 12, 2020

amcgee commented Oct 3, 2019 •

edited

Loading

janhenrikoverland commented Nov 28, 2019 •

edited

Loading