@configuratorware/configurator-admingui 1.41.0 → 1.41.2

package/Screens/Designer/Components/TemplateDefaultList.js

@@ -205,13 +205,7 @@ var TemplateDefaultList = /*#__PURE__*/function (_Component) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "getAvailableItems", function () {
-      var _this$props = _this.props,
-          list = _this$props.list,
-          sourceItemId = _this$props.sourceItemId;
-      var excludedIds = [sourceItemId];
-      return _lodash["default"].get(list, 'data', []).filter(function (item) {
-        return excludedIds.indexOf(item.id) === -1;
-      });
+      return _lodash["default"].get(_this.props.list, 'data', []);
     });
 
     _defineProperty(_assertThisInitialized(_this), "onMoveItems", function () {
@@ -257,8 +251,13 @@ var TemplateDefaultList = /*#__PURE__*/function (_Component) {
       });
     });
 
+    _defineProperty(_assertThisInitialized(_this), "isItemAtIndexSource", function (index) {
+      var clickedItem = _this.props.list.data[index];
+      return clickedItem.id === _this.props.sourceItemId;
+    });
+
     _defineProperty(_assertThisInitialized(_this), "isRowSelectable", function (index) {
-      return !_this.isItemAtIndexMoved(index);
+      return !_this.isItemAtIndexMoved(index) && !_this.isItemAtIndexSource(index);
     });
 
     _defineProperty(_assertThisInitialized(_this), "getRowStyle", function (index) {
@@ -269,6 +268,13 @@ var TemplateDefaultList = /*#__PURE__*/function (_Component) {
         };
       }
 
+      if (_this.isItemAtIndexSource(index)) {
+        return {
+          cursor: 'not-allowed',
+          opacity: 0.5
+        };
+      }
+
       return {
         cursor: 'pointer'
       };
@@ -345,14 +351,14 @@ var TemplateDefaultList = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this$props2 = this.props,
-          list = _this$props2.list,
-          columns = _this$props2.columns,
-          error = _this$props2.error,
-          selected = _this$props2.selected,
-          onAddItem = _this$props2.onAddItem,
-          config = _this$props2.config,
-          List = _this$props2.List;
+      var _this$props = this.props,
+          list = _this$props.list,
+          columns = _this$props.columns,
+          error = _this$props.error,
+          selected = _this$props.selected,
+          onAddItem = _this$props.onAddItem,
+          config = _this$props.config,
+          List = _this$props.List;
       var _this$state3 = this.state,
           movedItems = _this$state3.movedItems,
           selectedItems = _this$state3.selectedItems;
@@ -376,6 +382,7 @@ var TemplateDefaultList = /*#__PURE__*/function (_Component) {
         shownColumns: shownColumns,
         rowsTotal: total,
         rowsPerPage: this.state.listParams.limit,
+        listParams: this.state.listParams,
         onRowSelection: this.onRowSelection,
         selected: selected || this.state.selectedRows,
         onAddItem: onAddItem,

package/Screens/Designer/Components/TemplateList.js

@@ -200,7 +200,8 @@ var TemplateList = /*#__PURE__*/function (_Component) {
 
           _this.props.onRowSelection(rows, event);
         },
-        selected: _this.selectedRows
+        selected: _this.selectedRows,
+        isRowSelectable: _this.props.isRowSelectable
       }, /*#__PURE__*/_react["default"].createElement(_Table.TableHead, {
         showCheckbox: showCheckboxes
       }, /*#__PURE__*/_react["default"].createElement(_Table.TableRow, null, columns.map(function (column, i) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@configuratorware/configurator-admingui",
-  "version": "1.41.0",
+  "version": "1.41.2",
   "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.41.0",
+    "redhotmagma-visualization": "1.41.2",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",

package/src/Screens/Designer/Components/TemplateDefaultList.js

@@ -174,11 +174,7 @@ export default class TemplateDefaultList extends Component {
     };
 
     getAvailableItems = () => {
-        const { list, sourceItemId } = this.props;
-
-        const excludedIds = [sourceItemId];
-
-        return _.get(list, 'data', []).filter(item => excludedIds.indexOf(item.id) === -1);
+        return _.get(this.props.list, 'data', []);
     };
 
     onMoveItems = () => {
@@ -186,7 +182,7 @@ export default class TemplateDefaultList extends Component {
         const data = this.getAvailableItems();
 
         const newItems = _.filter(data, (item, index) => {
-            return (selectedRows.indexOf(index) !== -1 || selectedRows === 'all');
+            return selectedRows.indexOf(index) !== -1 || selectedRows === 'all';
         });
 
         this.setState(
@@ -217,23 +213,32 @@ export default class TemplateDefaultList extends Component {
             }
         );
     };
-    
-    isItemAtIndexMoved= (index) => {
+
+    isItemAtIndexMoved = index => {
         const clickedItem = this.props.list.data[index];
 
         return _.find(this.state.movedItems, { id: clickedItem.id });
-    }
-    
-    isRowSelectable = (index) => {
-        return !this.isItemAtIndexMoved(index);
-    }
+    };
+
+    isItemAtIndexSource = index => {
+        const clickedItem = this.props.list.data[index];
 
-    getRowStyle = (index) => {
+        return clickedItem.id === this.props.sourceItemId;
+    };
+
+    isRowSelectable = index => {
+        return !this.isItemAtIndexMoved(index) && !this.isItemAtIndexSource(index);
+    };
+
+    getRowStyle = index => {
         if (this.isItemAtIndexMoved(index)) {
             return { cursor: 'not-allowed', backgroundColor: 'lightgreen' };
         }
+        if (this.isItemAtIndexSource(index)) {
+            return { cursor: 'not-allowed', opacity: 0.5 };
+        }
         return { cursor: 'pointer' };
-    }
+    };
 
     onMovedItemsChange = () => {
         const movedItemIds = this.state.movedItems.map(item => item.id);
@@ -275,6 +280,7 @@ export default class TemplateDefaultList extends Component {
                             shownColumns={shownColumns}
                             rowsTotal={total}
                             rowsPerPage={this.state.listParams.limit}
+                            listParams={this.state.listParams}
                             onRowSelection={this.onRowSelection}
                             selected={selected || this.state.selectedRows}
                             onAddItem={onAddItem}

package/src/Screens/Designer/Components/TemplateList.js

@@ -170,6 +170,7 @@ export default class TemplateList extends Component {
                         this.props.onRowSelection(rows, event);
                     }}
                     selected={this.selectedRows}
+                    isRowSelectable={this.props.isRowSelectable}
                 >
                     <TableHead showCheckbox={showCheckboxes}>
                         <TableRow>