Skip to content

Commit

Permalink
fix: changed incorrect prop types and tests (#372)
Browse files Browse the repository at this point in the history
* fix: changed incorrect prop types and tests

* fix: upgraded to Analytics v2.6.2
  • Loading branch information
martinkrulltott committed Nov 15, 2019
1 parent 22c36e2 commit c96ac09
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 10 deletions.
7 changes: 5 additions & 2 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-11-11T14:45:11.552Z\n"
"PO-Revision-Date: 2019-11-11T14:45:11.552Z\n"
"POT-Creation-Date: 2019-11-15T12:12:19.215Z\n"
"PO-Revision-Date: 2019-11-15T12:12:19.215Z\n"

msgid "Rename successful"
msgstr ""
Expand Down Expand Up @@ -297,6 +297,9 @@ msgstr ""
msgid "Chart options"
msgstr ""

msgid "Open as Map"
msgstr ""

msgid "Reporting rate"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"webpack-bundle-analyzer": "^3.0.3"
},
"dependencies": {
"@dhis2/analytics": "^2.6.0",
"@dhis2/analytics": "^2.6.2",
"@dhis2/d2-i18n": "^1.0.6",
"@dhis2/d2-ui-core": "^6.2.1",
"@dhis2/d2-ui-file-menu": "^6.2.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,12 @@ describe('The Dimensions component ', () => {
dimensions: {},
ui: {
layout: {},
type: '',
},
itemsByDimension: {},
dualAxisItemHandler: () => {},
axisItemHandler: () => {},
removeItemHandler: () => {},
};
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const MenuItemIcon = ({ iconType, style }) => {
};

MenuItemIcon.propTypes = {
iconType: PropTypes.string.isRequired,
iconType: PropTypes.string,
style: PropTypes.object,
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ VisualizationTypeMenuItem.propTypes = {
iconType: PropTypes.string,
styles: PropTypes.object,
label: PropTypes.string,
isSelected: PropTypes.Boolean,
isSelected: PropTypes.bool,
};

export default VisualizationTypeMenuItem;
2 changes: 1 addition & 1 deletion packages/plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"main": "./build/index.js",
"license": "BSD-3-Clause",
"dependencies": {
"@dhis2/analytics": "^2.6.0",
"@dhis2/analytics": "^2.6.2",
"@material-ui/core": "^3.1.2",
"lodash-es": "^4.17.11",
"react": "^16.6.0",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -183,10 +183,10 @@
react-beautiful-dnd "^10.1.1"
styled-jsx "^3.2.1"

"@dhis2/analytics@^2.6.0":
version "2.6.0"
resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-2.6.0.tgz#81f8a37acf76ac606f27e22986665723e54587d8"
integrity sha512-aYnUXxefEeJFZNJcHULA4jwFwbHKUkjrP8qSi2UHuho6M5TJGqb1oQOPth8NuALlYtShmJcP3tG0lcABeS2lUA==
"@dhis2/analytics@^2.6.2":
version "2.6.2"
resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-2.6.2.tgz#10223103dbad456507cdc676184000c8b96b2375"
integrity sha512-9i0yXVeLeHF/p4M5giw+cL2q+tJHYSuXaIeTUWPUcDEe0/vTou3BWOqOMlLNWU+5EXoE1XnGu+1R9GI+pbpV4g==
dependencies:
"@dhis2/d2-i18n" "^1.0.4"
"@dhis2/d2-ui-org-unit-dialog" "^6.3.0"
Expand Down

0 comments on commit c96ac09

Please sign in to comment.