@crystaldesign/diva-seller 25.14.0-beta.2 → 25.14.0-beta.20

package/build/esm/index.js

@@ -111,6 +111,8 @@ import Settings from '@mui/icons-material/Settings';
     globalThis.process = { env:env };
 })();
 
+function ownKeys$I(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$I(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$I(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$I(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function useApiLogin(_ref) {
   var jwt = _ref.jwt,
     userRole = _ref.userRole,
@@ -118,6 +120,7 @@ function useApiLogin(_ref) {
     organizationId = _ref.organizationId,
     url = _ref.url;
   var _useState = useState({
+      sessionGuids: {},
       isLoading: true
     }),
     _useState2 = _slicedToArray(_useState, 2),
@@ -128,7 +131,7 @@ function useApiLogin(_ref) {
   useEffect(function () {
     getSessionGuid(userRole, loginMode).then(function (sessionGuid) {
       return setState({
-        sessionGuid: sessionGuid,
+        sessionGuids: _objectSpread$I(_objectSpread$I({}, state.sessionGuids), {}, _defineProperty({}, organizationId, sessionGuid)),
         isLoading: false
       });
     });
@@ -2893,7 +2896,6 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
   var dontCheckIfSaved = false;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
-    _useTranslation.i18n;
   var _useDivaCore = useDivaCore(),
     _useDivaCore$state = _useDivaCore.state,
     organization = _useDivaCore$state.organization,
@@ -2939,7 +2941,8 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
       url: orgState.apiConfig.api2["default"]
     }),
     loginDataIsLoading = _useApiLogin.isLoading,
-    sessionGuid = _useApiLogin.sessionGuid;
+    sessionGuids = _useApiLogin.sessionGuids;
+  var sessionGuid = sessionGuids[orgState.organization._id];
   var _useState5 = useState(sessionGuid),
     _useState6 = _slicedToArray(_useState5, 2),
     oldSession = _useState6[0],
@@ -2967,7 +2970,7 @@ var SellerStateProvider = function SellerStateProvider(_ref) {
   if (oldSession !== sessionGuid) setOldSession(sessionGuid);
   useEffect(function () {
     resetState();
-  }, [loginMode]);
+  }, [loginMode, organization]);
   useEffect(function () {
     if (isVisible && wasHidden) {
       resetForCache();
@@ -12433,7 +12436,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;
+      var _state$classification, 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:
@@ -12536,13 +12539,13 @@ function useProductState (basket, divaNr) {
             } 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')) {
+            if (!(_context2.t1.message.includes('PRODSM_0001') || _context2.t1.errorCode == 'PRODSM_0001')) {
               _context2.next = 52;
               break;
             }
             openModal({
               title: t('productcreator.errorsavingsmarticle', 'Error saving SM-Article'),
-              text: _context2.t1.message,
+              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',
               accept: true
             });
             return _context2.abrupt("return", false);
@@ -12564,7 +12567,7 @@ function useProductState (basket, divaNr) {
     };
   }();
   var reset = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(basket, productData) {
+    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(basket, productData) {
       var _configurationData$Pr;
       var _yield$productHandler, isNew, resetState;
       return _regeneratorRuntime.wrap(function _callee3$(_context3) {
@@ -12606,13 +12609,13 @@ function useProductState (basket, divaNr) {
       }, _callee3);
     }));
     return function reset(_x, _x2) {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   useEffect(function () {
     var init = /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-        var _ref4, updateBasket, catalogData, newDivaNr, _affiliates, _Object$keys$map2, _configurationData$Pr2, _optClassMap, _catalogs$, _initState, _yield$loadCategories, classificationFields, newCurrentData, additional, _additionalBaseFields, newLivingArea, _yield$productHandler2, _isNew, baseChanged, catalogs, initState, currentCategories, differingOptFields, optMapEntries, missingOptFields, accountlogourl, logofile, _initState$baseData$m, newlogofile, _initState$baseData$m2;
+      var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+        var _ref5, updateBasket, catalogData, newDivaNr, _affiliates, _Object$keys$map2, _configurationData$Pr2, _optClassMap, _catalogs$, _initState, _yield$loadCategories, classificationFields, newCurrentData, additional, _additionalBaseFields, newLivingArea, _yield$productHandler2, _isNew, baseChanged, catalogs, initState, currentCategories, differingOptFields, optMapEntries, missingOptFields, accountlogourl, logofile, _initState$baseData$m, newlogofile, _initState$baseData$m2;
         return _regeneratorRuntime.wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -12629,9 +12632,9 @@ function useProductState (basket, divaNr) {
             case 6:
               _context4.t0 = {};
             case 7:
-              _ref4 = _context4.t0;
-              updateBasket = _ref4.basket;
-              catalogData = _ref4.catalogData;
+              _ref5 = _context4.t0;
+              updateBasket = _ref5.basket;
+              catalogData = _ref5.catalogData;
               if (!(basket && basket.getDocumentVersion() > 1)) {
                 _context4.next = 16;
                 break;
@@ -12729,10 +12732,10 @@ function useProductState (basket, divaNr) {
               });
               optMapEntries = Object.entries(initState.optClassMap);
               missingOptFields = differingOptFields.filter(function (optField) {
-                return !optMapEntries.find(function (_ref5) {
-                  var _ref6 = _slicedToArray(_ref5, 2);
-                    _ref6[0];
-                    var opt = _ref6[1];
+                return !optMapEntries.find(function (_ref6) {
+                  var _ref7 = _slicedToArray(_ref6, 2);
+                    _ref7[0];
+                    var opt = _ref7[1];
                   return opt.field == optField.field;
                 });
               });
@@ -12803,7 +12806,7 @@ function useProductState (basket, divaNr) {
         }, _callee4, null, [[19, 26], [29, 63]]);
       }));
       return function init() {
-        return _ref3.apply(this, arguments);
+        return _ref4.apply(this, arguments);
       };
     }();
     init();
@@ -12983,10 +12986,10 @@ function updateVariants(prevState, currentState, configurationData, baseDataFiel
   if (baseDataFields.some(function (field) {
     return field.manualFields && field.field == 'customData';
   }) && currentState.baseData.customData) {
-    var manualFields = Object.entries(currentState.baseData.customData).filter(function (_ref7) {
-      var _ref8 = _slicedToArray(_ref7, 2);
-        _ref8[0];
-        var valueObj = _ref8[1];
+    var manualFields = Object.entries(currentState.baseData.customData).filter(function (_ref8) {
+      var _ref9 = _slicedToArray(_ref8, 2);
+        _ref9[0];
+        var valueObj = _ref9[1];
       return valueObj === null || valueObj === void 0 ? void 0 : valueObj.manual;
     });
     for (var i = 0; i < manualFields.length; i++) {
@@ -13288,10 +13291,10 @@ function updateOptMap(currentState, optMap, mediaService, jwt) {
         LOG$2.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 (_ref10) {
+        var _ref11 = _slicedToArray(_ref10, 2);
+          _ref11[0];
+          var optValueField = _ref11[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) {
@@ -13412,9 +13415,9 @@ function removeMedia(currentState, data, variants) {
       return m.url == data.url;
     });
     if (product.media && index != undefined) {
-      var _ref11;
+      var _ref12;
       var deleted = product.media.splice(index, 1);
-      (_ref11 = newState.removedMedia).push.apply(_ref11, _toConsumableArray(deleted));
+      (_ref12 = newState.removedMedia).push.apply(_ref12, _toConsumableArray(deleted));
     }
   });
   return newState;

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;AAIvD,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;oCAsJ3C,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;;qBAgIlC,UAAU,gBAAgB,GAAG,EAAE;yBApLb;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa,CAAA;KAAE;;EA6ZxF"}
+{"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;AAIvD,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;oCAsJ3C,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;;EA8ZxF"}

package/build/types/seller/src/provider/hooks/useApiLogin.d.ts

@@ -7,7 +7,9 @@ interface Props {
     loginMode: LoginMode;
 }
 interface LoginState {
-    sessionGuid?: string;
+    sessionGuids: {
+        [orgId: string]: string;
+    };
     isLoading: boolean;
 }
 export declare function useApiLogin({ jwt, userRole, loginMode, organizationId, url }: Props): LoginState;

package/build/types/seller/src/provider/hooks/useApiLogin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useApiLogin.d.ts","sourceRoot":"","sources":["../../../../../../src/provider/hooks/useApiLogin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAG5E,UAAU,KAAK;IACb,QAAQ,EAAE,QAAQ,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IAEvB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,SAAS,CAAC;CACtB;AAED,UAAU,UAAU;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,wBAAgB,WAAW,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,EAAE,EAAE,KAAK,cAWnF"}
+{"version":3,"file":"useApiLogin.d.ts","sourceRoot":"","sources":["../../../../../../src/provider/hooks/useApiLogin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAe,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAG5E,UAAU,KAAK;IACb,QAAQ,EAAE,QAAQ,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IAEvB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,SAAS,CAAC;CACtB;AAED,UAAU,UAAU;IAClB,YAAY,EAAE;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC1C,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,wBAAgB,WAAW,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,EAAE,EAAE,KAAK,cAanF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crystaldesign/diva-seller",
-  "version": "25.14.0-beta.2",
+  "version": "25.14.0-beta.20",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -29,9 +29,9 @@
     "react-dom": "^18.3.1"
   },
   "dependencies": {
-    "@crystaldesign/analytics": "25.14.0-beta.2",
-    "@crystaldesign/products-component": "25.14.0-beta.2",
-    "@crystaldesign/real-time-viewer": "25.14.0-beta.2",
+    "@crystaldesign/analytics": "25.14.0-beta.20",
+    "@crystaldesign/products-component": "25.14.0-beta.20",
+    "@crystaldesign/real-time-viewer": "25.14.0-beta.20",
     "@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": "a1f064466cb86193809d9ef267b84c67c67a9011"
+  "gitHead": "a7918be08d5616b8f02d1128f7ef9b7811a1a554"
 }