@configuratorware/configurator-admingui 1.48.7 → 1.48.8

package/App/Data.js

@@ -32,6 +32,12 @@ _validate.validate.validators.emptyOrPositive = function (value, options) {
   }
   return (0, _i18n.t)('customValidators.numericality');
 };
+_validate.validate.validators.positiveNumber = function (value, options) {
+  if (options && !isNaN(+value) && +value > 0) {
+    return null;
+  }
+  return (0, _i18n.t)((options === null || options === void 0 ? void 0 : options.message) || 'customValidators.numericality');
+};
 _validate.validate.validators.numericOrEmpty = function (value, options) {
   if (value === '' || value === null) {
     return null;
@@ -229,7 +235,8 @@ var Data = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "validate",
     value: function validate() {
-      var isValid = this._validator.validate();
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var isValid = this._validator.validate(options);
       this._trigger(Data.EventTypes.validate, {
         isValid: isValid
       });
@@ -304,6 +311,7 @@ var DataValidator = exports.DataValidator = /*#__PURE__*/function () {
   }, {
     key: "validate",
     value: function validate() {
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var isValid = true;
       for (var prop in this._data) {
         var dataSchema = _lodash["default"].get(this._data[prop], 'schema');
@@ -311,7 +319,10 @@ var DataValidator = exports.DataValidator = /*#__PURE__*/function () {
           isValid = dataSchema.validate() && isValid;
         }
       }
-      isValid = validateDataObject(this._data) && isValid;
+      var valueObject = options.valueObject,
+        idx = options.idx,
+        dataArr = options.dataArr;
+      isValid = validateDataObject(this._data, valueObject, idx, dataArr) && isValid;
       this._validation.isDone = true;
       return isValid;
     }
@@ -334,13 +345,38 @@ var DataValidator = exports.DataValidator = /*#__PURE__*/function () {
   }]);
   return DataValidator;
 }();
-var validateField = function validateField(prop, valueToValidate, idx) {
+var prepareConstraints = function prepareConstraints() {
+  var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  if (!options.prop.constraints) {
+    return null;
+  }
+  var constraints = _objectSpread({}, options.prop.constraints);
+  Object.keys(constraints).forEach(function (key) {
+    if (constraints[key].applyIf && !constraints[key].applyIf(options)) {
+      delete constraints[key];
+    }
+  });
+  return constraints;
+};
+var validateField = function validateField(prop, valueToValidate, idx, dataArr, dataObject) {
   var valid = true;
   if (prop.constraints) {
-    var result = _validate.validate.single(valueToValidate, prop.constraints);
-    if (idx !== undefined) {
-      prop.error = prop.error || [];
-      prop.error[idx] = result ? result.join(', ') : undefined;
+    var constraints = prepareConstraints({
+      prop: prop,
+      valueToValidate: valueToValidate,
+      idx: idx,
+      dataArr: dataArr,
+      dataObject: dataObject
+    });
+    if (!constraints) {
+      return valid;
+    }
+    var result = _validate.validate.single(valueToValidate, constraints);
+    if (Number.isInteger(idx) && idx >= 0) {
+      if (result) {
+        prop.error = prop.error || [];
+        prop.error[idx] = result ? result.join(', ') : undefined;
+      }
     } else {
       if (result) {
         prop.error = result.join(', ');
@@ -352,17 +388,22 @@ var validateField = function validateField(prop, valueToValidate, idx) {
   }
   return valid;
 };
-var validateDataObject = exports.validateDataObject = function validateDataObject(dataObject, valueObject, idx) {
+var validateDataObject = exports.validateDataObject = function validateDataObject(dataObject, valueObject, idx, dataArr) {
   var valid = true;
   var _loop2 = function _loop2() {
     var prop = dataObject[p];
+    prop.beforeValidate && prop.beforeValidate({
+      prop: prop,
+      idx: idx,
+      dataArr: dataArr
+    });
     var valueToValidate = valueObject ? valueObject[p] : prop.value;
-    valid = validateField(prop, valueToValidate, idx) && valid;
+    valid = validateField(prop, valueToValidate, idx, dataArr || prop.value, dataObject) && valid;
     if (prop.schema) {
       if (_lodash["default"].isArray(prop.value)) {
         // validate all values against the schema rules
         prop.value.forEach(function (value, idx) {
-          valid = validateDataObject(prop.schema, value, idx) && valid;
+          valid = validateDataObject(prop.schema, value, idx, prop.value) && valid;
         });
       } else if (prop.value === null) {
         // skip validation, if the value is null

package/Components/FormFragments/InputArray.js

@@ -72,7 +72,11 @@ var InputArray = /*#__PURE__*/function (_Component) {
         updateOnly = _options$updateOnly === void 0 ? false : _options$updateOnly;
       var selectedRow = _this.state.selectedRow;
       var schema = _this.props.schema;
-      if (schema.validate()) {
+      var dataArr = _this.props.value instanceof Array ? _this.props.value : undefined;
+      if (schema.validate({
+        dataArr: dataArr,
+        idx: selectedRow
+      })) {
         var value = _lodash["default"].isArray(_this.props.value) ? _this.props.value : [];
         var data = schema.getData();
         var updateOnPropertyMatch = _lodash["default"].get(_this.props, 'array.updateOnPropertyMatch');
@@ -99,13 +103,18 @@ var InputArray = /*#__PURE__*/function (_Component) {
           schema.reset();
           _this.setState({
             selectedRow: false,
-            showEditor: false
+            showEditor: false,
+            validationErrors: false
           });
         }
         return true;
       } else {
+        var validationErrors = schema.getErrors();
         // eslint-disable-next-line no-console
-        console.error('Validation error!', schema.getErrors());
+        console.error('Validation error!', validationErrors);
+        _this.setState({
+          validationErrors: validationErrors
+        });
       }
       return false;
     });
@@ -115,7 +124,8 @@ var InputArray = /*#__PURE__*/function (_Component) {
       _this.setState({
         selectedRow: false,
         showEditor: false,
-        newItem: false
+        newItem: false,
+        validationErrors: false
       });
     });
     _defineProperty(_assertThisInitialized(_this), "onDelete", function (row) {
@@ -128,7 +138,8 @@ var InputArray = /*#__PURE__*/function (_Component) {
       schema.reset();
       _this.setState({
         selectedRow: false,
-        showEditor: false
+        showEditor: false,
+        validationErrors: false
       });
     });
     _defineProperty(_assertThisInitialized(_this), "addNewItem", function () {
@@ -171,7 +182,8 @@ var InputArray = /*#__PURE__*/function (_Component) {
     _this.state = {
       showEditor: false,
       selectedRow: false,
-      newItem: false
+      newItem: false,
+      validationErrors: false
     };
     return _this;
   }
@@ -184,7 +196,8 @@ var InputArray = /*#__PURE__*/function (_Component) {
         var event = _ref.event;
         return event.active !== _this2 && _this2.setState({
           selectedRow: false,
-          showEditor: false
+          showEditor: false,
+          validationErrors: false
         });
       });
       this.props.setChangeListener(function () {
@@ -223,7 +236,6 @@ var InputArray = /*#__PURE__*/function (_Component) {
         label = _this$props3.label,
         array = _this$props3.array,
         value = _this$props3.value,
-        errors = _this$props3.errors,
         _this$props3$buttonsP = _this$props3.buttonsPosition,
         buttonsPosition = _this$props3$buttonsP === void 0 ? '' : _this$props3$buttonsP,
         _this$props3$showPopu = _this$props3.showPopup,
@@ -231,9 +243,12 @@ var InputArray = /*#__PURE__*/function (_Component) {
       var fields = array.fields,
         disableDelete = array.disableDelete,
         disableEdit = array.disableEdit;
-      var newItem = this.state.newItem;
+      var _this$state = this.state,
+        newItem = _this$state.newItem,
+        validationErrors = _this$state.validationErrors;
       var columns = array.columns || fields;
       var selectedRows = this.state.selectedRow === false ? [] : [this.state.selectedRow];
+      var errors = validationErrors !== null && validationErrors !== void 0 && validationErrors.length ? validationErrors : this.props.errors;
       return /*#__PURE__*/_react["default"].createElement("div", null, label && /*#__PURE__*/_react["default"].createElement("div", {
         className: "label"
       }, label), buttonsPosition === 'top' && /*#__PURE__*/_react["default"].createElement("div", {

package/Components/FormFragments/SimpleTable.js

@@ -205,7 +205,8 @@ var SimpleTable = /*#__PURE__*/function (_Component) {
         displayRowCheckbox: false,
         ref: "tableBody"
       }, data.map(function (row, index) {
-        var style = _lodash["default"].isArray(errors) && errors.length ? {
+        var _this2$state$selected;
+        var style = _lodash["default"].isArray(errors) && errors.length && (_this2$state$selected = _this2.state.selectedRows) !== null && _this2$state$selected !== void 0 && _this2$state$selected.includes(index) ? {
           background: 'red'
         } : {};
         return /*#__PURE__*/_react["default"].createElement(_Table.TableRow, {

package/Screens/Item/Reducers/ItemReducer.js

@@ -55,7 +55,24 @@ var initialState = _objectSpread({}, (0, _Reducer.getDefaultEntityState)(_object
         value: null
       },
       amountfrom: {
-        value: 0
+        value: 0,
+        beforeValidate: function beforeValidate(_ref) {
+          var prop = _ref.prop,
+            dataArr = _ref.dataArr;
+          if ((dataArr === null || dataArr === void 0 ? void 0 : dataArr.length) === 0 && !prop.value) {
+            prop.value = 1;
+          }
+        },
+        constraints: {
+          positiveNumber: {
+            message: 'item.prices.validation.amountFromRequired',
+            applyIf: function applyIf(_ref2) {
+              var dataArr = _ref2.dataArr,
+                dataObject = _ref2.dataObject;
+              return (dataArr === null || dataArr === void 0 ? void 0 : dataArr.length) && (dataObject.price.value || dataObject.priceNet.value);
+            }
+          }
+        }
       }
     }
   },

package/Screens/Item/Translations.js

@@ -19,8 +19,8 @@ require("../../App/i18n").use({
     editDialogHint: 'Use the checkboxes to select one or more entries in the list</br>and then click this icon to set the item status for them.',
     ItemClassifications: 'Product categories',
     visualizationData: {
-      '2d': "2D",
-      '3d': "3D",
+      '2d': '2D',
+      '3d': '3D',
       '2doverlay': '2D image in the foreground',
       visualizationComponent: 'Visualization component'
     },
@@ -32,7 +32,10 @@ require("../../App/i18n").use({
     item: {
       addButtonLabel: 'Add item',
       prices: {
-        addButtonLabel: 'Add price'
+        addButtonLabel: 'Add price',
+        validation: {
+          amountFromRequired: 'Please add an amount from value'
+        }
       },
       attributes: {
         addButtonLabel: 'Add attribute',
@@ -108,8 +111,8 @@ require("../../App/i18n").use({
     editDialogHint: 'Nutze die Checkboxen in der Liste und klicke dann dieses Icon,</br>um den Status für einen oder mehrere Einträge zu setzen.',
     ItemClassifications: 'Produktkategorien',
     visualizationData: {
-      '2d': "2D",
-      '3d': "3D",
+      '2d': '2D',
+      '3d': '3D',
       '2doverlay': '2D, Bild im Vordergrund',
       visualizationComponent: 'Visualisierungskomponente'
     },
@@ -121,7 +124,10 @@ require("../../App/i18n").use({
     item: {
       addButtonLabel: 'Produkt hinzufügen',
       prices: {
-        addButtonLabel: 'Preis hinzufügen'
+        addButtonLabel: 'Preis hinzufügen',
+        validation: {
+          amountFromRequired: 'Bitte geben Sie den Wert "Menge ab" ein'
+        }
       },
       attributes: {
         addButtonLabel: 'Attribut hinzufügen',

package/Screens/Option/Reducers/Reducer.js

@@ -56,7 +56,24 @@ var initialState = _objectSpread({}, (0, _Reducer.getDefaultEntityState)(_object
         value: null
       },
       amountfrom: {
-        value: 0
+        value: 0,
+        beforeValidate: function beforeValidate(_ref) {
+          var prop = _ref.prop,
+            dataArr = _ref.dataArr;
+          if ((dataArr === null || dataArr === void 0 ? void 0 : dataArr.length) === 0 && !prop.value) {
+            prop.value = 1;
+          }
+        },
+        constraints: {
+          positiveNumber: {
+            message: 'item.prices.validation.amountFromRequired',
+            applyIf: function applyIf(_ref2) {
+              var dataArr = _ref2.dataArr,
+                dataObject = _ref2.dataObject;
+              return (dataArr === null || dataArr === void 0 ? void 0 : dataArr.length) && (dataObject.price.value || dataObject.priceNet.value);
+            }
+          }
+        }
       }
     }
   },

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@configuratorware/configurator-admingui",
-  "version": "1.48.7",
+  "version": "1.48.8",
   "license": "UNLICENSED",
   "private": false,
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
-    "@configuratorware/scripts": "1.48.7",
+    "@configuratorware/scripts": "1.48.8",
     "@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.48.7",
+    "redhotmagma-visualization": "1.48.8",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",