@configuratorware/configurator-admingui 1.38.6 → 1.39.0

package/Components/Form.js

@@ -161,6 +161,9 @@ var getInputComponentByType = function getInputComponentByType(type) {
     case 'hinttext':
       return _HintText["default"];
 
+    case 'attributeValueChip':
+      return _FormFragments["default"].AttributeValueChip;
+
     default:
       return null;
   }

package/Components/FormFragments/AttributeValueChip.js

@@ -0,0 +1,262 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _lodash = require("lodash");
+
+var _ChipInput = _interopRequireWildcard(require("../../UIComponents/ChipInput"));
+
+var _AutoComplete = require("../../UIComponents/AutoComplete");
+
+var _InlineAddButton = require("./InlineAddButton");
+
+var _i18n = require("../../App/i18n");
+
+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); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+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, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+var AttributeValueChip = /*#__PURE__*/function (_React$Component) {
+  _inherits(AttributeValueChip, _React$Component);
+
+  var _super = _createSuper(AttributeValueChip);
+
+  function AttributeValueChip() {
+    var _this;
+
+    _classCallCheck(this, AttributeValueChip);
+
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    _this = _super.call.apply(_super, [this].concat(args));
+
+    _defineProperty(_assertThisInitialized(_this), "state", {
+      placeholder: ''
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "isNumericAttributeType", function () {
+      var type = (0, _lodash.get)(_this.props, 'schema._data.attributedatatype.value');
+      return type === 'integer' || type === 'number';
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "loadSourceDebounced", (0, _lodash.debounce)(_this.loadSource, 300));
+
+    _defineProperty(_assertThisInitialized(_this), "onUpdateInput", function (query) {
+      _this.loadSourceDebounced(query);
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "onRequestAdd", function (chip) {
+      var _this$props = _this.props,
+          name = _this$props.name,
+          source = _this$props.source,
+          onChange = _this$props.onChange,
+          sourceConfig = _this$props.sourceConfig,
+          single = _this$props.single,
+          value = _this$props.value;
+
+      var items = _.cloneDeep(value); // if it already in the values just return
+
+
+      if ((0, _lodash.find)(items, _defineProperty({}, sourceConfig.value, chip[sourceConfig.value]))) {
+        return;
+      }
+
+      var item = (0, _lodash.find)(source, _defineProperty({}, sourceConfig.value, chip[sourceConfig.value]));
+
+      if (!item) {
+        // if not found, use the first which is not in the list
+        var diff = (0, _lodash.differenceBy)(source, items, sourceConfig.value);
+
+        if (diff.length !== 0) {
+          item = diff[0];
+        } else {
+          return;
+        }
+      }
+
+      if (single) {
+        items.splice(0, items.length);
+      }
+
+      items.push(item);
+      onChange(name, items);
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "onRequestDelete", function (text, idx) {
+      var _this$props2 = _this.props,
+          name = _this$props2.name,
+          onChange = _this$props2.onChange,
+          value = _this$props2.value;
+      var items = (0, _lodash.cloneDeep)(value);
+
+      if (idx > -1 && idx < items.length) {
+        items.splice(idx, 1);
+        onChange(name, items);
+      }
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "onFocus", function (evt) {
+      _this.loadInitialSource();
+
+      var placeholder = (0, _i18n.t)(_this.isNumericAttributeType() ? 'item.attributes.searchOrAddNumbericAttributeValue' : 'item.attributes.searchOrAddAttributeValue');
+
+      _this.setState({
+        placeholder: placeholder
+      });
+
+      var onFocus = _this.props.onFocus;
+      onFocus && onFocus(evt);
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "onBlur", function (evt) {
+      var onBlur = _this.props.onBlur;
+
+      _this.setState({
+        placeholder: null
+      });
+
+      onBlur && onBlur(evt);
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "onInputEnterKey", function (evt) {
+      _this.triggerChange({
+        id: null,
+        value: evt.target.value,
+        translated_value: evt.target.value
+      });
+    });
+
+    return _this;
+  }
+
+  _createClass(AttributeValueChip, [{
+    key: "loadInitialSource",
+    value: function loadInitialSource() {
+      var _this$props3 = this.props,
+          initialSourceSize = _this$props3.initialSourceSize,
+          loadSource = _this$props3.loadSource;
+
+      if (initialSourceSize) {
+        loadSource({
+          limit: initialSourceSize
+        });
+      }
+    }
+  }, {
+    key: "loadSource",
+    value: function loadSource(query) {
+      var _this$props4 = this.props,
+          autoLoad = _this$props4.autoLoad,
+          loadSource = _this$props4.loadSource;
+
+      if ((0, _lodash.isString)(query) && autoLoad === false) {
+        // IMPORTANT: the filter value should be passed in the "query" get param
+        loadSource({
+          query: query
+        });
+      }
+    }
+  }, {
+    key: "triggerChange",
+    value:
+    /**
+     * Called by the InlineAddButton, when the data is ready
+     * @param chip
+     */
+    function triggerChange(chip) {
+      // no additional checks needed, just append the new value to the list
+      var _this$props5 = this.props,
+          name = _this$props5.name,
+          onChange = _this$props5.onChange,
+          sourceConfig = _this$props5.sourceConfig,
+          value = _this$props5.value;
+
+      var items = _.cloneDeep(value);
+
+      if ((0, _lodash.find)(items, _defineProperty({}, sourceConfig.value, chip[sourceConfig.value]))) {
+        return;
+      }
+
+      items.push(chip);
+      onChange(name, items);
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      var _this$props6 = this.props,
+          value = _this$props6.value,
+          label = _this$props6.label,
+          source = _this$props6.source,
+          sourceConfig = _this$props6.sourceConfig,
+          openOnFocus = _this$props6.openOnFocus,
+          autoLoad = _this$props6.autoLoad;
+      var placeholder = this.state.placeholder;
+      var onRequestAdd = this.onRequestAdd,
+          onRequestDelete = this.onRequestDelete,
+          onUpdateInput = this.onUpdateInput,
+          onBlur = this.onBlur,
+          onFocus = this.onFocus,
+          onInputEnterKey = this.onInputEnterKey;
+      return /*#__PURE__*/_react["default"].createElement(_ChipInput["default"], {
+        floatingLabelText: label,
+        onBlur: onBlur,
+        onFocus: onFocus,
+        dataSource: source,
+        onInputValueChange: onUpdateInput,
+        dataSourceConfig: sourceConfig,
+        value: value,
+        handleChange: onRequestAdd,
+        onRequestDelete: onRequestDelete,
+        openOnFocus: openOnFocus,
+        filter: autoLoad === false ? _AutoComplete.Filters.defaultFilter : _AutoComplete.Filters.fuzzyFilter,
+        onInputEnterKey: onInputEnterKey,
+        resetOnInputEnterKey: true,
+        textFieldType: 'number',
+        placeholder: placeholder
+      });
+    }
+  }]);
+
+  return AttributeValueChip;
+}(_react["default"].Component);
+
+_defineProperty(AttributeValueChip, "propTypes", {
+  sourceConfig: _ChipInput.propTypes.dataSourceConfig
+});
+
+var _default = (0, _InlineAddButton.withAddButton)(AttributeValueChip);
+
+exports["default"] = _default;

package/Components/FormFragments/InputArray.js

@@ -196,10 +196,12 @@ var InputArray = /*#__PURE__*/function (_Component) {
         active: _assertThisInitialized(_this)
       });
 
-      _this.setState({
-        selectedRow: false,
-        showEditor: true,
-        newItem: !_this.state.newItem
+      _this.setState(function (state) {
+        return {
+          selectedRow: false,
+          showEditor: !_this.isAddingDisabled(),
+          newItem: !state.newItem
+        };
       });
     });
 

package/Components/FormFragments/index.js

@@ -87,6 +87,12 @@ Object.defineProperty(exports, "HintText", {
     return _HintText["default"];
   }
 });
+Object.defineProperty(exports, "AttributeValueChip", {
+  enumerable: true,
+  get: function get() {
+    return _AttributeValueChip["default"];
+  }
+});
 exports["default"] = void 0;
 
 var _Text = _interopRequireDefault(require("./Text"));
@@ -117,11 +123,14 @@ var _Value = _interopRequireDefault(require("./Value"));
 
 var _HintText = _interopRequireDefault(require("./HintText"));
 
+var _AttributeValueChip = _interopRequireDefault(require("./AttributeValueChip"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var _default = {
   Text: _Text["default"],
   AutoComplete: _AutoComplete["default"],
+  AttributeValueChip: _AttributeValueChip["default"],
   Select: _Select["default"],
   Checkbox: _Checkbox["default"],
   RadioGroup: _RadioGroup["default"],

package/Components/LocalizedPriceTextField.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.LocalizedPriceTextField = void 0;
+exports["default"] = exports.LocalizedPriceTextField = void 0;
 
 var _reactRedux = require("react-redux");
 
@@ -55,7 +55,7 @@ var LocalizedPriceTextField = function LocalizedPriceTextField(_ref) {
 
   var onChange = function onChange(name, value) {
     // replace occurrences of (localized) decimal separator
-    var localizedValue = value.replace(new RegExp(altSeparator, 'g'), defaultSeparator); //  remove all letters etc.
+    var localizedValue = "".concat(value).replace(new RegExp(altSeparator, 'g'), defaultSeparator); //  remove all letters etc.
 
     localizedValue = localizedValue.replace(new RegExp("[^0-9\\".concat(defaultSeparator, "]"), 'g'), ''); // remove all separators but the first one
 
@@ -63,7 +63,7 @@ var LocalizedPriceTextField = function LocalizedPriceTextField(_ref) {
     props.onChange(name, localizedValue);
   };
 
-  var displayValue = localeSeparator === altSeparator ? (value || '').replace(defaultSeparator, localeSeparator) : localeSeparator === defaultSeparator ? (value || '').replace(altSeparator, localeSeparator) : value;
+  var displayValue = localeSeparator === altSeparator ? "".concat(value || '').replace(defaultSeparator, localeSeparator) : localeSeparator === defaultSeparator ? "".concat(value || '').replace(altSeparator, localeSeparator) : value;
   return /*#__PURE__*/_react["default"].createElement(_Text["default"], {
     type: "text",
     value: displayValue,
@@ -80,4 +80,6 @@ var LocalizedPriceTextField = function LocalizedPriceTextField(_ref) {
   });
 };
 
-exports.LocalizedPriceTextField = LocalizedPriceTextField;
+exports.LocalizedPriceTextField = LocalizedPriceTextField;
+var _default = LocalizedPriceTextField;
+exports["default"] = _default;

package/Components/LocalizedPriceValue.js

@@ -20,7 +20,7 @@ var LocalizedPriceValue = function LocalizedPriceValue(_ref) {
       language = _ref.language,
       defaultSeparator = _ref.defaultSeparator;
   var localeSeparator = (0, _get["default"])(decimalSeparators, language, defaultSeparator);
-  return data && localeSeparator !== defaultSeparator ? data.replace(defaultSeparator, localeSeparator) : data;
+  return data && localeSeparator !== defaultSeparator ? "".concat(data).replace(defaultSeparator, localeSeparator) : data;
 };
 
 var mapStateToProps = function mapStateToProps(_ref2) {

package/Screens/ImageGallery/Containers/Edit.js

@@ -21,6 +21,10 @@ var _DefaultConnectedForm = _interopRequireDefault(require("../../../Components/
 
 var _i18n = require("../../../App/i18n");
 
+var _LocalizedPriceTextField = _interopRequireDefault(require("../../../Components/LocalizedPriceTextField"));
+
+var _LocalizedPriceValue = _interopRequireDefault(require("../../../Components/LocalizedPriceValue"));
+
 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); }
@@ -88,6 +92,61 @@ var formFields = [{
   warningMessage: (0, _i18n.T)('UploadFailureMessage', {
     url: "<a href=\"http://svg.enshrined.co.uk/\"\n        target=\"_blank\">http://svg.enshrined.co.uk/</a>"
   })
+}, {
+  name: 'prices',
+  label: 'Prices',
+  type: 'dynSource',
+  sourceConfig: {
+    text: function text(_ref) {
+      var identifier = _ref.identifier,
+          currency = _ref.currency;
+      return "".concat(identifier, " / ").concat(currency.symbol, " (").concat(currency.iso, ")");
+    }
+  },
+  dynSource: {
+    type: 'tabs',
+    reducerName: _Actions.IMAGE_GALLERY_REDUCER_NAME,
+    dataSource: 'channels'
+  },
+  tabs: {
+    filterValues: function filterValues(channel, value) {
+      return +channel.id === +value.channel;
+    },
+    assignTabValue: function assignTabValue(tabValue, data) {
+      return data.channel = tabValue;
+    },
+    name: 'prices',
+    type: 'array',
+    layout: 'groups',
+    className: 'table',
+    array: {
+      columns: null,
+      disableAdd: function disableAdd(_ref2) {
+        var value = _ref2.value;
+        // limit to one price item, since "amount from" is not available
+        return value.length > 0;
+      },
+      fields: [{
+        name: 'price',
+        label: 'price',
+        type: _LocalizedPriceTextField["default"],
+        renderValue: function renderValue(value) {
+          return /*#__PURE__*/_react["default"].createElement(_LocalizedPriceValue["default"], {
+            data: value
+          });
+        }
+      }, {
+        name: 'priceNet',
+        label: 'price Net',
+        type: _LocalizedPriceTextField["default"],
+        renderValue: function renderValue(value) {
+          return /*#__PURE__*/_react["default"].createElement(_LocalizedPriceValue["default"], {
+            data: value
+          });
+        }
+      }]
+    }
+  }
 }]); //export default generateConnectedEdit(formFields, IMAGE_GALLERY_REDUCER_NAME, setFieldData, postData);
 
 var BaseDataForm = (0, _DefaultConnectedForm["default"])(formFields, _Actions.IMAGE_GALLERY_REDUCER_NAME, setFieldData, postData, false, _Actions["default"].customAction);

package/Screens/ImageGallery/Reducers/Reducer.js

@@ -23,13 +23,47 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-var initialState = _objectSpread(_objectSpread({}, (0, _Reducer.getDefaultEntityState)(_objectSpread({
+var initialState = _objectSpread(_objectSpread({}, (0, _Reducer.getDefaultEntityState)(_objectSpread(_objectSpread({
   id: null,
   imageUrl: '',
   printUrl: '',
   thumbUrl: '',
   texts: []
-}, _Reducer2["default"]), null, _Actions.IMAGE_GALLERY_DATA_KEY)), {}, {
+}, _Reducer2["default"]), {}, {
+  prices: {
+    value: [],
+    schema: {
+      id: {
+        value: null
+      },
+      price: {
+        value: null,
+        constraints: {
+          presence: true,
+          decimalPoint: true
+        }
+      },
+      priceNet: {
+        value: 0,
+        constraints: {
+          presence: true
+        }
+      },
+      channel: {
+        value: null,
+        constraints: {
+          presence: true
+        }
+      }
+    }
+  }
+}), {
+  dependencies: [{
+    name: 'channels',
+    dataKey: 'channels',
+    source: 'channels'
+  }]
+}, _Actions.IMAGE_GALLERY_DATA_KEY)), {}, {
   imageFile: null,
   printFile: null,
   uploadedImages: null,

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

@@ -66,7 +66,7 @@ var _default = [{
             data: translations,
             property: "translation",
             fallback: translated_value
-          }), /*#__PURE__*/_react["default"].createElement("span", null, " (", value, ")"));
+          }));
         }));
       }
     }],
@@ -99,20 +99,19 @@ var _default = [{
       name: 'values',
       label: 'Values',
       type: 'dynSource',
-      placeholderFocused: 'item.attributes.searchOrAddAttributeValue',
       sourceConfig: {
         value: 'value',
         text: 'label'
       },
       dynSource: {
-        type: 'chip',
+        type: 'attributeValueChip',
         listKey: 'attributevalues',
         url: 'attributevalues',
         autoLoad: false,
         maxSearchResults: 25,
         mapItems: function mapItems(item) {
           return _objectSpread(_objectSpread({}, item), {}, {
-            label: "".concat(item.translated_value, " (").concat(item.value, ")")
+            label: item.value === item.translated_value ? item.translated_value : "".concat(item.translated_value, " (").concat(item.value, ")")
           });
         }
       },

package/Screens/Item/Translations.js

@@ -37,7 +37,8 @@ require("../../App/i18n").use({
       attributes: {
         addButtonLabel: 'Add attribute',
         searchOrAddAttribute: 'Search for an existing attribute or add a new one by clicking on +',
-        searchOrAddAttributeValue: 'Search for a existing value or add a new one by clicking on +'
+        searchOrAddAttributeValue: 'Search for an existing value or add a new one by clicking on +',
+        searchOrAddNumbericAttributeValue: 'Search for an existing value or add a new with enter'
       },
       headline: 'This product is defined as follows:',
       editorPopup: {
@@ -118,7 +119,8 @@ require("../../App/i18n").use({
       attributes: {
         addButtonLabel: 'Attribut hinzufügen',
         searchOrAddAttribute: 'Suche ein vorhandenes Attribut oder lege ein neues mit dem + an',
-        searchOrAddAttributeValue: 'Suche einen Attributwert oder lege einen neuen mit dem + an'
+        searchOrAddAttributeValue: 'Suche einen Attributwert oder lege einen neuen mit dem + an',
+        searchOrAddNumbericAttributeValue: 'Suche einen Attributwert oder lege einen neuen mit der Eingabetaste an'
       },
       headline: 'Dieses Produkt ist folgendermaßen definiert:',
       copyCreatorItemDialogTitle: 'Gewähltes Produkt kopieren',

package/UIComponents/ChipInput.js

@@ -82,7 +82,18 @@ var styles = function styles(theme) {
       margin: "".concat(theme.spacing.unit / 2, "px ").concat(theme.spacing.unit / 4, "px")
     },
     inputRoot: {
-      flexWrap: 'wrap'
+      flexWrap: 'wrap',
+      '& input[type=number]': {
+        '-moz-appearance': 'textfield'
+      },
+      '& input[type=number]::-webkit-outer-spin-button': {
+        '-webkit-appearance': 'none',
+        margin: 0
+      },
+      '& input[type=number]::-webkit-inner-spin-button': {
+        '-webkit-appearance': 'none',
+        margin: 0
+      }
     },
     inputInput: {
       flexGrow: 1
@@ -199,7 +210,10 @@ var ChipInput = /*#__PURE__*/function (_React$Component) {
           dataSourceConfig = _this$props.dataSourceConfig,
           onFocus = _this$props.onFocus,
           placeholder = _this$props.placeholder,
-          filter = _this$props.filter;
+          filter = _this$props.filter,
+          onInputEnterKey = _this$props.onInputEnterKey,
+          resetOnInputEnterKey = _this$props.resetOnInputEnterKey,
+          textFieldType = _this$props.textFieldType;
       var _this$state = this.state,
           selectedItem = _this$state.selectedItem,
           inputValue = _this$state.inputValue;
@@ -239,7 +253,19 @@ var ChipInput = /*#__PURE__*/function (_React$Component) {
             onBlur: _this2.onBlur,
             onFocus: onFocus
           }),
-          classes: classes
+          classes: classes,
+          type: textFieldType,
+          onKeyDown: function onKeyDown(evt) {
+            if (!highlightedIndex && onInputEnterKey && evt.keyCode === 13) {
+              onInputEnterKey(evt);
+
+              if (resetOnInputEnterKey) {
+                _this2.setState({
+                  inputValue: ''
+                });
+              }
+            }
+          }
         }), isOpen ? /*#__PURE__*/_react["default"].createElement(_Paper["default"], {
           className: classes.paper,
           square: true

package/package.json

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

package/src/Components/Form.js

@@ -77,6 +77,8 @@ const getInputComponentByType = type => {
             return MarkDown;
         case 'hinttext':
             return HintText;
+        case 'attributeValueChip':
+            return FF.AttributeValueChip;
         default:
             return null;
     }

package/src/Components/FormFragments/AttributeValueChip.js

@@ -0,0 +1,140 @@
+import React from 'react';
+import { cloneDeep, debounce, find, differenceBy, get, isString } from 'lodash';
+
+import UIChipInput, { propTypes } from '../../UIComponents/ChipInput';
+import { Filters } from '../../UIComponents/AutoComplete';
+import { withAddButton } from './InlineAddButton';
+import { t } from '../../App/i18n';
+
+class AttributeValueChip extends React.Component {
+
+    static propTypes = {
+        sourceConfig: propTypes.dataSourceConfig,
+    };
+
+    state = {
+        placeholder: '',
+    };
+
+    isNumericAttributeType = () => {
+        const type = get(this.props, 'schema._data.attributedatatype.value');
+        return type === 'integer' || type === 'number';
+    }
+
+    loadInitialSource() {
+        const { initialSourceSize, loadSource } = this.props;
+        if (initialSourceSize) {
+            loadSource({ limit: initialSourceSize });
+        }
+    }
+
+    loadSource(query) {
+        const { autoLoad, loadSource } = this.props;
+        if (isString(query) && autoLoad === false) {
+            // IMPORTANT: the filter value should be passed in the "query" get param
+            loadSource({ query });
+        }
+    }
+
+    loadSourceDebounced = debounce(this.loadSource, 300);
+
+    onUpdateInput = query => {
+        this.loadSourceDebounced(query);
+    };
+
+    onRequestAdd = chip => {
+        const { name, source, onChange, sourceConfig, single, value } = this.props;
+        const items = _.cloneDeep(value);
+
+        // if it already in the values just return
+        if (find(items, { [sourceConfig.value]: chip[sourceConfig.value] })) {
+            return;
+        }
+
+        let item = find(source, { [sourceConfig.value]: chip[sourceConfig.value] });
+        if (!item) {
+            // if not found, use the first which is not in the list
+            const diff = differenceBy(source, items, sourceConfig.value);
+            if (diff.length !== 0) {
+                item = diff[0];
+            } else {
+                return;
+            }
+        }
+        if (single) {
+            items.splice(0, items.length);
+        }
+        items.push(item);
+        onChange(name, items);
+    };
+
+    onRequestDelete = (text, idx) => {
+        const { name, onChange, value } = this.props;
+        const items = cloneDeep(value);
+        if (idx > -1 && idx < items.length) {
+            items.splice(idx, 1);
+            onChange(name, items);
+        }
+    };
+
+    /**
+     * Called by the InlineAddButton, when the data is ready
+     * @param chip
+     */
+    triggerChange(chip) {
+        // no additional checks needed, just append the new value to the list
+        const { name, onChange, sourceConfig, value } = this.props;
+        const items = _.cloneDeep(value);
+        if (find(items, { [sourceConfig.value]: chip[sourceConfig.value] })) {
+            return;
+        }
+        items.push(chip);
+        onChange(name, items);
+    }
+
+    onFocus = evt => {
+        this.loadInitialSource();
+        const placeholder = t(this.isNumericAttributeType() ? 'item.attributes.searchOrAddNumbericAttributeValue' : 'item.attributes.searchOrAddAttributeValue');
+        this.setState({ placeholder });
+        const { onFocus } = this.props;
+        onFocus && onFocus(evt);
+    };
+
+    onBlur = evt => {
+        const { onBlur } = this.props;
+        this.setState({ placeholder: null});
+        onBlur && onBlur(evt);
+    };
+
+    onInputEnterKey = evt => {
+        this.triggerChange({id: null, value: evt.target.value, translated_value: evt.target.value});
+    }
+
+    render() {
+        const { value, label, source, sourceConfig, openOnFocus, autoLoad } = this.props;
+        const { placeholder } = this.state;
+        const { onRequestAdd, onRequestDelete, onUpdateInput, onBlur, onFocus, onInputEnterKey } = this;
+
+        return (
+            <UIChipInput
+                floatingLabelText={label}
+                onBlur={onBlur}
+                onFocus={onFocus}
+                dataSource={source}
+                onInputValueChange={onUpdateInput}
+                dataSourceConfig={sourceConfig}
+                value={value}
+                handleChange={onRequestAdd}
+                onRequestDelete={onRequestDelete}
+                openOnFocus={openOnFocus}
+                filter={autoLoad === false ? Filters.defaultFilter : Filters.fuzzyFilter}
+                onInputEnterKey={onInputEnterKey}
+                resetOnInputEnterKey={true}
+                textFieldType={'number'}
+                placeholder={placeholder}
+            />
+        );
+    }
+}
+
+export default withAddButton(AttributeValueChip);

package/src/Components/FormFragments/InputArray.js

@@ -140,7 +140,11 @@ class InputArray extends Component {
         }
         const { schema } = this.props;
         schema.reset({ active: this });
-        this.setState({ selectedRow: false, showEditor: true, newItem: !this.state.newItem });
+        this.setState(state => ({
+            selectedRow: false,
+            showEditor: !this.isAddingDisabled(),
+            newItem: !state.newItem,
+        }));
     };
 
     isAddingDisabled() {
@@ -204,7 +208,9 @@ class InputArray extends Component {
                 {this.state.showEditor &&
                     (showPopup ? (
                         <Dialog open={true}>
-                            <div className="form">{fields.map((field, idx) => this.props.renderWrappedInput(field, idx))}</div>
+                            <div className="form">
+                                {fields.map((field, idx) => this.props.renderWrappedInput(field, idx))}
+                            </div>
                             <div className="overlay-actions">
                                 {newItem && (
                                     <RaisedButton

package/src/Components/FormFragments/index.js

@@ -26,10 +26,13 @@ import Value from './Value';
 export { Value };
 import HintText from './HintText';
 export { HintText };
+import AttributeValueChip from "./AttributeValueChip";
+export { AttributeValueChip };
 
 export default {
     Text,
     AutoComplete,
+    AttributeValueChip,
     Select,
     Checkbox,
     RadioGroup,

package/src/Components/LocalizedPriceTextField.js

@@ -33,7 +33,7 @@ export const LocalizedPriceTextField = ({
 
     const onChange = (name, value) => {
         // replace occurrences of (localized) decimal separator
-        let localizedValue = value.replace(new RegExp(altSeparator, 'g'), defaultSeparator);
+        let localizedValue = `${value}`.replace(new RegExp(altSeparator, 'g'), defaultSeparator);
 
         //  remove all letters etc.
         localizedValue = localizedValue.replace(new RegExp(`[^0-9\\${defaultSeparator}]`, 'g'), '');
@@ -48,9 +48,9 @@ export const LocalizedPriceTextField = ({
 
     const displayValue =
         localeSeparator === altSeparator
-            ? (value || '').replace(defaultSeparator, localeSeparator)
+            ? `${value || ''}`.replace(defaultSeparator, localeSeparator)
             : localeSeparator === defaultSeparator
-            ? (value || '').replace(altSeparator, localeSeparator)
+            ? `${value || ''}`.replace(altSeparator, localeSeparator)
             : value;
 
     return (
@@ -70,3 +70,5 @@ export const LocalizedPriceTextField = ({
         />
     );
 };
+
+export default LocalizedPriceTextField;

package/src/Components/LocalizedPriceValue.js

@@ -2,9 +2,11 @@ import React from 'react';
 import { connect } from 'react-redux';
 import get from 'lodash/get';
 
-let LocalizedPriceValue = ({data = '', decimalSeparators, language, defaultSeparator}) => {
-    const localeSeparator = get(decimalSeparators, language, defaultSeparator );
-    return (data && localeSeparator !== defaultSeparator) ? data.replace(defaultSeparator, localeSeparator) : data;
+let LocalizedPriceValue = ({ data = '', decimalSeparators, language, defaultSeparator }) => {
+    const localeSeparator = get(decimalSeparators, language, defaultSeparator);
+    return data && localeSeparator !== defaultSeparator
+        ? `${data}`.replace(defaultSeparator, localeSeparator)
+        : data;
 };
 
 const mapStateToProps = ({ i18n, language }) => ({

package/src/Screens/ImageGallery/Containers/Edit.js

@@ -6,6 +6,8 @@ import EditorPopup from '../../ImageGallery/ImageTags/TagsEditorPopup';
 import connect from 'react-redux/es/connect/connect';
 import generateConnectedEdit from '../../../Components/DefaultConnectedForm';
 import { T } from '../../../App/i18n';
+import LocalizedPriceTextField from '../../../Components/LocalizedPriceTextField';
+import LocalizedPriceValue from '../../../Components/LocalizedPriceValue';
 
 const formFields = [
     {
@@ -38,7 +40,50 @@ const formFields = [
         showFileName: true,
         warningMessage: T('UploadFailureMessage', {
             url: `<a href="http://svg.enshrined.co.uk/"
-        target="_blank">http://svg.enshrined.co.uk/</a>`})
+        target="_blank">http://svg.enshrined.co.uk/</a>`,
+        }),
+    },
+    {
+        name: 'prices',
+        label: 'Prices',
+        type: 'dynSource',
+        sourceConfig: {
+            text: ({ identifier, currency }) => `${identifier} / ${currency.symbol} (${currency.iso})`,
+        },
+        dynSource: {
+            type: 'tabs',
+            reducerName: IMAGE_GALLERY_REDUCER_NAME,
+            dataSource: 'channels',
+        },
+        tabs: {
+            filterValues: (channel, value) => +channel.id === +value.channel,
+            assignTabValue: (tabValue, data) => (data.channel = tabValue),
+            name: 'prices',
+            type: 'array',
+            layout: 'groups',
+            className: 'table',
+            array: {
+                columns: null,
+                disableAdd: ({ value }) => {
+                    // limit to one price item, since "amount from" is not available
+                    return value.length > 0;
+                },
+                fields: [
+                    {
+                        name: 'price',
+                        label: 'price',
+                        type: LocalizedPriceTextField,
+                        renderValue: value => <LocalizedPriceValue data={value} />,
+                    },
+                    {
+                        name: 'priceNet',
+                        label: 'price Net',
+                        type: LocalizedPriceTextField,
+                        renderValue: value => <LocalizedPriceValue data={value} />,
+                    },
+                ],
+            },
+        },
     },
 ];
 

package/src/Screens/ImageGallery/Reducers/Reducer.js

@@ -13,8 +13,25 @@ const initialState = {
             thumbUrl: '',
             texts: [],
             ...tagsDataStructure,
+            prices: {
+                value: [],
+                schema: {
+                    id: { value: null },
+                    price: { value: null, constraints: { presence: true, decimalPoint: true } },
+                    priceNet: { value: 0, constraints: { presence: true } },
+                    channel: { value: null, constraints: { presence: true } },
+                },
+            },
+        },
+        {
+            dependencies: [
+                {
+                    name: 'channels',
+                    dataKey: 'channels',
+                    source: 'channels',
+                },
+            ],
         },
-        null,
         IMAGE_GALLERY_DATA_KEY
     ),
     imageFile: null,

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

@@ -38,7 +38,6 @@ export default [
                                         property="translation"
                                         fallback={translated_value}
                                     />
-                                    <span> ({value})</span>
                                 </span>
                             ))}
                         </Join>
@@ -76,18 +75,17 @@ export default [
                     name: 'values',
                     label: 'Values',
                     type: 'dynSource',
-                    placeholderFocused: 'item.attributes.searchOrAddAttributeValue',
                     sourceConfig: {
                         value: 'value',
                         text: 'label',
                     },
                     dynSource: {
-                        type: 'chip',
+                        type: 'attributeValueChip',
                         listKey: 'attributevalues',
                         url: 'attributevalues',
                         autoLoad: false,
                         maxSearchResults: 25,
-                        mapItems: item => ({ ...item, label: `${item.translated_value} (${item.value})` }),
+                        mapItems: item => ({ ...item, label: item.value === item.translated_value ? item.translated_value : `${item.translated_value} (${item.value})` }),
                     },
                     openOnFocus: true,
                     addButton: isFeatureAvailable('attribute_values') && {

package/src/Screens/Item/Translations.js

@@ -40,7 +40,9 @@ require('../../App/i18n').use(
                     searchOrAddAttribute:
                         'Search for an existing attribute or add a new one by clicking on +',
                     searchOrAddAttributeValue:
-                        'Search for a existing value or add a new one by clicking on +',
+                        'Search for an existing value or add a new one by clicking on +',
+                    searchOrAddNumbericAttributeValue:
+                        'Search for an existing value or add a new with enter',
                 },
                 headline: 'This product is defined as follows:',
                 editorPopup: {
@@ -125,6 +127,8 @@ require('../../App/i18n').use(
                     addButtonLabel: 'Attribut hinzufügen',
                     searchOrAddAttribute: 'Suche ein vorhandenes Attribut oder lege ein neues mit dem + an',
                     searchOrAddAttributeValue: 'Suche einen Attributwert oder lege einen neuen mit dem + an',
+                    searchOrAddNumbericAttributeValue:
+                        'Suche einen Attributwert oder lege einen neuen mit der Eingabetaste an',
                 },
                 headline: 'Dieses Produkt ist folgendermaßen definiert:',
                 copyCreatorItemDialogTitle: 'Gewähltes Produkt kopieren',

package/src/UIComponents/ChipInput.js

@@ -30,6 +30,17 @@ const styles = theme => ({
     },
     inputRoot: {
         flexWrap: 'wrap',
+        '& input[type=number]': {
+            '-moz-appearance': 'textfield'
+        },
+        '& input[type=number]::-webkit-outer-spin-button': {
+            '-webkit-appearance': 'none',
+            margin: 0
+        },
+        '& input[type=number]::-webkit-inner-spin-button': {
+            '-webkit-appearance': 'none',
+            margin: 0
+        }
     },
     inputInput: {
         flexGrow: 1,
@@ -110,6 +121,9 @@ class ChipInput extends React.Component {
             onFocus,
             placeholder,
             filter,
+            onInputEnterKey,
+            resetOnInputEnterKey,
+            textFieldType,
         } = this.props;
         const { selectedItem, inputValue } = this.state;
         const textLabel = floatingLabelText;
@@ -143,6 +157,15 @@ class ChipInput extends React.Component {
                                     onFocus,
                                 }),
                                 classes,
+                                type: textFieldType,
+                                onKeyDown: (evt) => {
+                                    if (!highlightedIndex && onInputEnterKey && evt.keyCode === 13) {
+                                        onInputEnterKey(evt);
+                                        if (resetOnInputEnterKey) {
+                                            this.setState({ inputValue: '' });
+                                        }
+                                    }
+                                }
                             })}
 
                             {isOpen ? (