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

packages/app/i18n/en.pot

@@ -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-20T20:35:32.765Z\n"
-"PO-Revision-Date: 2019-11-20T20:35:32.765Z\n"
+"POT-Creation-Date: 2019-11-21T07:25:38.180Z\n"
+"PO-Revision-Date: 2019-11-21T07:25:38.180Z\n"
 
 msgid "Rename successful"
 msgstr ""
@@ -98,7 +98,7 @@ msgstr ""
 msgid "Interpretations"
 msgstr ""
 
-msgid "{{dimensionName}} is locked to {{axisDisplayName}} for {{visTypeName}}"
+msgid "{{dimensionName}} is locked to {{axisName}} for {{visTypeName}}"
 msgstr ""
 
 msgid "{{total}} of {{maxNumberOfItemsPerAxis}} selected"

packages/app/package.json

@@ -25,7 +25,7 @@
         "webpack-bundle-analyzer": "^3.0.3"
     },
     "dependencies": {
-        "@dhis2/analytics": "^2.6.8",
+        "@dhis2/analytics": "^2.6.9",
         "@dhis2/d2-i18n": "^1.0.6",
         "@dhis2/d2-ui-core": "^6.2.1",
         "@dhis2/d2-ui-file-menu": "^6.2.1",

packages/app/src/components/DimensionsPanel/DimensionsPanel.js

@@ -3,8 +3,8 @@ import { connect } from 'react-redux';
 import {
     DimensionsPanel,
     DimensionMenu,
-    getDisallowedDims,
-    getLockedDims,
+    getDisallowedDimensions,
+    getLockedDimensions,
 } from '@dhis2/analytics';
 
 import DialogManager from './Dialogs/DialogManager';
@@ -51,11 +51,11 @@ export class Dimensions extends Component {
         setDataTransfer(e, SOURCE_DIMENSIONS);
     };
 
-    disabledDimension = dimension =>
-        this.props.disallowedDimensions.includes(dimension.id);
+    disabledDimension = dimensionId =>
+        this.props.disallowedDimensions.includes(dimensionId);
 
-    lockedDimension = dimension =>
-        this.props.lockedDimensions.includes(dimension.id);
+    lockedDimension = dimensionId =>
+        this.props.lockedDimensions.includes(dimensionId);
 
     getUiAxisId = () => {
         const adaptedUi = getAdaptedUiByType(this.props.ui);
@@ -75,8 +75,8 @@ export class Dimensions extends Component {
                     selectedIds={this.props.selectedIds}
                     disabledDimension={this.disabledDimension}
                     lockedDimension={this.lockedDimension}
-                    recommendedDimension={dimension =>
-                        this.props.recommendedIds.includes(dimension.id)
+                    recommendedDimension={dimensionId =>
+                        this.props.recommendedIds.includes(dimensionId)
                     }
                     onDimensionOptionsClick={this.onDimensionOptionsClick}
                     onDimensionDragStart={this.onDimensionDragStart}
@@ -101,14 +101,14 @@ export class Dimensions extends Component {
     }
 }
 
-const getDisallowedDimensions = createSelector(
+const getDisallowedDimensionsMemo = createSelector(
     [sGetUiType],
-    type => getDisallowedDims(type)
+    type => getDisallowedDimensions(type)
 );
 
-const getLockedDimensions = createSelector(
+const getLockedDimensionsMemo = createSelector(
     [sGetUiType],
-    type => getLockedDims(type)
+    type => getLockedDimensions(type)
 );
 
 const mapStateToProps = state => {
@@ -121,8 +121,8 @@ const mapStateToProps = state => {
         ),
         layout: fromReducers.fromUi.sGetUiLayout(state),
         itemsByDimension: fromReducers.fromUi.sGetUiItems(state),
-        disallowedDimensions: getDisallowedDimensions(state),
-        lockedDimensions: getLockedDimensions(state),
+        disallowedDimensions: getDisallowedDimensionsMemo(state),
+        lockedDimensions: getLockedDimensionsMemo(state),
     };
 };
 

packages/plugin/package.json

@@ -5,7 +5,7 @@
     "main": "./build/index.js",
     "license": "BSD-3-Clause",
     "dependencies": {
-        "@dhis2/analytics": "^2.6.8",
+        "@dhis2/analytics": "^2.6.9",
         "@material-ui/core": "^3.1.2",
         "lodash-es": "^4.17.11",
         "react": "^16.6.0",

yarn.lock

@@ -183,10 +183,10 @@
     react-beautiful-dnd "^10.1.1"
     styled-jsx "^3.2.1"
 
-"@dhis2/analytics@^2.6.8":
-  version "2.6.8"
-  resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-2.6.8.tgz#5460b1001f3c50b683e05f1abb1756460c48ee29"
-  integrity sha512-EqEPP9RWoMircuQfj10EFmMFJwO4Z/FEzM+LvmDbdbxVqFR7hRGMpnFBad4fcQeqforBy7yCxaxnTuGRe91i6Q==
+"@dhis2/analytics@^2.6.9":
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-2.6.9.tgz#70b37d37f066a5b0611bda061b4104fb83503eae"
+  integrity sha512-vkgEhfqtznW4lzyoy++VYC974wZ/wbygJ4BOrjjpGxAjtQdXiQiR9aZqaJn4SstRuDS2i1ULsW7PMxEIidHN9g==
   dependencies:
     "@dhis2/d2-i18n" "^1.0.4"
     "@dhis2/d2-ui-org-unit-dialog" "^6.3.0"