@crystaldesign/diva-seller 24.10.0-beta.16 → 24.10.0-beta.18

package/build/esm/index.js

@@ -12309,10 +12309,31 @@ function addBasket(prevState, basket, productData) {
 function updateVariants(prevState, currentState, configurationData, baseDataFields, classificationConfig, availableLanguages) {
   var newVarinatList = [];
   var newModifiedList = [];
-  for (var i = 0; i < prevState.variantData.length; i++) {
+  var customBaseFields = [];
+  if (baseDataFields.some(function (field) {
+    return field.manualFields && field.field == 'customData';
+  }) && currentState.baseData.customData) {
+    var manualFields = Object.entries(currentState.baseData.customData).filter(function (_ref9) {
+      var _ref10 = _slicedToArray(_ref9, 2);
+        _ref10[0];
+        var valueObj = _ref10[1];
+      return valueObj.manual;
+    });
+    for (var i = 0; i < manualFields.length; i++) {
+      customBaseFields.push({
+        field: manualFields[i][0],
+        type: 'string',
+        title: "productcreator.fields.".concat(manualFields[i][0]),
+        fieldType: 'BASE',
+        custom: true
+      });
+    }
+  }
+  baseDataFields = [].concat(_toConsumableArray(baseDataFields), customBaseFields);
+  for (var _i = 0; _i < prevState.variantData.length; _i++) {
     var _currentState$modifie6, _configurationData$Pr3, _currentState$modifie7;
-    var variant = prevState.variantData[i];
-    var newVariant = currentState.variantData[i];
+    var variant = prevState.variantData[_i];
+    var newVariant = currentState.variantData[_i];
     var finalVariant = _objectSpread$a({}, variant);
     var newModified = {};
     var _iterator = _createForOfIteratorHelper$3(prevState.classificationFields || []),
@@ -12321,7 +12342,7 @@ function updateVariants(prevState, currentState, configurationData, baseDataFiel
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         var _currentState$modifie8;
         var _field2 = _step.value.field;
-        var _ProductHandler$calcu6 = ProductHandler.calculateComputedValue(variant[_field2], newVariant === null || newVariant === void 0 ? void 0 : newVariant[_field2], currentState.classificationData[_field2], (_currentState$modifie8 = currentState.modified.variantData[i]) === null || _currentState$modifie8 === void 0 ? void 0 : _currentState$modifie8[_field2]),
+        var _ProductHandler$calcu6 = ProductHandler.calculateComputedValue(variant[_field2], newVariant === null || newVariant === void 0 ? void 0 : newVariant[_field2], currentState.classificationData[_field2], (_currentState$modifie8 = currentState.modified.variantData[_i]) === null || _currentState$modifie8 === void 0 ? void 0 : _currentState$modifie8[_field2]),
           _value6 = _ProductHandler$calcu6.value,
           _modified6 = _ProductHandler$calcu6.modified;
         finalVariant[_field2] = _value6;
@@ -12341,13 +12362,13 @@ function updateVariants(prevState, currentState, configurationData, baseDataFiel
       var _loop = function _loop() {
         var fieldgroup = _step2.value.fieldgroup;
         if (fieldgroup) {
-          var _loop2 = function _loop2(_i) {
+          var _loop2 = function _loop2(_i2) {
             if (allBaseFields.findIndex(function (f) {
-              return f.field == fieldgroup[_i].field;
-            }) === -1) allBaseFields.push(fieldgroup[_i]);
+              return f.field == fieldgroup[_i2].field;
+            }) === -1) allBaseFields.push(fieldgroup[_i2]);
           };
-          for (var _i = 0; _i < fieldgroup.length; _i++) {
-            _loop2(_i);
+          for (var _i2 = 0; _i2 < fieldgroup.length; _i2++) {
+            _loop2(_i2);
           }
         }
       };
@@ -12362,12 +12383,12 @@ function updateVariants(prevState, currentState, configurationData, baseDataFiel
     for (var j = 0; j < allBaseFields.length; j++) {
       var field = allBaseFields[j].field;
       var custom = allBaseFields[j].custom;
-      if (field == 'shortDescription') {
+      if (field == 'shortDescription' || field == ' customData') {
         //updated shortDescription as last value
         continue;
       } else if (field == 'addedPrice' || field == 'calculatedPrice') {
         var _currentState$modifie;
-        var _ProductHandler$calcu = ProductHandler.calculateComputedValue(variant[field], newVariant === null || newVariant === void 0 ? void 0 : newVariant[field], currentState.baseData[field], (_currentState$modifie = currentState.modified.variantData[i]) === null || _currentState$modifie === void 0 ? void 0 : _currentState$modifie[field]),
+        var _ProductHandler$calcu = ProductHandler.calculateComputedValue(variant[field], newVariant === null || newVariant === void 0 ? void 0 : newVariant[field], currentState.baseData[field], (_currentState$modifie = currentState.modified.variantData[_i]) === null || _currentState$modifie === void 0 ? void 0 : _currentState$modifie[field]),
           _value = _ProductHandler$calcu.value,
           _modified = _ProductHandler$calcu.modified;
         finalVariant[field] = _value;
@@ -12379,7 +12400,7 @@ function updateVariants(prevState, currentState, configurationData, baseDataFiel
         var flatNewVarinat = newVariant ? flatten(newVariant) : {};
         var flatFinalVariant = flatten(finalVariant);
         var flatBase = flatten(currentState.baseData);
-        var _ProductHandler$calcu2 = ProductHandler.calculateComputedValue(flatVarinat[field], flatNewVarinat[field], flatBase[field], (_currentState$modifie2 = currentState.modified.variantData[i]) === null || _currentState$modifie2 === void 0 ? void 0 : _currentState$modifie2[field]),
+        var _ProductHandler$calcu2 = ProductHandler.calculateComputedValue(flatVarinat[field], flatNewVarinat[field], flatBase[field], (_currentState$modifie2 = currentState.modified.variantData[_i]) === null || _currentState$modifie2 === void 0 ? void 0 : _currentState$modifie2[field]),
           _value2 = _ProductHandler$calcu2.value,
           _modified2 = _ProductHandler$calcu2.modified;
         flatFinalVariant[field] = _value2;
@@ -12388,7 +12409,7 @@ function updateVariants(prevState, currentState, configurationData, baseDataFiel
         newModified[field] = _modified2;
       } else if (custom) {
         var _variant$customData, _newVariant$customDat, _currentState$baseDat, _currentState$modifie3;
-        var _ProductHandler$calcu3 = ProductHandler.calculateComputedValue(variant === null || variant === void 0 || (_variant$customData = variant.customData) === null || _variant$customData === void 0 ? void 0 : _variant$customData[field], newVariant === null || newVariant === void 0 || (_newVariant$customDat = newVariant.customData) === null || _newVariant$customDat === void 0 ? void 0 : _newVariant$customDat[field], (_currentState$baseDat = currentState.baseData.customData) === null || _currentState$baseDat === void 0 ? void 0 : _currentState$baseDat[field], (_currentState$modifie3 = currentState.modified.variantData[i]) === null || _currentState$modifie3 === void 0 ? void 0 : _currentState$modifie3['customData.' + field]),
+        var _ProductHandler$calcu3 = ProductHandler.calculateComputedValue(variant === null || variant === void 0 || (_variant$customData = variant.customData) === null || _variant$customData === void 0 ? void 0 : _variant$customData[field], newVariant === null || newVariant === void 0 || (_newVariant$customDat = newVariant.customData) === null || _newVariant$customDat === void 0 ? void 0 : _newVariant$customDat[field], (_currentState$baseDat = currentState.baseData.customData) === null || _currentState$baseDat === void 0 ? void 0 : _currentState$baseDat[field], (_currentState$modifie3 = currentState.modified.variantData[_i]) === null || _currentState$modifie3 === void 0 ? void 0 : _currentState$modifie3['customData.' + field]),
           _value3 = _ProductHandler$calcu3.value,
           _modified3 = _ProductHandler$calcu3.modified;
         if (!finalVariant.customData) {
@@ -12403,7 +12424,7 @@ function updateVariants(prevState, currentState, configurationData, baseDataFiel
         for (var m = 0; m < availableLanguages.length; m++) {
           var _variant$field, _newVariant$field, _field, _currentState$modifie4;
           var lang = availableLanguages[m];
-          var _ProductHandler$calcu4 = ProductHandler.calculateComputedValue((_variant$field = variant[field]) === null || _variant$field === void 0 ? void 0 : _variant$field[lang], newVariant === null || newVariant === void 0 || (_newVariant$field = newVariant[field]) === null || _newVariant$field === void 0 ? void 0 : _newVariant$field[lang], (_field = currentState.baseData[field]) === null || _field === void 0 ? void 0 : _field[lang], (_currentState$modifie4 = currentState.modified.variantData[i]) === null || _currentState$modifie4 === void 0 ? void 0 : _currentState$modifie4[field]),
+          var _ProductHandler$calcu4 = ProductHandler.calculateComputedValue((_variant$field = variant[field]) === null || _variant$field === void 0 ? void 0 : _variant$field[lang], newVariant === null || newVariant === void 0 || (_newVariant$field = newVariant[field]) === null || _newVariant$field === void 0 ? void 0 : _newVariant$field[lang], (_field = currentState.baseData[field]) === null || _field === void 0 ? void 0 : _field[lang], (_currentState$modifie4 = currentState.modified.variantData[_i]) === null || _currentState$modifie4 === void 0 ? void 0 : _currentState$modifie4[field]),
             _value4 = _ProductHandler$calcu4.value,
             _modified4 = _ProductHandler$calcu4.modified;
           if (_value4 !== undefined) valTotal[lang] = _value4;
@@ -12413,7 +12434,7 @@ function updateVariants(prevState, currentState, configurationData, baseDataFiel
         newModified[field] = modTotal;
       } else {
         var _currentState$modifie5;
-        var _ProductHandler$calcu5 = ProductHandler.calculateComputedValue(variant[field], newVariant === null || newVariant === void 0 ? void 0 : newVariant[field], currentState.baseData[field], (_currentState$modifie5 = currentState.modified.variantData[i]) === null || _currentState$modifie5 === void 0 ? void 0 : _currentState$modifie5[field]),
+        var _ProductHandler$calcu5 = ProductHandler.calculateComputedValue(variant[field], newVariant === null || newVariant === void 0 ? void 0 : newVariant[field], currentState.baseData[field], (_currentState$modifie5 = currentState.modified.variantData[_i]) === null || _currentState$modifie5 === void 0 ? void 0 : _currentState$modifie5[field]),
           _value5 = _ProductHandler$calcu5.value,
           _modified5 = _ProductHandler$calcu5.modified;
         finalVariant[field] = _value5;
@@ -12424,11 +12445,11 @@ function updateVariants(prevState, currentState, configurationData, baseDataFiel
     //as long as shortDescription is not modified by user, autocalc it
     var _ProductHandler$calcS = ProductHandler.calcShortDescription(variant.shortDescription, ProductHandler.assign({}, currentState.baseData, currentState.classificationData, finalVariant, {
         shortDescription: newVariant.shortDescription
-      }), (_currentState$modifie6 = currentState.modified.variantData[i]) === null || _currentState$modifie6 === void 0 ? void 0 : _currentState$modifie6['shortDescription'], (_configurationData$Pr3 = configurationData.ProductCreator) === null || _configurationData$Pr3 === void 0 ? void 0 : _configurationData$Pr3.fields, classificationConfig),
+      }), (_currentState$modifie6 = currentState.modified.variantData[_i]) === null || _currentState$modifie6 === void 0 ? void 0 : _currentState$modifie6['shortDescription'], (_configurationData$Pr3 = configurationData.ProductCreator) === null || _configurationData$Pr3 === void 0 ? void 0 : _configurationData$Pr3.fields, classificationConfig),
       value = _ProductHandler$calcS.value,
       modified = _ProductHandler$calcS.modified;
     //if the shortDescription of the varinat is not modified, but that of the baseData is, use the value of baseData
-    if (!modified && (currentState.modified.shortDescription || prevState.baseData.shortDescription !== ((_currentState$modifie7 = currentState.modified.variantData[i]) === null || _currentState$modifie7 === void 0 ? void 0 : _currentState$modifie7['shortDescription']))) {
+    if (!modified && (currentState.modified.shortDescription || prevState.baseData.shortDescription !== ((_currentState$modifie7 = currentState.modified.variantData[_i]) === null || _currentState$modifie7 === void 0 ? void 0 : _currentState$modifie7['shortDescription']))) {
       finalVariant.shortDescription = currentState.baseData.shortDescription;
       newModified.shortDescription = false;
     } else {
@@ -12579,10 +12600,10 @@ function updateOptMap(currentState, optMap, mediaService, jwt) {
         LOG$5.debug("Product ".concat(product._id, " has no class mapping for OPT ").concat(optField.field));
         return;
       }
-      var className = (_optMapEntries$find = optMapEntries.find(function (_ref9) {
-        var _ref10 = _slicedToArray(_ref9, 2);
-          _ref10[0];
-          var optValueField = _ref10[1];
+      var className = (_optMapEntries$find = optMapEntries.find(function (_ref11) {
+        var _ref12 = _slicedToArray(_ref11, 2);
+          _ref12[0];
+          var optValueField = _ref12[1];
         return (optValueField === null || optValueField === void 0 ? void 0 : optValueField.field) == optField.field;
       })) === null || _optMapEntries$find === void 0 ? void 0 : _optMapEntries$find[0];
       if (!className) {
@@ -12703,9 +12724,9 @@ function removeMedia(currentState, data, variants) {
       return m.url == data.url;
     });
     if (product.media && index != undefined) {
-      var _ref11;
+      var _ref13;
       var deleted = product.media.splice(index, 1);
-      (_ref11 = newState.removedMedia).push.apply(_ref11, _toConsumableArray(deleted));
+      (_ref13 = newState.removedMedia).push.apply(_ref13, _toConsumableArray(deleted));
     }
   });
   return newState;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crystaldesign/diva-seller",
-  "version": "24.10.0-beta.16",
+  "version": "24.10.0-beta.18",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -35,9 +35,9 @@
     "react-i18next": "^11.7.0"
   },
   "dependencies": {
-    "@crystaldesign/analytics": "24.10.0-beta.16",
-    "@crystaldesign/products-component": "24.10.0-beta.16",
-    "@crystaldesign/real-time-viewer": "24.10.0-beta.16",
+    "@crystaldesign/analytics": "24.10.0-beta.18",
+    "@crystaldesign/products-component": "24.10.0-beta.18",
+    "@crystaldesign/real-time-viewer": "24.10.0-beta.18",
     "@tinymce/tinymce-react": "^3.13.0",
     "react-error-boundary": "^4.0.13",
     "react-material-ui-carousel": "^2.1.1",
@@ -45,5 +45,5 @@
   },
   "types": "./build/types/seller/src/index.d.ts",
   "module": "build/esm/index.js",
-  "gitHead": "86432ce90ef3556b45b718725ce47374a1548f43"
+  "gitHead": "3036ef2a8c69377db55bbd68b75ec558f20805e4"
 }