asab_webui_shell 25.2.8 → 26.1.1

package/dist/containers/Sidebar/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = Sidebar;
 var _react = _interopRequireWildcard(require("react"));
-var _reactRedux = require("react-redux");
+var _asab_webui_components = require("asab_webui_components");
 var _reactstrap = require("reactstrap");
 var _SidebarBottomItem = _interopRequireDefault(require("./SidebarBottomItem"));
 var _actions = require("../../actions");
@@ -18,16 +18,18 @@ function Sidebar(props) {
   var [isSmallResolution, setIsSmallResolution] = (0, _react.useState)(false);
   var [sidebarBottomBranding, setSidebarBottomBranding] = (0, _react.useState)({});
   var [windowWidth, setWindowWidth] = (0, _react.useState)(window.innerWidth);
-  var sidebarItems = (0, _reactRedux.useSelector)(state => {
+  var sidebarItems = (0, _asab_webui_components.useAppSelector)(state => {
     var _state$navigation;
     return (_state$navigation = state.navigation) === null || _state$navigation === void 0 ? void 0 : _state$navigation.navItems;
   });
-  var sessionExpired = (0, _reactRedux.useSelector)(state => {
+  var sessionExpired = (0, _asab_webui_components.useAppSelector)(state => {
     var _state$auth;
     return (_state$auth = state.auth) === null || _state$auth === void 0 ? void 0 : _state$auth.sessionExpired;
   });
-  var theme = (0, _reactRedux.useSelector)(state => state.theme);
-  var dispatch = (0, _reactRedux.useDispatch)();
+  var theme = (0, _asab_webui_components.useAppSelector)(state => state.theme);
+  var {
+    dispatch
+  } = (0, _asab_webui_components.useAppStore)();
   (0, _react.useEffect)(() => {
     // Collapse sidebar if innerWidth is smaller or equal to 944px on page initialization
     if (window.innerWidth <= 944) {

package/dist/containers/Toast/ToastContainer.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = ToastContainer;
 var _react = _interopRequireWildcard(require("react"));
-var _reactRedux = require("react-redux");
+var _asab_webui_components = require("asab_webui_components");
 var _actions = require("../../actions");
 var _ToastComponent = require("./ToastComponent.js");
 var _reducer = require("./reducer.js");
@@ -14,7 +14,7 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 function ToastContainer(props) {
   var _attentionRequired$be;
   // Get the toast data from Redux (assuming it comes from `attentionrequired.beacon`)
-  var attentionRequired = (0, _reactRedux.useSelector)(state => {
+  var attentionRequired = (0, _asab_webui_components.useAppSelector)(state => {
     var _state$attentionrequi;
     return (_state$attentionrequi = state.attentionrequired) === null || _state$attentionrequi === void 0 ? void 0 : _state$attentionrequi.beacon;
   });

package/dist/containers/Toast/ToastContainer.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useReducer } from 'react';
-import { useSelector } from 'react-redux';
+import { useAppSelector } from 'asab_webui_components';
 import { DEL_TOAST, ADD_TOAST } from '../../actions';
 
 import { ToastComponent } from './ToastComponent.jsx';
@@ -8,7 +8,7 @@ import { toastReducer } from './reducer.jsx';
 // Toast container
 export default function ToastContainer(props) {
 	// Get the toast data from Redux (assuming it comes from `attentionrequired.beacon`)
-	const attentionRequired = useSelector((state) => state.attentionrequired?.beacon);
+	const attentionRequired = useAppSelector((state) => state.attentionrequired?.beacon);
 	const toastData = attentionRequired?.['beacon.toast']?.data || [];
 
 	// useReducer to manage the local state of toasts

package/dist/modules/about/AboutScreen.js

@@ -6,13 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
-var _reactRedux = require("react-redux");
+var _asab_webui_components = require("asab_webui_components");
 var _BrandImage = require("../../components/branding/BrandImage");
 var _reactstrap = require("reactstrap");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function AboutScreen(props) {
   var [brandImage, setBrandImage] = (0, _react.useState)(undefined);
-  var theme = (0, _reactRedux.useSelector)(state => state.theme);
+  var theme = (0, _asab_webui_components.useAppSelector)(state => state.theme);
   (0, _react.useEffect)(() => {
     setBrandImage((0, _BrandImage.getBrandImage)(props, theme));
   }, [theme]);
@@ -52,19 +52,19 @@ function AboutCard(props) {
   var {
     t
   } = (0, _reactI18next.useTranslation)();
-  var title = (0, _reactRedux.useSelector)(state => {
+  var title = (0, _asab_webui_components.useAppSelector)(state => {
     var _state$config;
     return (_state$config = state.config) === null || _state$config === void 0 ? void 0 : _state$config.title;
   });
-  var vendor = (0, _reactRedux.useSelector)(state => {
+  var vendor = (0, _asab_webui_components.useAppSelector)(state => {
     var _state$config2;
     return (_state$config2 = state.config) === null || _state$config2 === void 0 ? void 0 : _state$config2.vendor;
   });
-  var website = (0, _reactRedux.useSelector)(state => {
+  var website = (0, _asab_webui_components.useAppSelector)(state => {
     var _state$config3;
     return (_state$config3 = state.config) === null || _state$config3 === void 0 ? void 0 : _state$config3.website;
   });
-  var email = (0, _reactRedux.useSelector)(state => {
+  var email = (0, _asab_webui_components.useAppSelector)(state => {
     var _state$config4;
     return (_state$config4 = state.config) === null || _state$config4 === void 0 ? void 0 : _state$config4.email;
   });

package/dist/modules/auth/components/SessionExpirationAlert.js

@@ -11,8 +11,7 @@ var _reactstrap = require("reactstrap");
 // Session expiration custom Alert component
 function SessionExpirationAlert(_ref) {
   var {
-    alert,
-    store
+    alert
   } = _ref;
   var {
     t

package/dist/modules/auth/header.js

@@ -7,9 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.AuthHeaderDropdown = AuthHeaderDropdown;
 exports.AuthHeaderInvitation = AuthHeaderInvitation;
 var _react = _interopRequireDefault(require("react"));
-var _reactRedux = require("react-redux");
 var _reactRouterDom = require("react-router-dom");
 var _reactI18next = require("react-i18next");
+var _asab_webui_components = require("asab_webui_components");
 var _seacatAuth = require("asab_webui_components/seacat-auth");
 var _reactstrap = require("reactstrap");
 require("./header.scss");
@@ -34,11 +34,7 @@ require("./header.scss");
 */
 
 function AuthHeaderInvitation(props) {
-  var resources = (0, _reactRedux.useSelector)(state => {
-    var _state$auth;
-    return (_state$auth = state.auth) === null || _state$auth === void 0 ? void 0 : _state$auth.resources;
-  });
-  var tenant = (0, _reactRedux.useSelector)(state => {
+  var tenant = (0, _asab_webui_components.useAppSelector)(state => {
     var _state$tenant;
     return (_state$tenant = state.tenant) === null || _state$tenant === void 0 ? void 0 : _state$tenant.current;
   });
@@ -46,7 +42,7 @@ function AuthHeaderInvitation(props) {
   var {
     t
   } = (0, _reactI18next.useTranslation)();
-  if (!tenant || !(0, _seacatAuth.isAuthorized)(['seacat:tenant:assign'])) {
+  if (!tenant || !(0, _seacatAuth.isAuthorized)(['seacat:tenant:assign'], props.app)) {
     return null;
   }
   ;
@@ -66,11 +62,11 @@ function AuthHeaderDropdown(props) {
   var {
     t
   } = (0, _reactI18next.useTranslation)();
-  var userinfo = (0, _reactRedux.useSelector)(state => {
-    var _state$auth2;
-    return (_state$auth2 = state.auth) === null || _state$auth2 === void 0 ? void 0 : _state$auth2.userinfo;
+  var userinfo = (0, _asab_webui_components.useAppSelector)(state => {
+    var _state$auth;
+    return (_state$auth = state.auth) === null || _state$auth === void 0 ? void 0 : _state$auth.userinfo;
   });
-  var isSuperuser = (0, _seacatAuth.isAuthorized)(['authz:superuser']);
+  var isSuperuser = (0, _seacatAuth.isAuthorized)(['authz:superuser'], props.app);
   var logout = () => {
     props.AuthModule.logout();
   };

package/dist/modules/auth/index.js

@@ -150,7 +150,8 @@ class AuthModule extends _asab_webui_components.Module {
           }
 
           // Validate resources of items and children in navigation (resource validation depends on tenant)
-          if (_this.App.Store && _this.App.Services.TenantService && _this.UserInfo !== null) {
+          if (_this.App.AppStore && _this.App.Services.TenantService && _this.UserInfo !== null) {
+            var _this$App, _this$App$dispatch;
             var currentTenant = _this.App.Services.TenantService.getCurrentTenant();
             var resources = _this.UserInfo.resources ? _this.UserInfo.resources[currentTenant] : [];
             /*
@@ -164,13 +165,13 @@ class AuthModule extends _asab_webui_components.Module {
               yield _this.Api.login(_this.RedirectURL, _force_login_prompt2);
               return;
             }
-            if (_this.App.Store != null) {
-              _this.App.Store.dispatch({
-                type: _actions.types.AUTH_RESOURCES,
-                resources: resources
-              });
-            }
-            yield _this.validateNavigation();
+            (_this$App = _this.App) === null || _this$App === void 0 || (_this$App = _this$App.AppStore) === null || _this$App === void 0 || (_this$App$dispatch = _this$App.dispatch) === null || _this$App$dispatch === void 0 || _this$App$dispatch.call(_this$App, {
+              type: _actions.types.AUTH_RESOURCES,
+              resources: resources
+            });
+            yield _this.validateNavigation({
+              resources
+            });
           }
           if (_this.UserInfo != null) {
             yield _this._startSessionExpirationValidation(); // Start session validation
@@ -228,12 +229,13 @@ class AuthModule extends _asab_webui_components.Module {
       if (mockParams.tenants) {
         mockParams["tenants"] = Object.values(mockParams.tenants);
       }
-      if (_this2.App.Store != null) {
-        _this2.App.Store.dispatch({
+      if (_this2.App.AppStore) {
+        var _this2$App$AppStore$d, _this2$App$AppStore, _this2$App$AppStore$d2, _this2$App$AppStore2;
+        (_this2$App$AppStore$d = (_this2$App$AppStore = _this2.App.AppStore).dispatch) === null || _this2$App$AppStore$d === void 0 || _this2$App$AppStore$d.call(_this2$App$AppStore, {
           type: _actions.types.AUTH_USERINFO,
           payload: mockParams
         });
-        _this2.App.Store.dispatch({
+        (_this2$App$AppStore$d2 = (_this2$App$AppStore2 = _this2.App.AppStore).dispatch) === null || _this2$App$AppStore$d2 === void 0 || _this2$App$AppStore$d2.call(_this2$App$AppStore2, {
           type: _actions.types.AUTH_RESOURCES,
           resources: mockParams["resources"]
         });
@@ -263,16 +265,18 @@ class AuthModule extends _asab_webui_components.Module {
   }
 
   // TODO: reconsider removing async/await with promise
-  validateNavigation() {
+  validateNavigation(_ref) {
     var _this3 = this;
     return (0, _asyncToGenerator2.default)(function* () {
-      var _state$navigation, _state$auth;
-      var state = _this3.App.Store.getState();
+      var _state$navigation, _this3$App$AppStore$d, _this3$App$AppStore;
+      var {
+        resources
+      } = _ref;
+      var state = _this3.App.AppStore.state;
       var navItems = (_state$navigation = state.navigation) === null || _state$navigation === void 0 ? void 0 : _state$navigation.navItems;
-      var resources = (_state$auth = state.auth) === null || _state$auth === void 0 ? void 0 : _state$auth.resources;
       var authorizedNavItems = [];
       navItems && (yield Promise.all(navItems.map(/*#__PURE__*/function () {
-        var _ref = (0, _asyncToGenerator2.default)(function* (itm, idx) {
+        var _ref2 = (0, _asyncToGenerator2.default)(function* (itm, idx) {
           if (resources.indexOf('authz:superuser') !== -1) {
             // If user is superuser, validate every navigation item
             authorizedNavItems.push(itm);
@@ -297,10 +301,10 @@ class AuthModule extends _asab_webui_components.Module {
           }
         });
         return function (_x, _x2) {
-          return _ref.apply(this, arguments);
+          return _ref2.apply(this, arguments);
         };
       }())));
-      _this3.App.Store.dispatch({
+      (_this3$App$AppStore$d = (_this3$App$AppStore = _this3.App.AppStore).dispatch) === null || _this3$App$AppStore$d === void 0 || _this3$App$AppStore$d.call(_this3$App$AppStore, {
         type: _actions2.SET_NAVIGATION_ITEMS,
         navItems: authorizedNavItems
       });
@@ -314,7 +318,7 @@ class AuthModule extends _asab_webui_components.Module {
       // Item's children validation
       var authorizedNavChildren = [];
       yield Promise.all(itm.children.map(/*#__PURE__*/function () {
-        var _ref2 = (0, _asyncToGenerator2.default)(function* (child, id) {
+        var _ref3 = (0, _asyncToGenerator2.default)(function* (child, id) {
           if (child.resource) {
             var access_auth = _this4._validateItemNav(child.resource, resources);
             if (access_auth == true) {
@@ -323,7 +327,7 @@ class AuthModule extends _asab_webui_components.Module {
           }
         });
         return function (_x3, _x4) {
-          return _ref2.apply(this, arguments);
+          return _ref3.apply(this, arguments);
         };
       }()));
       return authorizedNavChildren;
@@ -366,8 +370,9 @@ class AuthModule extends _asab_webui_components.Module {
       } catch (err) {
         console.error("Failed to update user info", err);
         _this5.UserInfo = null;
-        if (_this5.App.Store != null) {
-          _this5.App.Store.dispatch({
+        if (_this5.App.AppStore) {
+          var _this5$App$AppStore$d, _this5$App$AppStore;
+          (_this5$App$AppStore$d = (_this5$App$AppStore = _this5.App.AppStore).dispatch) === null || _this5$App$AppStore$d === void 0 || _this5$App$AppStore$d.call(_this5$App$AppStore, {
             type: _actions.types.AUTH_USERINFO,
             payload: _this5.UserInfo
           });
@@ -376,8 +381,9 @@ class AuthModule extends _asab_webui_components.Module {
       }
       _this5.UserInfo = response.data;
       _this5.SessionExpiration = (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.exp;
-      if (_this5.App.Store != null) {
-        _this5.App.Store.dispatch({
+      if (_this5.App.AppStore) {
+        var _this5$App$AppStore$d2, _this5$App$AppStore2;
+        (_this5$App$AppStore$d2 = (_this5$App$AppStore2 = _this5.App.AppStore).dispatch) === null || _this5$App$AppStore$d2 === void 0 || _this5$App$AppStore$d2.call(_this5$App$AppStore2, {
           type: _actions.types.AUTH_USERINFO,
           payload: _this5.UserInfo
         });
@@ -470,7 +476,7 @@ class AuthModule extends _asab_webui_components.Module {
       var warningDisplayed = false; // Tracks if the "about to expire" warning has been shown
 
       var _validateSession = /*#__PURE__*/function () {
-        var _ref3 = (0, _asyncToGenerator2.default)(function* () {
+        var _ref4 = (0, _asyncToGenerator2.default)(function* () {
           var currentTime = Date.now() / 1000; // Convert milliseconds to seconds
           var timeRemaining = _this8.SessionExpiration - currentTime; // Time difference for triggering "about to expire" warning
           // Prevent glitches on very large time remaining values
@@ -522,13 +528,13 @@ class AuthModule extends _asab_webui_components.Module {
               // Stop further checks
               clearTimeout(_this8.sessionValidationInterval);
               _this8.sessionValidationInterval = null;
-              _this8.App.addAlert("info", "ASABAuthModule|Your session has expired.", 3600 * 1000, true, (alert, store) => /*#__PURE__*/_react.default.createElement(_SessionExpirationAlert.SessionExpirationAlert, {
-                alert: alert,
-                store: store
+              _this8.App.addAlert("info", "ASABAuthModule|Your session has expired.", 3600 * 1000, true, alert => /*#__PURE__*/_react.default.createElement(_SessionExpirationAlert.SessionExpirationAlert, {
+                alert: alert
               }));
               // Disable UI elements
-              if (_this8.App.Store) {
-                _this8.App.Store.dispatch({
+              if (_this8.App.AppStore) {
+                var _this8$App$AppStore$d, _this8$App$AppStore;
+                (_this8$App$AppStore$d = (_this8$App$AppStore = _this8.App.AppStore).dispatch) === null || _this8$App$AppStore$d === void 0 || _this8$App$AppStore$d.call(_this8$App$AppStore, {
                   type: _actions.types.AUTH_SESSION_EXPIRATION,
                   sessionExpired: true
                 });
@@ -552,7 +558,7 @@ class AuthModule extends _asab_webui_components.Module {
           _this8.sessionValidationInterval = setTimeout(_validateSession, 10000);
         });
         return function validateSession() {
-          return _ref3.apply(this, arguments);
+          return _ref4.apply(this, arguments);
         };
       }();
 

package/dist/modules/auth/screens/AccessControlScreen.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactI18next = require("react-i18next");
-var _reactRedux = require("react-redux");
+var _asab_webui_components = require("asab_webui_components");
 var _reactstrap = require("reactstrap");
 /*
 
@@ -36,23 +36,22 @@ function AccessControlScreen(props) {
 }
 var _default = exports.default = AccessControlScreen;
 function AccessControlCard(props) {
-  var _useSelector;
   var {
     t,
     i18n
   } = (0, _reactI18next.useTranslation)();
-  var tenant = (0, _reactRedux.useSelector)(state => {
+  var tenant = (0, _asab_webui_components.useAppSelector)(state => {
     var _state$tenant;
     return (_state$tenant = state.tenant) === null || _state$tenant === void 0 ? void 0 : _state$tenant.current;
   });
-  var userinfo = (0, _reactRedux.useSelector)(state => {
+  var userinfo = (0, _asab_webui_components.useAppSelector)(state => {
     var _state$auth;
     return (_state$auth = state.auth) === null || _state$auth === void 0 ? void 0 : _state$auth.userinfo;
   });
-  var resources = ((_useSelector = (0, _reactRedux.useSelector)(state => {
+  var resources = ((0, _asab_webui_components.useAppSelector)(state => {
     var _state$auth2;
     return (_state$auth2 = state.auth) === null || _state$auth2 === void 0 ? void 0 : _state$auth2.resources;
-  })) === null || _useSelector === void 0 ? void 0 : _useSelector.sort()) || [];
+  }) || []).slice().sort();
   return /*#__PURE__*/_react.default.createElement(_reactstrap.Card, null, /*#__PURE__*/_react.default.createElement(_reactstrap.CardHeader, {
     className: "card-header-flex"
   }, /*#__PURE__*/_react.default.createElement("div", {

package/dist/modules/auth/screens/InvitationScreen.js

@@ -8,7 +8,6 @@ exports.default = InvitationScreen;
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
-var _reactRedux = require("react-redux");
 var _asab_webui_components = require("asab_webui_components");
 var _reactRouterDom = require("react-router-dom");
 var _reactstrap = require("reactstrap");
@@ -19,7 +18,7 @@ function InvitationScreen(props) {
   var [isInvitationSuccessful, setIsInvitationSuccessful] = (0, _react.useState)(undefined);
   var [registrationUrl, setRegistrationUrl] = (0, _react.useState)(undefined);
   var [urlCopied, setUrlCopied] = (0, _react.useState)(undefined);
-  var tenant = (0, _reactRedux.useSelector)(state => {
+  var tenant = (0, _asab_webui_components.useAppSelector)(state => {
     var _state$tenant;
     return (_state$tenant = state.tenant) === null || _state$tenant === void 0 ? void 0 : _state$tenant.current;
   });

package/dist/modules/i18n/dropdown.js

@@ -7,7 +7,7 @@ exports.default = LanguageDropdown;
 var _react = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
 var _actions = require("./actions");
-var _reactRedux = require("react-redux");
+var _asab_webui_components = require("asab_webui_components");
 var _reactstrap = require("reactstrap");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function LanguageDropdown(props) {
@@ -20,7 +20,9 @@ function LanguageDropdown(props) {
       // if the hard refresh is needed: window.location.reload(false);
     });
   };
-  var dispatch = (0, _reactRedux.useDispatch)();
+  var {
+    dispatch
+  } = (0, _asab_webui_components.useAppStore)();
   (0, _react.useEffect)(() => {
     var _i18n$language;
     dispatch({

package/dist/modules/tenant/TenantDropdown.js

@@ -3,20 +3,24 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = TenantDropdown;
 var _react = _interopRequireWildcard(require("react"));
-var _reactRedux = require("react-redux");
+var _asab_webui_components = require("asab_webui_components");
 var _reactI18next = require("react-i18next");
 var _reactstrap = require("reactstrap");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
-function TenantDropdown(_ref) {
-  var {
-    tenants,
-    current
-  } = _ref;
+function TenantDropdown() {
   var {
     t
   } = (0, _reactI18next.useTranslation)();
+  var current = (0, _asab_webui_components.useAppSelector)(state => {
+    var _state$tenant;
+    return state === null || state === void 0 || (_state$tenant = state.tenant) === null || _state$tenant === void 0 ? void 0 : _state$tenant.current;
+  });
+  var tenants = (0, _asab_webui_components.useAppSelector)(state => {
+    var _state$tenant2;
+    return state === null || state === void 0 || (_state$tenant2 = state.tenant) === null || _state$tenant2 === void 0 ? void 0 : _state$tenant2.tenants;
+  });
   return /*#__PURE__*/_react.default.createElement(_reactstrap.UncontrolledDropdown, {
     direction: "down",
     title: t('tenant|Tenant')
@@ -39,16 +43,9 @@ function TenantDropdown(_ref) {
     tenant: tenant
   })))) : null);
 }
-function TenantLabel(_ref2) {
+function TenantLabel(_ref) {
   var {
     tenant
-  } = _ref2;
+  } = _ref;
   return /*#__PURE__*/_react.default.createElement("span", null, tenant);
-}
-var mapStateToProps = state => {
-  return {
-    current: state.tenant.current,
-    tenants: state.tenant.tenants
-  };
-};
-var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, null)(TenantDropdown);
+}

package/dist/modules/tenant/service.js

@@ -40,6 +40,7 @@ class TenantService extends _asab_webui_components.Service {
     var _arguments = arguments,
       _this2 = this;
     return (0, _asyncToGenerator2.default)(function* () {
+      var _this2$App, _this2$App$dispatch;
       var authorizedTenant = _arguments.length > 1 && _arguments[1] !== undefined ? _arguments[1] : undefined;
       // Extract the current tenant from URL params
       var tenantFromUrl = _this2._extractTenantFromUrl();
@@ -84,7 +85,7 @@ class TenantService extends _asab_webui_components.Service {
       }
 
       // Dispatch tenants obtained from userinfo
-      _this2.App.Store.dispatch({
+      (_this2$App = _this2.App) === null || _this2$App === void 0 || (_this2$App = _this2$App.AppStore) === null || _this2$App === void 0 || (_this2$App$dispatch = _this2$App.dispatch) === null || _this2$App$dispatch === void 0 || _this2$App$dispatch.call(_this2$App, {
         type: _actions.types.TENANTS_CHANGED,
         tenants_list: availableTenants,
         current: currentTenant
@@ -124,9 +125,10 @@ class TenantService extends _asab_webui_components.Service {
 
   // getCurrentTenant() method is used for obtaining current tenant
   getCurrentTenant() {
-    var state = this.App.Store.getState();
-    var currentTenant = state.tenant.current;
-    // If current tenant is not in redux store yet, get it from the URL params
+    var _this$App, _state$tenant;
+    var state = (_this$App = this.App) === null || _this$App === void 0 || (_this$App = _this$App.AppStore) === null || _this$App === void 0 ? void 0 : _this$App.state;
+    var currentTenant = state === null || state === void 0 || (_state$tenant = state.tenant) === null || _state$tenant === void 0 ? void 0 : _state$tenant.current;
+    // If current tenant is not in Application store yet, get it from the URL params
     if (!currentTenant) {
       currentTenant = this._extractTenantFromUrl();
     }

package/dist/screens/SuspenseScreen.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = SuspenseScreen;
 var _react = _interopRequireWildcard(require("react"));
-var _reactRedux = require("react-redux");
 var _asab_webui_components = require("asab_webui_components");
 var _reactstrap = require("reactstrap");
 var _BrandImage = require("../components/branding/BrandImage");
@@ -13,7 +12,7 @@ require("./SuspenseScreen.scss");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function SuspenseScreen(props) {
   var [brandImage, setBrandImage] = (0, _react.useState)(undefined);
-  var theme = (0, _reactRedux.useSelector)(state => state.theme);
+  var theme = (0, _asab_webui_components.useAppSelector)(state => state.theme);
   (0, _react.useEffect)(() => {
     setBrandImage((0, _BrandImage.getBrandImage)(props, theme));
   }, [theme]);

package/dist/screens/UnauthorizedAccessScreen.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = UnauthorizedAccessScreen;
 var _react = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
-var _reactRedux = require("react-redux");
+var _asab_webui_components = require("asab_webui_components");
 var _reactstrap = require("reactstrap");
 require("./UnauthorizedAccessScreen.scss");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
@@ -23,7 +23,7 @@ function UnauthorizedAccessScreen(props) {
   var {
     t
   } = (0, _reactI18next.useTranslation)();
-  var resources = (0, _reactRedux.useSelector)(state => {
+  var resources = (0, _asab_webui_components.useAppSelector)(state => {
     var _state$auth;
     return (_state$auth = state.auth) !== null && _state$auth !== void 0 && _state$auth.resources ? state.auth.resources : [];
   });

package/dist/services/AttentionRequiredService.js

@@ -97,10 +97,11 @@ class AttentionRequiredService extends _asab_webui_components.Service {
     }
   }
 
-  // Method for distributing the data into redux store
+  // Method for distributing the data into Application store
   distributeData(data) {
+    var _this$App2, _this$App2$dispatch;
     var transformedData = this.transformData(data);
-    this.App.Store.dispatch({
+    (_this$App2 = this.App) === null || _this$App2 === void 0 || (_this$App2 = _this$App2.AppStore) === null || _this$App2 === void 0 || (_this$App2$dispatch = _this$App2.dispatch) === null || _this$App2$dispatch === void 0 || _this$App2$dispatch.call(_this$App2, {
       type: _actions.SET_ATTENTION_REQUIRED_BEACON,
       beacon: transformedData
     });

package/dist/services/HeaderService.js

@@ -40,13 +40,14 @@ class HeaderService extends _asab_webui_components.Service {
   	*/
 
   addComponent(component) {
+    var _this$App, _this$App$dispatch;
     this.Items.push({
       'component': component.component,
       'componentProps': component.componentProps,
       'order': component.order,
       'fullscreenVisible': component.fullscreenVisible
     });
-    this.App.Store.dispatch({
+    (_this$App = this.App) === null || _this$App === void 0 || (_this$App = _this$App.AppStore) === null || _this$App === void 0 || (_this$App$dispatch = _this$App.dispatch) === null || _this$App$dispatch === void 0 || _this$App$dispatch.call(_this$App, {
       type: _actions.SET_HEADER_NAVIGATION_ITEMS,
       headerNavItems: this.Items
     });
@@ -54,9 +55,10 @@ class HeaderService extends _asab_webui_components.Service {
 
   // This function removes a component from the Header
   removeComponent(component) {
+    var _this$App$AppStore, _this$App$AppStore$di;
     var filteredItems = this.Items.filter(item => item.component !== component);
     this.Items = filteredItems;
-    this.App.Store.dispatch({
+    (_this$App$AppStore = this.App.AppStore) === null || _this$App$AppStore === void 0 || (_this$App$AppStore$di = _this$App$AppStore.dispatch) === null || _this$App$AppStore$di === void 0 || _this$App$AppStore$di.call(_this$App$AppStore, {
       type: _actions.SET_HEADER_NAVIGATION_ITEMS,
       headerNavItems: this.Items
     });

package/dist/services/ReduxService.js

@@ -4,16 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _asab_webui_components = require("asab_webui_components");
 class ReduxService {
-  constructor() {
-    this.Reducers = {};
-  }
+  // Register reducer
   addReducer(name, reducer) {
-    if (name in this.Reducers) {
-      console.warn("Reducer with name ".concat(name, " already exists."));
-      return;
-    }
-    this.Reducers[name] = reducer;
+    (0, _asab_webui_components.registerReducer)(name, reducer);
   }
 }
 exports.default = ReduxService;

package/dist/services/TitleService.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _react = _interopRequireDefault(require("react"));
 var _asab_webui_components = require("asab_webui_components");
 var _actions = require("../actions");
 class TitleService extends _asab_webui_components.Service {
@@ -21,9 +20,10 @@ class TitleService extends _asab_webui_components.Service {
     (0, _defineProperty2.default)(this, "clearSubtitle", () => {
       this._updateSubtitle(undefined);
     });
-    // Method for dispatching subtitle update to Redux store
+    // Method for dispatching subtitle update to Application store
     (0, _defineProperty2.default)(this, "_updateSubtitle", subtitle => {
-      this.App.Store.dispatch({
+      var _this$App, _this$App$dispatch;
+      (_this$App = this.App) === null || _this$App === void 0 || (_this$App = _this$App.AppStore) === null || _this$App === void 0 || (_this$App$dispatch = _this$App.dispatch) === null || _this$App$dispatch === void 0 || _this$App$dispatch.call(_this$App, {
         type: _actions.SET_SUBTITLE,
         subtitle: subtitle
       });