@crystaldesign/diva-core 25.11.0-rc.5 → 25.11.0-rc.7

package/build/esm/{ModalsWrapper-0ad27e04.js → ModalsWrapper-4f41a458.js}

@@ -1,4 +1,4 @@
-import { s as styleInject, u as useDivaCoreContext } from './index-a8734e95.js';
+import { s as styleInject, u as useDivaCoreContext } from './index-c7312a0e.js';
 import { useState, useEffect, useCallback } from 'react';
 import { observer } from 'mobx-react-lite';
 import Button from '@mui/material/Button';

package/build/esm/{index-6acf64a9.js → index-bb87a892.js}

@@ -1,4 +1,4 @@
-import { s as styleInject, u as useDivaCoreContext, g as getLogger } from './index-a8734e95.js';
+import { s as styleInject, u as useDivaCoreContext, g as getLogger } from './index-c7312a0e.js';
 import { forwardRef, useState, useRef, useEffect, useMemo } from 'react';
 import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';

package/build/esm/{index-a8734e95.js → index-c7312a0e.js}

@@ -46,7 +46,7 @@ import { actions } from '@storybook/addon-actions';
 import * as Styles from '@mui/styles';
 
 (function() {
-    const env = {"STAGE":"production","VERSION":"25.11.0-rc.5"};
+    const env = {"STAGE":"production","VERSION":"25.11.0-rc.7"};
     try {
         if (process) {
             process.env = Object.assign({}, process.env);
@@ -1610,9 +1610,10 @@ var DataStore = /*#__PURE__*/function () {
   }]);
 }();
 
-var instance = i18n.createInstance().use(HttpApi).use(LanguageDetector);
+var instance = i18n.createInstance().use(HttpApi);
 function init(_ref) {
-  var apiConfig = _ref.apiConfig;
+  var apiConfig = _ref.apiConfig,
+    language = _ref.language;
   if (instance.isInitialized) {
     return Promise.resolve();
   } else if (instance.isInitializing) {
@@ -1626,12 +1627,19 @@ function init(_ref) {
     });
   }
   var loadPath = "".concat(apiConfig.adminService, "/locales?lng={{lng}}&ns={{ns}}");
+
+  //if the language is not fixed by parameter, use the language detector
+  if (!language) {
+    var languageDetector = new LanguageDetector();
+    instance.use(languageDetector);
+  }
   return new Promise(function (resolve, reject) {
     instance.on('initialized', function () {
       resolve();
     });
     instance.init({
       debug: false,
+      lng: language,
       defaultNS: 'default',
       fallbackNS: 'default',
       ns: ['default'],
@@ -3659,11 +3667,20 @@ var BrowserStateStore = /*#__PURE__*/function () {
               };
               state.organization = (_searchParams$get = searchParams.get('organizationId')) !== null && _searchParams$get !== void 0 ? _searchParams$get : undefined;
               searchParams["delete"]('organizationId');
+
+              //for backwards compatibilty, if the channelId is set in the url, use that one as organization and update the url in the browser
+              if (searchParams.get('channelId')) {
+                state.organization = searchParams.get('channelId');
+                searchParams["delete"]('channelId');
+                currentUrl.searchParams.set('organizationId', state.organization);
+                currentUrl.searchParams["delete"]('channelId');
+              }
               authdataString = searchParams.get('authdata') || undefined;
               if (authdataString) {
                 state.authdata = JSON.parse(atob(authdataString));
-                if ((_state$authdata = state.authdata) !== null && _state$authdata !== void 0 && _state$authdata.organizationId) {
+                if ((_state$authdata = state.authdata) !== null && _state$authdata !== void 0 && _state$authdata.organizationId && state.organization != state.authdata.organizationId) {
                   state.organization = state.authdata.organizationId;
+                  currentUrl.searchParams.set('organizationId', state.organization);
                 }
               }
               searchParams["delete"]('lang');
@@ -3675,7 +3692,7 @@ var BrowserStateStore = /*#__PURE__*/function () {
               currentUrl.searchParams["delete"]('authdata');
               history.replaceState(null, '', currentUrl.href);
               return _context.abrupt("return", state);
-            case 18:
+            case 19:
             case "end":
               return _context.stop();
           }
@@ -8412,7 +8429,8 @@ var RootStore = /*#__PURE__*/function () {
                 eventId: 'LOAD_CONFIG'
               });
               afterInitPromise = init({
-                apiConfig: this.configurationStore.apiConfig
+                apiConfig: this.configurationStore.apiConfig,
+                language: language
               }); //load core configuration based on initaly available information
               _context.next = 15;
               return this.configurationStore.fetchConfiguration({
@@ -9444,7 +9462,7 @@ var DrawerMenu = observer(MobileDrawer);
 function ownKeys$4(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$4(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$4(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$4(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LazyModals$1 = /*#__PURE__*/React.lazy(function () {
-  return import('./ModalsWrapper-0ad27e04.js');
+  return import('./ModalsWrapper-4f41a458.js');
 });
 function Fullscreen(_ref) {
   var inAbsoluteFullscreen = _ref.inAbsoluteFullscreen;
@@ -9902,10 +9920,10 @@ function ownKeys$3(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymb
 function _objectSpread$3(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$3(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$3(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$2 = getLogger('Framework', 'Root');
 var LazyAuth = /*#__PURE__*/React.lazy(function () {
-  return import('./index-6acf64a9.js');
+  return import('./index-bb87a892.js');
 });
 var LazyModals = /*#__PURE__*/React.lazy(function () {
-  return import('./ModalsWrapper-0ad27e04.js');
+  return import('./ModalsWrapper-4f41a458.js');
 });
 function ContentComponent() {
   var context = useDivaCoreContext();

package/build/esm/index.js

@@ -1,4 +1,4 @@
-export { b as AnalyticsHandler, A as AuthorizationHandler, d as ClientArticleHandler, C as Content, e as DivaMockProvider, H as HelpButton, O as ONE_DAY_UNIX, c as OrganizationHandler, P as ProductHandler, R as RequestStatus, S as SupportHandler, D as default, g as getLogger, f as storyBookCoreMock, a as useDivaCore } from './index-a8734e95.js';
+export { b as AnalyticsHandler, A as AuthorizationHandler, d as ClientArticleHandler, C as Content, e as DivaMockProvider, H as HelpButton, O as ONE_DAY_UNIX, c as OrganizationHandler, P as ProductHandler, R as RequestStatus, S as SupportHandler, D as default, g as getLogger, f as storyBookCoreMock, a as useDivaCore } from './index-c7312a0e.js';
 export { DivaError, default as DivaUtils } from '@crystaldesign/diva-utils';
 export { Trans, useTranslation } from 'react-i18next';
 export * from '@crystaldesign/basket-model';

package/build/types/core/src/store/BrowserStateStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BrowserStateStore.d.ts","sourceRoot":"","sources":["../../../../../src/store/BrowserStateStore.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAA2B,MAAM,UAAU,CAAC;AAC5F,OAAO,SAAS,MAAM,aAAa,CAAC;AAUpC,MAAM,WAAW,YAAY;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AACD,MAAM,CAAC,OAAO,OAAO,iBAAiB;IAExB,OAAO,CAAC,IAAI;IADxB,OAAO,CAAC,IAAI,CAAc;gBACN,IAAI,EAAE,SAAS;IAqBnC;;;OAGG;IACG,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC;IA2C3C;;;;OAIG;IACH,cAAc,CAAC,MAAM,EAAE,MAAM;IAwB7B;;;;;OAKG;IACH,oCAAoC,CAAC,MAAM,EAAE,MAAM;IAmBnD;;;;;OAKG;IACH,oBAAoB,CAAC,MAAM,EAAE,MAAM;IAUnC;;OAEG;IACH,eAAe;IAgBf;;;;OAIG;IACH,eAAe,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAQhD;;OAEG;IACH,qBAAqB;IAIrB;;;;OAIG;IACH,qBAAqB,CAAC,YAAY,CAAC,EAAE,MAAM;IAQ3C;;OAEG;IACH,oBAAoB;IAIpB;;;;OAIG;IACH,oBAAoB,CAAC,WAAW,CAAC,EAAE,MAAM;IAQzC;;OAEG;YACW,oBAAoB;IAYlC;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAkC/B;;OAEG;IACH,OAAO,KAAK,gBAAgB,GAE3B;IAED;;OAEG;IACH,OAAO,CAAC,MAAM;IAId;;;;;;;OAOG;IACH,OAAO,CAAC,0BAA0B;IAIlC;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;CAI7B"}
+{"version":3,"file":"BrowserStateStore.d.ts","sourceRoot":"","sources":["../../../../../src/store/BrowserStateStore.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAA2B,MAAM,UAAU,CAAC;AAC5F,OAAO,SAAS,MAAM,aAAa,CAAC;AAUpC,MAAM,WAAW,YAAY;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AACD,MAAM,CAAC,OAAO,OAAO,iBAAiB;IAExB,OAAO,CAAC,IAAI;IADxB,OAAO,CAAC,IAAI,CAAc;gBACN,IAAI,EAAE,SAAS;IAqBnC;;;OAGG;IACG,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC;IAoD3C;;;;OAIG;IACH,cAAc,CAAC,MAAM,EAAE,MAAM;IAwB7B;;;;;OAKG;IACH,oCAAoC,CAAC,MAAM,EAAE,MAAM;IAmBnD;;;;;OAKG;IACH,oBAAoB,CAAC,MAAM,EAAE,MAAM;IAUnC;;OAEG;IACH,eAAe;IAgBf;;;;OAIG;IACH,eAAe,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAQhD;;OAEG;IACH,qBAAqB;IAIrB;;;;OAIG;IACH,qBAAqB,CAAC,YAAY,CAAC,EAAE,MAAM;IAQ3C;;OAEG;IACH,oBAAoB;IAIpB;;;;OAIG;IACH,oBAAoB,CAAC,WAAW,CAAC,EAAE,MAAM;IAQzC;;OAEG;YACW,oBAAoB;IAYlC;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAkC/B;;OAEG;IACH,OAAO,KAAK,gBAAgB,GAE3B;IAED;;OAEG;IACH,OAAO,CAAC,MAAM;IAId;;;;;;;OAOG;IACH,OAAO,CAAC,0BAA0B;IAIlC;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;CAI7B"}

package/build/types/core/src/utils/i18n.d.ts

@@ -1,7 +1,8 @@
 import { ApiConfig } from '..';
 declare let instance: import("i18next").i18n;
-export declare function init({ apiConfig }: {
+export declare function init({ apiConfig, language }: {
     apiConfig: ApiConfig;
+    language?: string;
 }): Promise<void>;
 export declare function changeNamespace(namespace: string): Promise<void>;
 export default instance;

package/build/types/core/src/utils/i18n.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i18n.d.ts","sourceRoot":"","sources":["../../../../../src/utils/i18n.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAE/B,QAAA,IAAI,QAAQ,wBAA2D,CAAC;AAExE,wBAAgB,IAAI,CAAC,EAAE,SAAS,EAAE,EAAE;IAAE,SAAS,EAAE,SAAS,CAAA;CAAE,iBA6C3D;AAED,wBAAsB,eAAe,CAAC,SAAS,EAAE,MAAM,iBAKtD;AAED,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"i18n.d.ts","sourceRoot":"","sources":["../../../../../src/utils/i18n.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAE/B,QAAA,IAAI,QAAQ,wBAAqC,CAAC;AAElD,wBAAgB,IAAI,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE;IAAE,SAAS,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,iBAoDxF;AAED,wBAAsB,eAAe,CAAC,SAAS,EAAE,MAAM,iBAKtD;AAED,eAAe,QAAQ,CAAC"}