Skip to content

Commit

Permalink
chore: replace built-in dimension panel and dialog components with d2…
Browse files Browse the repository at this point in the history
…-ui-analytics shared components (#260)

This commit replaces the built-in DimensionsPanel and Dimension dialogs with those from the d2-ui-analytics shared library. The shared components are also used by Dashboards-app.

Some changes regarding saving to metadata store were needed: 
* This is to avoid having unnecessary data that bloats the store and
also have the same data structure for all the items.
* Reduced also the number of calls to the addMetadata action by passing
multiple keys instead of one at a time.
  • Loading branch information
edoardo authored and jenniferarnesen committed Apr 26, 2019
1 parent 96ca1c0 commit b520a65
Show file tree
Hide file tree
Showing 67 changed files with 509 additions and 3,335 deletions.
36 changes: 9 additions & 27 deletions packages/app/i18n/en.pot
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"POT-Creation-Date: 2019-04-10T14:05:52.758Z\n"
"PO-Revision-Date: 2019-04-10T14:05:52.758Z\n"
"POT-Creation-Date: 2019-04-18T12:38:17.377Z\n"
"PO-Revision-Date: 2019-04-18T12:38:17.377Z\n"

msgid "Rename successful"
msgstr ""
Expand Down Expand Up @@ -37,33 +37,12 @@ msgstr ""
msgid "Update"
msgstr ""

msgid "Data"
msgstr ""

msgid "Data Type"
msgstr ""

msgid "Detail"
msgstr ""

msgid "Search"
msgstr ""

msgid "Organisation units"
msgstr ""

msgid "Period"
msgstr ""

msgid "Search dimensions"
msgid "Hide"
msgstr ""

msgid "Remove"
msgstr ""

msgid "Dimension recommended with selected data"
msgstr ""

msgid "Download"
msgstr ""

Expand Down Expand Up @@ -109,9 +88,6 @@ msgstr ""
msgid "The following information may be requested by technical support."
msgstr ""

msgid "Hide"
msgstr ""

msgid "Interpretations"
msgstr ""

Expand Down Expand Up @@ -289,6 +265,9 @@ msgstr ""
msgid "Chart title"
msgstr ""

msgid "Data"
msgstr ""

msgid "Axis & legend"
msgstr ""

Expand Down Expand Up @@ -394,6 +373,9 @@ msgstr ""
msgid "Program indicators"
msgstr ""

msgid "Period"
msgstr ""

msgid "Organisation Unit"
msgstr ""

Expand Down
7 changes: 2 additions & 5 deletions packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,10 @@
},
"dependencies": {
"@dhis2/d2-i18n": "^1.0.3",
"@dhis2/d2-ui-analytics": "^0.0.12",
"@dhis2/d2-ui-analytics": "^1.0.1",
"@dhis2/d2-ui-core": "5.3.8",
"@dhis2/d2-ui-file-menu": "5.2.11",
"@dhis2/d2-ui-file-menu": "5.3.9",
"@dhis2/d2-ui-interpretations": "5.2.10",
"@dhis2/d2-ui-org-unit-dialog": "5.1.3",
"@dhis2/d2-ui-period-selector-dialog": "5.1.3",
"@dhis2/ui": "^1.0.0-beta.11",
"@material-ui/core": "^3.1.2",
"@material-ui/icons": "^3.0.1",
Expand Down Expand Up @@ -72,7 +70,6 @@
"prop-types": "^15.6.1",
"raf": "3.4.0",
"react": "^16.6.0",
"react-beautiful-dnd": "^10.0.4",
"react-dev-utils": "^5.0.2",
"react-dom": "^16.6.0",
"react-redux": "^5.1.0",
Expand Down
Loading

0 comments on commit b520a65

Please sign in to comment.