@crystaldesign/diva-seller 26.4.0-beta.2 → 26.4.0-beta.21

package/build/esm/index.js

@@ -12577,7 +12577,7 @@ function useProductState (basket, divaNr) {
   }, [updateCategoriesInternal, state]);
   var save = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-      var _state$classification, data, params, _productHandler$close, _savedProducts, _productHandler$close2, _productHandler$close3, savedProducts, _ref2, _e$message;
+      var _state$classification, isExternalSave, isBaseConfigUseCase, showSyncEKTextModal, originProduct, syncEKText, data, params, _productHandler$close, _savedProducts, _productHandler$close2, _productHandler$close3, savedProducts, _ref2, _e$message;
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -12588,12 +12588,51 @@ function useProductState (basket, divaNr) {
             return _context2.abrupt("return");
           case 2:
             _context2.prev = 2;
+            isExternalSave = !!originProductId || sendProductsToExternalService;
+            isBaseConfigUseCase = !!originProductId || forceTab === 'BASECONFIG';
+            showSyncEKTextModal = false;
+            if (!(isExternalSave && isBaseConfigUseCase && originProductId)) {
+              _context2.next = 11;
+              break;
+            }
+            _context2.next = 9;
+            return productHandler.apiGetProducts(originProductId);
+          case 9:
+            originProduct = _context2.sent[0];
+            if (originProduct.retailerArticleNr == undefined) {
+              showSyncEKTextModal = true;
+            }
+          case 11:
+            if (!showSyncEKTextModal) {
+              _context2.next = 17;
+              break;
+            }
+            _context2.next = 14;
+            return new Promise(function (resolve) {
+              openModal({
+                accept: t('modals.yes'),
+                reject: t('modals.no'),
+                title: t('productcreator.syncEKText.title', 'EK Text übernehmen'),
+                text: t('productcreator.syncEKText.text', 'Soll der EK Text in den Artikelübernommen werden?'),
+                callback: function callback(confirmed) {
+                  return resolve(!!confirmed);
+                }
+              });
+            });
+          case 14:
+            _context2.t0 = _context2.sent;
+            _context2.next = 18;
+            break;
+          case 17:
+            _context2.t0 = false;
+          case 18:
+            syncEKText = _context2.t0;
             openModal({
               progress: 0.05,
               title: t('productcreator.savebasket'),
               dontRenderForm: true
             });
-            _context2.next = 6;
+            _context2.next = 22;
             return productHandler.prepareData({
               basket: basket,
               baseData: state.baseData,
@@ -12613,95 +12652,96 @@ function useProductState (basket, divaNr) {
               optMap: state.optClassMap,
               originProductId: originProductId
             });
-          case 6:
+          case 22:
             data = _context2.sent;
             setIsNew(false);
             if (!(originProductId || sendProductsToExternalService)) {
-              _context2.next = 35;
+              _context2.next = 51;
               break;
             }
             params = {
               products: data.products,
               removedProductIds: data.removedProducts,
-              parentProductId: originProductId ? originProductId : undefined
+              parentProductId: originProductId ? originProductId : undefined,
+              syncEKText: syncEKText
             };
             if (!(clientArticleHandler !== null && clientArticleHandler !== void 0 && clientArticleHandler.clientArticleService)) {
-              _context2.next = 30;
+              _context2.next = 46;
               break;
             }
-            _context2.prev = 11;
-            _context2.next = 14;
+            _context2.prev = 27;
+            _context2.next = 30;
             return clientArticleHandler.saveProductsSMArticles(params, clientArticleHandler.clientArticleService, organization._id);
-          case 14:
+          case 30:
             _savedProducts = _context2.sent;
             (_productHandler$close = productHandler.closeModal) === null || _productHandler$close === void 0 || _productHandler$close.call(productHandler);
-            _context2.next = 18;
+            _context2.next = 34;
             return reset(currentBasketState === null || currentBasketState === void 0 ? void 0 : currentBasketState.basket, _savedProducts);
-          case 18:
+          case 34:
             if (originProductId) clearOriginProductId();
             return _context2.abrupt("return", true);
-          case 22:
-            _context2.prev = 22;
-            _context2.t0 = _context2["catch"](11);
+          case 38:
+            _context2.prev = 38;
+            _context2.t1 = _context2["catch"](27);
             (_productHandler$close2 = productHandler.closeModal) === null || _productHandler$close2 === void 0 || _productHandler$close2.call(productHandler);
-            _context2.next = 27;
+            _context2.next = 43;
             return reset(currentBasketState === null || currentBasketState === void 0 ? void 0 : currentBasketState.basket);
-          case 27:
-            throw new Error(_context2.t0.message);
-          case 28:
-            _context2.next = 35;
+          case 43:
+            throw new Error(_context2.t1.message);
+          case 44:
+            _context2.next = 51;
             break;
-          case 30:
+          case 46:
             (_productHandler$close3 = productHandler.closeModal) === null || _productHandler$close3 === void 0 || _productHandler$close3.call(productHandler);
             if (originProductId) clearOriginProductId();
             LOG$3.error(new DivaError$1("Articles cannot be saved - ClientArticleService or JWT not set"));
             setError(t('modal.general_error') + ' ' + t('modal.errorcode') + ':' + DivaUtils.getCurrentTraceId() + ' ' + DivaUtils.formatDate(new Date(), true, undefined, true));
             return _context2.abrupt("return", false);
-          case 35:
-            _context2.next = 37;
+          case 51:
+            _context2.next = 53;
             return productHandler.saveProducts(_objectSpread$5(_objectSpread$5({}, data), {}, {
               awaitPDF: undefined
             }));
-          case 37:
+          case 53:
             savedProducts = _context2.sent;
-            _context2.next = 40;
+            _context2.next = 56;
             return reset(currentBasketState === null || currentBasketState === void 0 ? void 0 : currentBasketState.basket, savedProducts);
-          case 40:
+          case 56:
             return _context2.abrupt("return", true);
-          case 43:
-            _context2.prev = 43;
-            _context2.t1 = _context2["catch"](2);
+          case 59:
+            _context2.prev = 59;
+            _context2.t2 = _context2["catch"](2);
             LOG$3.error(new DivaError$1("Error saving product", {
               code: 'PROD_0002',
-              cause: _context2.t1
+              cause: _context2.t2
             }));
-            if (Number(_context2.t1.message) === 413) {
+            if (Number(_context2.t2.message) === 413) {
               setError(t('modal.error_payload_to_big'));
             } else {
               setError(t('modal.general_error') + ' ' + t('modal.errorcode') + ':' + DivaUtils.getCurrentTraceId() + ' ' + DivaUtils.formatDate(new Date(), true, undefined, true));
             }
-            if (!(_context2.t1.message.includes('PRODSM_0001') || _context2.t1.errorCode == 'PRODSM_0001')) {
-              _context2.next = 52;
+            if (!(_context2.t2.message.includes('PRODSM_0001') || _context2.t2.errorCode == 'PRODSM_0001')) {
+              _context2.next = 68;
               break;
             }
             openModal({
               title: t('productcreator.errorsavingsmarticle', 'Error saving SM-Article'),
-              text: (_ref2 = (_e$message = _context2.t1.message) !== null && _e$message !== void 0 ? _e$message : _context2.t1.error) !== null && _ref2 !== void 0 ? _ref2 : 'Error saving SM-Article',
+              text: (_ref2 = (_e$message = _context2.t2.message) !== null && _e$message !== void 0 ? _e$message : _context2.t2.error) !== null && _ref2 !== void 0 ? _ref2 : 'Error saving SM-Article',
               accept: true
             });
             return _context2.abrupt("return", false);
-          case 52:
+          case 68:
             openModal({
               title: t('errorcodes._source.labels.error.SELLER_0002'),
               text: t('grid.error'),
               accept: true
             });
             return _context2.abrupt("return", false);
-          case 54:
+          case 70:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[2, 43], [11, 22]]);
+      }, _callee2, null, [[2, 59], [27, 38]]);
     }));
     return function save() {
       return _ref.apply(this, arguments);
@@ -13109,7 +13149,7 @@ function updateVariants(prevState, currentState, configurationData, baseDataFiel
     var _currentState$modifie6, _configurationData$Pr3, _currentState$modifie7;
     var variant = prevState.variantData[_i];
     var newVariant = currentState.variantData[_i];
-    var finalVariant = _objectSpread$5({}, variant);
+    var finalVariant = structuredClone(variant);
     var newModified = {};
     var _iterator = _createForOfIteratorHelper(prevState.classificationFields || []),
       _step;
@@ -13186,9 +13226,12 @@ function updateVariants(prevState, currentState, configurationData, baseDataFiel
       } else if (field.includes('.')) {
         var _currentState$modifie2;
         //handle nested fields
-
+        // Wenn baseData am Pfad keinen Wert hat (typisch für variant-only Felder wie delivery.*),
+        // sonst: prev === updated && !modified → calculateComputedValue setzt value = undefined und DB-Werte verschwinden nach Grid-Sync.
         var _path = field.split('.');
-        var _ProductHandler$calcu2 = ProductHandler.calculateComputedValue(getData(_path, variant), newVariant ? getData(_path, newVariant) : undefined, getData(_path, currentState.baseData), (_currentState$modifie2 = currentState.modified.variantData[_i]) === null || _currentState$modifie2 === void 0 ? void 0 : _currentState$modifie2[field]),
+        var computedFromBase = getData(_path, currentState.baseData);
+        var computedValueForMerge = computedFromBase === undefined ? getData(_path, variant) : computedFromBase;
+        var _ProductHandler$calcu2 = ProductHandler.calculateComputedValue(getData(_path, variant), newVariant ? getData(_path, newVariant) : undefined, computedValueForMerge, (_currentState$modifie2 = currentState.modified.variantData[_i]) === null || _currentState$modifie2 === void 0 ? void 0 : _currentState$modifie2[field]),
           _value2 = _ProductHandler$calcu2.value,
           _modified2 = _ProductHandler$calcu2.modified;
         setData(_path, _value2, finalVariant);
@@ -14682,7 +14725,11 @@ function Seller(props) {
     }
   }, [props.activeAccountId, sessionGuid, props.activeCatalogGuid]);
   useEffect(function () {
-    if (error || isLoading || !props.activeModule) setActiveModule();
+    if (error || isLoading || !props.activeModule) {
+      setActiveModule();
+    } else {
+      setActiveModule(props.activeModule);
+    }
     toggleLoading('SellerLoading', false, isLoading);
   }, [props.activeModule, error, isLoading]);
   if (error) {
@@ -14758,6 +14805,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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; }
 var LOG = getLogger('Seller', 'Main');
 var Main = function Main(_ref) {
+  var _organization$_id;
   var settings = _ref.settings,
     parameters = _ref.parameters,
     internal = _ref.internal,
@@ -14852,7 +14900,7 @@ var Main = function Main(_ref) {
         assignNewDivaNr: (parameters === null || parameters === void 0 ? void 0 : parameters.assignNewDivaNr) === 'true'
       })
     })
-  });
+  }, (_organization$_id = organization === null || organization === void 0 ? void 0 : organization._id) !== null && _organization$_id !== void 0 ? _organization$_id : 'no-organization');
 };
 function getId(module) {
   switch (module) {

package/build/types/seller/src/components/ProductCreator/hooks/useProductState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useProductState.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/ProductCreator/hooks/useProductState.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAKV,WAAW,EACX,KAAK,EAGN,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,KAAK,EAAE,aAAa,EAAyC,MAAM,gCAAgC,CAAC;AAKlJ,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEvD,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAGnC,UAAU,KAAK;IACb,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,WAAW,CAAC;IACtB,kBAAkB,CAAC,EAAE,GAAG,CAAC;IACzB,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa,CAAA;KAAE,CAAC;IACtD,qBAAqB,EAAE,KAAK,EAAE,CAAC;IAC/B,oBAAoB,CAAC,EAAE,mBAAmB,EAAE,CAAC;IAC7C,qBAAqB,CAAC,EAAE;QACtB,CAAC,SAAS,EAAE,MAAM,GAAG;YACnB,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC;SACxB,CAAC;KACH,CAAC;IACF,WAAW,EAAE,GAAG,EAAE,CAAC;IACnB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,EAAE;QACR,gBAAgB,EAAE,OAAO,CAAC;QAC1B,WAAW,EAAE,GAAG,EAAE,CAAC;KACpB,CAAC;IACF,YAAY,CAAC,EAAE,KAAK,EAAE,CAAC;CACxB;AA6ED,MAAM,CAAC,OAAO,WAAW,MAAM,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oCAoJ3C,MAAM,GAAG,SAAS,iBAAiB,MAAM,GAAG,SAAS,gBAAgB,MAAM,GAAG,SAAS;2BAlE9F,WAAW;kCAaX,GAAG;2BAcH,GAAG,EAAE;wBAQL,QAAQ,EAAE,aAAa,MAAM,EAAE;wBAQ/B,KAAK,aAAa,MAAM,EAAE;sBAQ1B,MAAM,MAAM,MAAM,cAAc,OAAO,cAAc,MAAM;4BAQ3D,MAAM,MAAM,MAAM,oBAAoB,GAAG,EAAE,GAAG,SAAS;;qBAiIlC,UAAU,gBAAgB,GAAG,EAAE;yBArLb;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa,CAAA;KAAE;;EA+YxF"}
+{"version":3,"file":"useProductState.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/ProductCreator/hooks/useProductState.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAKV,WAAW,EACX,KAAK,EAGN,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,KAAK,EAAE,aAAa,EAAyC,MAAM,gCAAgC,CAAC;AAKlJ,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEvD,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAGnC,UAAU,KAAK;IACb,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,WAAW,CAAC;IACtB,kBAAkB,CAAC,EAAE,GAAG,CAAC;IACzB,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa,CAAA;KAAE,CAAC;IACtD,qBAAqB,EAAE,KAAK,EAAE,CAAC;IAC/B,oBAAoB,CAAC,EAAE,mBAAmB,EAAE,CAAC;IAC7C,qBAAqB,CAAC,EAAE;QACtB,CAAC,SAAS,EAAE,MAAM,GAAG;YACnB,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC;SACxB,CAAC;KACH,CAAC;IACF,WAAW,EAAE,GAAG,EAAE,CAAC;IACnB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,EAAE;QACR,gBAAgB,EAAE,OAAO,CAAC;QAC1B,WAAW,EAAE,GAAG,EAAE,CAAC;KACpB,CAAC;IACF,YAAY,CAAC,EAAE,KAAK,EAAE,CAAC;CACxB;AA6ED,MAAM,CAAC,OAAO,WAAW,MAAM,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oCAoJ3C,MAAM,GAAG,SAAS,iBAAiB,MAAM,GAAG,SAAS,gBAAgB,MAAM,GAAG,SAAS;2BAlE9F,WAAW;kCAaX,GAAG;2BAcH,GAAG,EAAE;wBAQL,QAAQ,EAAE,aAAa,MAAM,EAAE;wBAQ/B,KAAK,aAAa,MAAM,EAAE;sBAQ1B,MAAM,MAAM,MAAM,cAAc,OAAO,cAAc,MAAM;4BAQ3D,MAAM,MAAM,MAAM,oBAAoB,GAAG,EAAE,GAAG,SAAS;;qBAwJlC,UAAU,gBAAgB,GAAG,EAAE;yBA5Mb;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa,CAAA;KAAE;;EAqaxF"}

package/build/types/seller/src/components/Seller/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/components/Seller/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAMzC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAGrC,OAAO,EAAE,UAAU,EAAwB,MAAM,0BAA0B,CAAC;AAM5E,UAAU,KAAK;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,UAAU,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,KAAK,EAAE,KAAK,qBAsC1C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/components/Seller/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAMzC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAGrC,OAAO,EAAE,UAAU,EAAwB,MAAM,0BAA0B,CAAC;AAM5E,UAAU,KAAK;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,UAAU,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,KAAK,EAAE,KAAK,qBA0C1C"}

package/build/types/seller/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/index.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAU,MAAM,SAAS,CAAC;AAIhD,OAAO,EAAE,mBAAmB,EAA0C,MAAM,0BAA0B,CAAC;AA8HvG,QAAA,MAAM,eAAe,EAAE,mBAAmB,CAAC,aAAa,CAGvD,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/index.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAU,MAAM,SAAS,CAAC;AAIhD,OAAO,EAAE,mBAAmB,EAA0C,MAAM,0BAA0B,CAAC;AA+HvG,QAAA,MAAM,eAAe,EAAE,mBAAmB,CAAC,aAAa,CAGvD,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crystaldesign/diva-seller",
-  "version": "26.4.0-beta.2",
+  "version": "26.4.0-beta.21",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -29,9 +29,9 @@
     "react-dom": "^18.3.1"
   },
   "dependencies": {
-    "@crystaldesign/analytics": "26.4.0-beta.2",
-    "@crystaldesign/products-component": "26.4.0-beta.2",
-    "@crystaldesign/real-time-viewer": "26.4.0-beta.2",
+    "@crystaldesign/analytics": "26.4.0-beta.21",
+    "@crystaldesign/products-component": "26.4.0-beta.21",
+    "@crystaldesign/real-time-viewer": "26.4.0-beta.21",
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.3.0",
     "@mui/icons-material": "^6.1.5",
@@ -43,5 +43,5 @@
   },
   "types": "./build/types/seller/src/index.d.ts",
   "module": "build/esm/index.js",
-  "gitHead": "ed29cfbd94b1e969bc8e8336af6ba23c9dff0640"
+  "gitHead": "ac4ae1500b65a00b4dc47c406861eed3f7ee766b"
 }