@configuratorware/configurator-admingui 1.31.3 → 1.31.4

package/App/Reducers/Entity/Actions.js

@@ -49,12 +49,16 @@ var reportUnsavedEntity = function reportUnsavedEntity(reducerName, entityState,
 
 exports.reportUnsavedEntity = reportUnsavedEntity;
 
-var releaseUnsavedEntity = function releaseUnsavedEntity() {
+var releaseUnsavedEntity = function releaseUnsavedEntity(targetReducerName) {
   return function (dispatch, getState) {
     var state = getState();
     var entity = state.entity;
     var reducerName = entity.unsavedEntity.reducerName;
 
+    if (targetReducerName && targetReducerName !== reducerName) {
+      return;
+    }
+
     if (reducerName) {
       if (state[reducerName].showDetails) {
         dispatch({
@@ -555,7 +559,7 @@ var generateDefaultActions = function generateDefaultActions(listKey, dataKey, r
         // onDelete callback
         (0, _Helpers.dispatchDeleteData)(dispatch)(listKey, url, ids).then(function () {
           dispatch(hideDetails(false));
-          dispatch(releaseUnsavedEntity());
+          dispatch(releaseUnsavedEntity(reducerName));
           dispatch((0, _Helpers.invalidateSource)(listKey));
           dispatch(cancelDeleteEntitiesDialog());
           ctx.afterDelete && dispatch(ctx.afterDelete(ids));

package/Components/DefaultList.js

@@ -236,7 +236,7 @@ var DefaultList = /*#__PURE__*/function (_Component) {
   _createClass(DefaultList, [{
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
-      if (prevProps.selected !== this.props.selected) {
+      if (this.props.selected && !_lodash["default"].isEqual(prevProps.selected, this.props.selected)) {
         this.setState({
           selectedRows: this.props.selected
         });

package/Screens/Designer/Containers/List.js

@@ -40,7 +40,7 @@ var _default = (0, _DefaultConnectedList["default"])(columns, listParams, _Actio
 false, // skip remove entity
 {
   reducerName: _Actions.DESIGNER_REDUCER_NAME,
-  entityIdKey: 'item.value.id'
+  entityIdKey: 'id.value'
 });
 
 exports["default"] = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@configuratorware/configurator-admingui",
-  "version": "1.31.3",
+  "version": "1.31.4",
   "license": "UNLICENSED",
   "private": false,
   "dependencies": {
@@ -29,7 +29,7 @@
     "react-redux-i18n": "^1.9.3",
     "react-router": "^3.2.6",
     "react-sortable-hoc": "^1.11.0",
-    "redhotmagma-visualization": "1.31.3",
+    "redhotmagma-visualization": "1.31.4",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",

package/src/App/Reducers/Entity/Actions.js

@@ -15,10 +15,13 @@ export const reportUnsavedEntity = (reducerName, entityState, saveAndHide, hide,
     cancel,
 });
 
-export const releaseUnsavedEntity = () => (dispatch, getState) => {
+export const releaseUnsavedEntity = targetReducerName => (dispatch, getState) => {
     const state = getState();
     const { entity } = state;
     const { reducerName } = entity.unsavedEntity;
+    if (targetReducerName && targetReducerName !== reducerName) {
+        return;
+    }
     if (reducerName) {
         if (state[reducerName].showDetails) {
             dispatch({
@@ -422,7 +425,7 @@ export const generateDefaultActions = (listKey, dataKey, reducerName, url, ctx =
                     // onDelete callback
                     dispatchDeleteData(dispatch)(listKey, url, ids).then(() => {
                         dispatch(hideDetails(false));
-                        dispatch(releaseUnsavedEntity());
+                        dispatch(releaseUnsavedEntity(reducerName));
                         dispatch(invalidateSource(listKey));
                         dispatch(cancelDeleteEntitiesDialog());
                         ctx.afterDelete && dispatch(ctx.afterDelete(ids));

package/src/Components/DefaultList.js

@@ -33,7 +33,7 @@ export default class DefaultList extends Component {
     }
 
     componentDidUpdate(prevProps) {
-        if (prevProps.selected !== this.props.selected) {
+        if (this.props.selected && !_.isEqual(prevProps.selected, this.props.selected)) {
             this.setState({
                 selectedRows: this.props.selected,
             });

package/src/Screens/Designer/Containers/List.js

@@ -37,6 +37,6 @@ export default generateConnectedList(
     false, // skip remove entity
     {
         reducerName: DESIGNER_REDUCER_NAME,
-        entityIdKey: 'item.value.id',
+        entityIdKey: 'id.value',
     }
 );