@configuratorware/configurator-admingui 1.44.10 → 1.45.1

package/Screens/Creator/Reducers/ConfigurationReducer.js

@@ -9,6 +9,7 @@ var _ConfigurationActions = require("./ConfigurationActions");
 var _Reducer = require("../../../App/Reducers/Entity/Reducer");
 var _Helpers = require("../../../App/Reducers/Api/Helpers");
 var _FeatureReducers = require("../../../App/FeatureReducers");
+var _Actions = require("../../../App/Reducers/Entity/Actions");
 var _excluded = ["data"],
   _excluded2 = ["is_mandatory", "is_multiselect"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -228,6 +229,14 @@ var baseConfigurationData = exports.baseConfigurationData = (0, _FeatureReducers
           showConfiguratorAdminMode: action.show
         });
       }
+
+    // hiding the details should close the configuration preview (CW-383)
+    case _Actions.HIDE_DETAILS:
+      {
+        return _objectSpread(_objectSpread({}, state), {}, {
+          showConfiguratorAdminMode: false
+        });
+      }
     case _ConfigurationActions.CONFIGURATION_SET_OVERWRITE_COMPONENT_ORDER:
       {
         var overwriteComponentOrder = action.value;

package/Screens/Designer/SubScreens/Visualization/Components/Three2DEditor.js

@@ -44,7 +44,7 @@ var Group = _ExposedModules.THREE.Group,
   Mesh = _ExposedModules.THREE.Mesh,
   CylinderGeometry = _ExposedModules.THREE.CylinderGeometry,
   BackSide = _ExposedModules.THREE.BackSide,
-  PlaneBufferGeometry = _ExposedModules.THREE.PlaneBufferGeometry,
+  PlaneGeometry = _ExposedModules.THREE.PlaneGeometry,
   TextureLoader = _ExposedModules.THREE.TextureLoader,
   DoubleSide = _ExposedModules.THREE.DoubleSide,
   LinearFilter = _ExposedModules.THREE.LinearFilter;
@@ -141,7 +141,7 @@ var createTextureRepo = /*#__PURE__*/function () {
 var controlFactory = function controlFactory(textureRepo) {
   return function (name) {
     var props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    var geometry = new PlaneBufferGeometry(CONTROL_SIZE, CONTROL_SIZE);
+    var geometry = new PlaneGeometry(CONTROL_SIZE, CONTROL_SIZE);
     var material = new MeshBasicMaterial();
     var control = new Mesh(geometry, material);
     control.name = name;
@@ -662,7 +662,7 @@ var createThree2DEditor = exports.createThree2DEditor = /*#__PURE__*/function ()
                           width: Math.round(baseShapeData.width * targetObj.scale.x),
                           x: obj.position.x,
                           y: obj.position.y,
-                          rotation: _objectSpread(_objectSpread({}, obj.rotation.toVector3()), {}, {
+                          rotation: _objectSpread(_objectSpread({}, new Vector3().setFromEuler(obj.rotation)), {}, {
                             order: obj.rotation.order
                           })
                         }, getShapeSpecificData(baseShapeData));

package/Screens/Item/Components/CopyCreatorItemDialog.js

@@ -186,5 +186,5 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch) {
   };
 };
 var _default = exports["default"] = (0, _reactRedux.connect)(function () {
-  return null;
+  return {};
 }, mapDispatchToProps)(CopyCreatorItemDialog);

package/Screens/Item/Components/Variants/VariantsEditor.js

@@ -195,7 +195,8 @@ var mergeVariants = function mergeVariants(currentVariants, newVariants) {
 };
 var NarrowTableCell = (0, _styles.withStyles)({
   root: {
-    paddingRight: 24
+    paddingRight: 12,
+    paddingLeft: 0
   }
 })(_TableCell["default"]);
 var VariantsEditor = /*#__PURE__*/function (_Component) {
@@ -507,26 +508,26 @@ var VariantsEditor = /*#__PURE__*/function (_Component) {
           sortKey: groups[groupId].id,
           listParams: _this2.state.listParams
         }));
-      }))), /*#__PURE__*/_react["default"].createElement(_TableBody["default"], null, variants.slice().filter(function (variant) {
+      }))), /*#__PURE__*/_react["default"].createElement(_TableBody["default"], null, variants.filter(function (variant) {
         var filters = _this2.state.listParams.filters;
-        var newVariants = [];
-        if (filters) {
-          for (var _i = 0, _Object$keys = Object.keys(filters); _i < _Object$keys.length; _i++) {
-            var filter = _Object$keys[_i];
-            if (variant[filter] && variant[filter].toLowerCase().indexOf(filters[filter].toLowerCase()) > -1) {
-              return newVariants.push(variant);
-            } else if (!variant[filter] && variant.groupEntries[filter].translation.toLowerCase().indexOf(filters[filter].toLowerCase()) > -1) {
-              return newVariants.push(variant);
-            }
-          }
-        } else {
-          return variants.slice();
-        }
+        var filterKeys = filters && Object.keys(filters);
+        return !(filterKeys !== null && filterKeys !== void 0 && filterKeys.length) || !filterKeys.some(function (filter) {
+          return (variant[filter] || variant.groupEntries[filter].translation || '').toLowerCase().indexOf(filters[filter].toLowerCase()) === -1;
+        });
       }).sort(function (a, b) {
         var prop = _this2.state.listParams.sortKey;
         var orderDir = _this2.state.listParams.sort;
         var modifier = orderDir === 'desc' ? -1 : 1;
-        if (a[prop] < b[prop]) return -modifier;else if (a[prop] > b[prop]) return modifier;else return 0;
+        var value1, value2;
+        if (typeof prop === 'number') {
+          var _a$groupEntries, _b$groupEntries;
+          value1 = (_a$groupEntries = a.groupEntries) === null || _a$groupEntries === void 0 || (_a$groupEntries = _a$groupEntries[prop]) === null || _a$groupEntries === void 0 ? void 0 : _a$groupEntries.translation;
+          value2 = (_b$groupEntries = b.groupEntries) === null || _b$groupEntries === void 0 || (_b$groupEntries = _b$groupEntries[prop]) === null || _b$groupEntries === void 0 ? void 0 : _b$groupEntries.translation;
+        } else {
+          value1 = a[prop];
+          value2 = b[prop];
+        }
+        if (value1 < value2) return -modifier;else if (value1 > value2) return modifier;else return 0;
       }).slice(page * rowsPerPage, page * rowsPerPage + rowsPerPage).map(function (variant) {
         return /*#__PURE__*/_react["default"].createElement(_TableRow["default"], {
           key: variant.id,

package/Screens/Item/Components/Variants/VariantsSortFilter.js

@@ -17,6 +17,8 @@ var _lodash = _interopRequireDefault(require("lodash"));
 var _withStyles = _interopRequireDefault(require("@material-ui/core/styles/withStyles"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -31,7 +33,35 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 var styles = function styles() {
-  return {};
+  return {
+    sortLabelIcon: {
+      opacity: 0.5
+    },
+    formControlRoot: {
+      verticalAlign: 'middle',
+      top: -8,
+      maxWidth: 'calc(100% - 56px)',
+      minWidth: 50
+    },
+    columnText: {
+      display: 'inline-block',
+      maxWidth: 'calc(100% - 56px)',
+      overflow: 'hidden',
+      textOverflow: 'ellipsis',
+      verticalAlign: 'middle',
+      minWidth: 50
+    },
+    inputLabelRoot: {
+      maxWidth: '100%',
+      minWidth: 50,
+      overflow: 'hidden',
+      textOverflow: 'ellipsis'
+    },
+    inputLabelShrink: {
+      textOverflow: 'unset',
+      overflow: 'visible'
+    }
+  };
 };
 var VariantsSortFilter = /*#__PURE__*/function (_React$Component) {
   _inherits(VariantsSortFilter, _React$Component);
@@ -59,20 +89,13 @@ var VariantsSortFilter = /*#__PURE__*/function (_React$Component) {
       var key = filterKey;
       if (value && value.length > 0) {
         _this.updateListParams({
-          filters: _defineProperty({}, key, value),
+          filters: _objectSpread(_objectSpread({}, _this.props.listParams.filters), {}, _defineProperty({}, key, value)),
           offset: 0
         });
       } else {
         _this.removeListParams(["filters[\"".concat(key, "\"]")]);
       }
     });
-    _defineProperty(_assertThisInitialized(_this), "onBlur", function () {
-      return setTimeout(function () {
-        return !_this.props.listParams.value && _this.setState({
-          open: false
-        });
-      }, 500);
-    });
     _defineProperty(_assertThisInitialized(_this), "onToggleSort", function () {
       var sort;
       if (_this.props.listParams.sort === 'desc') {
@@ -99,7 +122,7 @@ var VariantsSortFilter = /*#__PURE__*/function (_React$Component) {
       _this.props.updateList(listParams);
     });
     _defineProperty(_assertThisInitialized(_this), "removeListParams", function (params) {
-      var listParams = _lodash["default"].omit({}, _this.props.listParams, params);
+      var listParams = _lodash["default"].omit(_this.props.listParams, params);
       _this.props.updateList(listParams);
     });
     _defineProperty(_assertThisInitialized(_this), "renderFilter", function () {
@@ -130,20 +153,22 @@ var VariantsSortFilter = /*#__PURE__*/function (_React$Component) {
         onChange: function onChange(evt) {
           return _this.onFilterChange(evt.target.value);
         },
-        onBlur: _this.onBlur,
         disableUnderline: true
       }));
     });
     _defineProperty(_assertThisInitialized(_this), "renderSort", function () {
       var _this$props2 = _this.props,
         classes = _this$props2.classes,
-        sort = _this$props2.sort;
+        sort = _this$props2.sort,
+        sortKey = _this$props2.sortKey,
+        listParams = _this$props2.listParams;
+      var active = (listParams === null || listParams === void 0 ? void 0 : listParams.sortKey) === sortKey;
       return /*#__PURE__*/_react["default"].createElement(_Tooltip["default"], {
         title: "Sort",
         enterDelay: 300
       }, /*#__PURE__*/_react["default"].createElement(_TableSortLabel["default"], {
-        active: sort !== null,
-        direction: sort || 'asc',
+        active: active,
+        direction: active && sort || 'asc',
         onClick: _this.onToggleSort,
         classes: {
           icon: classes.sortLabelIcon

package/Screens/Item/DataStructures/Attributes/Editor.js

@@ -68,7 +68,11 @@ var _default = exports["default"] = [{
       placeholder: 'item.attributes.searchOrAddAttribute',
       sourceConfig: {
         value: 'id',
-        text: 'translated_title'
+        text: function text(_ref2) {
+          var translated_title = _ref2.translated_title,
+            identifier = _ref2.identifier;
+          return translated_title ? "".concat(translated_title, " (").concat(identifier, ")") : identifier;
+        }
       },
       dynSource: {
         type: 'autocomplete',

package/Screens/TranslationFileHandling/Containers/Edit.js

@@ -16,9 +16,8 @@ var _FolderIcon = _interopRequireDefault(require("../../../UIComponents/icons/Fo
 var _Link = _interopRequireDefault(require("@material-ui/core/Link"));
 var _Button = _interopRequireDefault(require("@material-ui/core/Button"));
 var _Text = _interopRequireDefault(require("../../../Components/FormFragments/Text"));
-var _DefaultConnectedForm = _interopRequireDefault(require("../../../Components/DefaultConnectedForm"));
 var _reactFileDrop = _interopRequireDefault(require("react-file-drop"));
-var _RaisedButton = _interopRequireDefault(require("../../../UIComponents/RaisedButton"));
+var _DefaultConnectedForm = _interopRequireDefault(require("../../../Components/DefaultConnectedForm"));
 var _excluded = ["value", "langCode", "readOnly"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -123,9 +122,11 @@ var ConnectedTextField = function ConnectedTextField(_ref2) {
     _useState4 = _slicedToArray(_useState3, 2),
     uploadStatus = _useState4[0],
     setUploadStatus = _useState4[1];
-  var fileInput = (0, _react.useRef)();
-  var dropInput = (0, _react.useRef)();
-  var dropZone = /*#__PURE__*/_react["default"].createRef();
+  var fileInputRef = _react["default"].useRef();
+  var _useState5 = (0, _react.useState)(null),
+    _useState6 = _slicedToArray(_useState5, 2),
+    selectedFile = _useState6[0],
+    setSelectedFile = _useState6[1];
   var downloadTranslation = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(evt) {
       var result, blob, href, a;
@@ -171,42 +172,49 @@ var ConnectedTextField = function ConnectedTextField(_ref2) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
             files = new FormData();
-            if (!(file.length <= 0)) {
-              _context3.next = 3;
+            if (file.length) {
+              _context3.next = 4;
               break;
             }
+            setSelectedFile(null);
             return _context3.abrupt("return");
-          case 3:
+          case 4:
+            setSelectedFile(file[0]);
             files.append('translation', file[0]);
             params = {
               url: "/translations/frontend/".concat(langCode),
               method: 'POST',
               data: files
             };
-            _context3.prev = 5;
+            _context3.prev = 7;
             setUploadStatus('pending');
-            _context3.next = 9;
+            _context3.next = 11;
             return _Api["default"].request(params);
-          case 9:
+          case 11:
             result = _context3.sent;
             setUploadStatus('successful');
             return _context3.abrupt("return", result);
-          case 14:
-            _context3.prev = 14;
-            _context3.t0 = _context3["catch"](5);
+          case 16:
+            _context3.prev = 16;
+            _context3.t0 = _context3["catch"](7);
             setUploadStatus('failed');
             throw _context3.t0;
-          case 18:
+          case 20:
+            _context3.prev = 20;
+            // reset file input field to allow upload the same file again (e.g. after changes)
+            fileInputRef.current.value = '';
+            return _context3.finish(20);
+          case 23:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[5, 14]]);
+      }, _callee3, null, [[7, 16, 20, 23]]);
     }));
     return function uploadTranslation(_x4, _x5) {
       return _ref4.apply(this, arguments);
     };
   }();
-  var filename = fileInput.current && fileInput.current.files && fileInput.current.files.length > 0 && fileInput.current.files[0].name || dropInput.current && dropInput.current.files && dropInput.current.files.length > 0 && dropInput.current.files[0].name;
+  var filename = selectedFile === null || selectedFile === void 0 ? void 0 : selectedFile.name;
   return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_Text["default"], _extends({}, props, {
     readOnly: true,
     value: langCode
@@ -222,12 +230,9 @@ var ConnectedTextField = function ConnectedTextField(_ref2) {
     onDrop: function onDrop(file) {
       uploadTranslation(langCode, file);
     },
-    ref: dropInput,
     draggingOverTargetClassName: 'draggingOverDropZone',
     accept: '.json',
     multiple: true
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    ref: dropZone
   }, /*#__PURE__*/_react["default"].createElement("div", {
     style: styles.uploader
   }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _i18n.T)('dragDropFile'), '.json'), /*#__PURE__*/_react["default"].createElement(_Button["default"], {
@@ -235,14 +240,14 @@ var ConnectedTextField = function ConnectedTextField(_ref2) {
   }, /*#__PURE__*/_react["default"].createElement("span", null, /*#__PURE__*/_react["default"].createElement(_FolderIcon["default"], {
     style: styles.folderIcon
   }), (0, _i18n.T)('Upload file')), /*#__PURE__*/_react["default"].createElement("input", {
-    ref: fileInput,
     type: "file",
     style: styles.fileInput,
     accept: '.json',
     onChange: function onChange(evt) {
       return uploadTranslation(langCode, evt.target.files);
-    }
-  }))))), filename && /*#__PURE__*/_react["default"].createElement("div", {
+    },
+    ref: fileInputRef
+  })))), filename && /*#__PURE__*/_react["default"].createElement("div", {
     style: styles.fileInputName
   }, /*#__PURE__*/_react["default"].createElement("div", null, filename), uploadStatus === 'successful' && /*#__PURE__*/_react["default"].createElement("div", {
     style: styles.success

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@configuratorware/configurator-admingui",
-  "version": "1.44.10",
+  "version": "1.45.1",
   "license": "UNLICENSED",
   "private": false,
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
-    "@configuratorware/scripts": "1.44.10",
+    "@configuratorware/scripts": "1.45.1",
     "@material-ui/core": "^3.9.4",
     "@material-ui/icons": "^3.0.2",
     "@tweenjs/tween.js": "^17.6.0",
@@ -28,7 +28,7 @@
     "react-redux-i18n": "^1.9.3",
     "react-router": "^3.2.6",
     "react-sortable-hoc": "^1.11.0",
-    "redhotmagma-visualization": "1.44.10",
+    "redhotmagma-visualization": "1.45.1",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",