@crystaldesign/diva-backoffice 24.8.0-beta.11 → 24.8.0-beta.14

package/build/esm/index.js

@@ -2302,7 +2302,7 @@ function loadConfiguration(t, root, config, lang) {
       }, {
         actionType: 'Modal',
         title: t('backoffice.table.allusers.modal.title.aktivateuser'),
-        text: t('backoffice.table.allusers.modal.text11'),
+        text: t('backoffice.table.allusers.modal.text'),
         label: t('backoffice.table.allusers.modal.label.aktivate'),
         type: 'Form',
         id: 'FormActivateUser',
@@ -11237,7 +11237,8 @@ var _default$6 = /*#__PURE__*/function () {
         _this2 = this;
       if (!skipFill) {
         this._selectedMenuKeys = this.fillSelectedUntilFistLeaf(element.menu, this._selectedMenuKeys, element.pos, key);
-        this.root.navigate(this.getPath(this._menu, this._selectedMenuKeys, this.root.navigationState.searchParams));
+        var path = this.getPath(element.menu, this._selectedMenuKeys, this.root.navigationState.searchParams);
+        this.root.navigate('/' + path);
       }
       this._menuElement1 = _objectSpread$E(_objectSpread$E({}, this.menuElement1), {}, {
         selected: this._selectedMenuKeys[0]
@@ -11357,45 +11358,65 @@ var _default$6 = /*#__PURE__*/function () {
       }
       return path.join('/') + (searchParams.size ? '?' + searchParams.toString() : '');
     }
+
+    /**
+     * Get the keys of the menu items that are selected by the given path.
+     * @param menu the menu to search in
+     * @param path the path to the selected menu item
+     */
   }, {
     key: "keysFormPath",
     value: function keysFormPath(menu, path) {
       var selectedkeys = [];
       var currentMenu = menu;
       var pathParts = path.split('/').slice(1);
-      var _loop3 = function _loop3(_i) {
-        var _currentMenuItem$subM3, _currentMenuItem$item3;
-        var currentMenuItem = currentMenu.find(function (element) {
-          return element.path === pathParts[_i];
-        });
-        if (!currentMenuItem) {
-          i = _i;
-          return 1; // break
+      var currentKeys = [];
+      for (var i = 0; i < pathParts.length; i++) {
+        var _currentKeys, _currentMenuItem$item3, _currentMenuItem$subM3;
+        var found = this.flatFindMenuItem(currentMenu, pathParts[i]);
+        if (!found) {
+          break;
         }
-        var keys = [currentMenuItem.id];
-        if ((_currentMenuItem$subM3 = currentMenuItem.subMenu) !== null && _currentMenuItem$subM3 !== void 0 && _currentMenuItem$subM3.length) {
+        (_currentKeys = currentKeys).push.apply(_currentKeys, _toConsumableArray(found.ids));
+        var currentMenuItem = found.item;
+        if ((_currentMenuItem$item3 = currentMenuItem.items) !== null && _currentMenuItem$item3 !== void 0 && _currentMenuItem$item3.length) {
+          currentMenu = currentMenuItem.items;
+        } else if ((_currentMenuItem$subM3 = currentMenuItem.subMenu) !== null && _currentMenuItem$subM3 !== void 0 && _currentMenuItem$subM3.length) {
           currentMenu = currentMenuItem.subMenu;
-        } else if ((_currentMenuItem$item3 = currentMenuItem.items) !== null && _currentMenuItem$item3 !== void 0 && _currentMenuItem$item3.length) {
-          while ((_currentMenuItem$item4 = currentMenuItem.items) !== null && _currentMenuItem$item4 !== void 0 && _currentMenuItem$item4.length) {
-            var _currentMenuItem$item4;
-            currentMenuItem = currentMenuItem.items.find(function (element) {
-              return element.path === pathParts[++_i];
-            });
-            if (!currentMenuItem) {
-              break;
-            }
-            keys.unshift(currentMenuItem.id);
-          }
+          selectedkeys.push(currentKeys);
+          currentKeys = [];
         }
-        selectedkeys.push(keys);
-        i = _i;
-      };
-      for (var i = 0; i < pathParts.length; i++) {
-        if (_loop3(i)) break;
       }
+      if (currentKeys.length) selectedkeys.push(currentKeys);
       return selectedkeys;
     }
 
+    /**
+     * Recursivly search for a menu item with the given path part.
+     * If it is a sub menu, it is possible that the parent menu is not reflected in the path, so we have to deep search.
+     */
+  }, {
+    key: "flatFindMenuItem",
+    value: function flatFindMenuItem(menu, pathPart) {
+      var ids = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+      for (var i = 0; i < menu.length; i++) {
+        var item = menu[i];
+        if (item.path === pathPart) {
+          return {
+            ids: [item.id].concat(_toConsumableArray(ids)),
+            item: item
+          };
+        }
+        if (item.items) {
+          var found = this.flatFindMenuItem(item.items, pathPart, [item.id].concat(_toConsumableArray(ids)));
+          if (found) {
+            return found;
+          }
+        }
+      }
+      return null;
+    }
+
     /**
      * Get the menu items to be displayed in the menu, in the correct format for the antd menu.
      *
@@ -12648,8 +12669,8 @@ var _default$1 = /*#__PURE__*/function () {
 var storeContext = /*#__PURE__*/createContext(null);
 var StoreProvider = function StoreProvider(_ref) {
   var children = _ref.children,
-    settings = _ref.settings,
-    isVisible = _ref.isVisible;
+    settings = _ref.settings;
+    _ref.isVisible;
   var _useDivaCore = useDivaCore(),
     _useDivaCore$state = _useDivaCore.state,
     jwt = _useDivaCore$state.jwt,
@@ -12674,7 +12695,6 @@ var StoreProvider = function StoreProvider(_ref) {
     _useState2 = _slicedToArray(_useState, 1),
     store = _useState2[0];
   useEffect(function () {
-    if (!isVisible) return;
     store.updateNavigationState({
       searchParams: searchParams,
       path: location.pathname
@@ -12682,7 +12702,7 @@ var StoreProvider = function StoreProvider(_ref) {
     store.dataStore.setUserData(jwt, nToken, user);
     store.dataStore.setOrganizationData(organization);
     store.configurationStore.setConfiguration(settings, apiConfig, t, i18n.language);
-  }, [jwt, nToken, user, organization, settings, apiConfig, i18n.language, isVisible]);
+  }, [jwt, nToken, user, organization, settings, apiConfig, i18n.language]);
   useEffect(function () {
     store.updateHandlers(handler);
   }, [handler]);
@@ -28827,12 +28847,10 @@ 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('Backoffice', 'Index');
 var Main = function Main(props) {
-  var _useDivaCore = useDivaCore();
-    _useDivaCore.handler;
   useEffect(function () {
     LOG.debug('Initial render of backoffice');
-    // UtilStore.setArViewerSettings(handler);
   }, []);
+  if (!props.isVisible) return null;
   return /*#__PURE__*/jsx(BrowserRouter, {
     basename: "/backoffice",
     children: /*#__PURE__*/jsx(ErrorBoundary, {

package/build/types/backoffice/src/store/ContentStore.d.ts

@@ -38,7 +38,17 @@ export default class {
      */
     private fillSelectedUntilFistLeaf;
     private getPath;
+    /**
+     * Get the keys of the menu items that are selected by the given path.
+     * @param menu the menu to search in
+     * @param path the path to the selected menu item
+     */
     private keysFormPath;
+    /**
+     * Recursivly search for a menu item with the given path part.
+     * If it is a sub menu, it is possible that the parent menu is not reflected in the path, so we have to deep search.
+     */
+    private flatFindMenuItem;
     /**
      * Get the menu items to be displayed in the menu, in the correct format for the antd menu.
      *

package/build/types/backoffice/src/store/ContentStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ContentStore.d.ts","sourceRoot":"","sources":["../../../../../src/store/ContentStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAA6B,MAAM,6BAA6B,CAAC;AAIlF,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAInE,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,MAAM,CAAC,OAAO;IASA,OAAO,CAAC,IAAI;IARxB,OAAO,CAAC,MAAM,CAC8F;IAC5G,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,iBAAiB,CAAkB;IAC3C,OAAO,CAAC,aAAa,CAAC,CAAc;IACpC,OAAO,CAAC,aAAa,CAAC,CAAc;IACpC,OAAO,CAAC,uBAAuB,CAA+C;gBAE1D,IAAI,EAAE,SAAS;IAUnC,QAAQ;IAcR,IAAI,KAAK,6BAER;IAED,IAAI,YAAY,4BAEf;IAED,IAAI,YAAY,4BAEf;IAED,uBAAuB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE;IAc1E,uBAAuB,CAAC,GAAG,EAAE,MAAM;IAInC,IAAI,sBAAsB,IAAI;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,WAAW,CAAA;KAAE,EAAE,CAEpE;IAED,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,WAAW;IAKxC,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE;QAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,EAAE,QAAQ,CAAC,EAAE,IAAI;IA6BjG,uBAAuB,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC,GAAG,MAAM;IAWjD;;;;;;;;;OASG;IACH,OAAO,CAAC,yBAAyB;IAejC,OAAO,CAAC,OAAO;IAiCf,OAAO,CAAC,YAAY;IA0BpB;;;;OAIG;IACH,OAAO,CAAC,WAAW;IAyBnB;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;CAa/B;AAED,eAAO,MAAM,IAAI,EAAE,QAAQ,EAkd1B,CAAC"}
+{"version":3,"file":"ContentStore.d.ts","sourceRoot":"","sources":["../../../../../src/store/ContentStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAA6B,MAAM,6BAA6B,CAAC;AAIlF,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAInE,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,MAAM,CAAC,OAAO;IASA,OAAO,CAAC,IAAI;IARxB,OAAO,CAAC,MAAM,CAC8F;IAC5G,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,iBAAiB,CAAkB;IAC3C,OAAO,CAAC,aAAa,CAAC,CAAc;IACpC,OAAO,CAAC,aAAa,CAAC,CAAc;IACpC,OAAO,CAAC,uBAAuB,CAA+C;gBAE1D,IAAI,EAAE,SAAS;IAUnC,QAAQ;IAcR,IAAI,KAAK,6BAER;IAED,IAAI,YAAY,4BAEf;IAED,IAAI,YAAY,4BAEf;IAED,uBAAuB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE;IAc1E,uBAAuB,CAAC,GAAG,EAAE,MAAM;IAInC,IAAI,sBAAsB,IAAI;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,WAAW,CAAA;KAAE,EAAE,CAEpE;IAED,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,WAAW;IAKxC,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE;QAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,EAAE,QAAQ,CAAC,EAAE,IAAI;IA8BjG,uBAAuB,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC,GAAG,MAAM;IAWjD;;;;;;;;;OASG;IACH,OAAO,CAAC,yBAAyB;IAejC,OAAO,CAAC,OAAO;IAiCf;;;;OAIG;IACH,OAAO,CAAC,YAAY;IAwBpB;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAgBxB;;;;OAIG;IACH,OAAO,CAAC,WAAW;IAyBnB;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;CAa/B;AAED,eAAO,MAAM,IAAI,EAAE,QAAQ,EAkd1B,CAAC"}

package/build/types/backoffice/src/store/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/store/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAA+B,MAAM,0BAA0B,CAAC;AACvF,OAAO,KAA6C,MAAM,OAAO,CAAC;AAElE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,SAAS,MAAM,aAAa,CAAC;AAIpC,eAAO,MAAM,aAAa;cAKd,MAAM,YAAY;iBA0B7B,CAAC;AAEF,eAAO,MAAM,QAAQ,iBAMpB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/store/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAA+B,MAAM,0BAA0B,CAAC;AACvF,OAAO,KAA6C,MAAM,OAAO,CAAC;AAElE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,SAAS,MAAM,aAAa,CAAC;AAIpC,eAAO,MAAM,aAAa;cAKd,MAAM,YAAY;iBAyB7B,CAAC;AAEF,eAAO,MAAM,QAAQ,iBAMpB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crystaldesign/diva-backoffice",
-  "version": "24.8.0-beta.11",
+  "version": "24.8.0-beta.14",
   "license": "COMMERCIAL",
   "devDependencies": {
     "@testing-library/jest-dom": "^5.15.0",
@@ -15,7 +15,7 @@
   "dependencies": {
     "@ant-design/icons": "5.0.1",
     "@babel/runtime": "7.18.0",
-    "@crystaldesign/spreadsheet": "24.8.0-beta.11",
+    "@crystaldesign/spreadsheet": "24.8.0-beta.14",
     "@google/model-viewer": "3.4.0",
     "@tinymce/tinymce-react": "^3.13.0",
     "ag-charts-community": "^9.3.1",
@@ -51,5 +51,5 @@
   },
   "module": "build/esm/index.js",
   "types": "./build/types/backoffice/src/index.d.ts",
-  "gitHead": "ff5fa22c01b8a751b606f38de9421a2b3032045e"
+  "gitHead": "a79985d30a408d24d698c83dcf858b57333e66dd"
 }