asab_webui_shell 27.2.7 → 27.3.1

package/README.md

@@ -21,6 +21,8 @@ Possible imports:
 - AuthModule
 - TenantModule
 - I18nModule
+- AttentionRequiredModule
+- InviteModule
 - getBrandImage
 
 ## Documentation

package/dist/containers/Application.js

@@ -402,7 +402,14 @@ class Application extends _react.Component {
     for (var interceptor of this.WebSocketInterceptors.keys()) {
       // Avoid pushing undefined interceptor values
       if (interceptor) {
-        subprotocols.push(interceptor);
+        /*
+        	Interceptor should be a function that returns the current subprotocol value
+        	Otherwise use the value directly (for backward compatibility)
+        */
+        var interceptorValue = typeof interceptor === 'function' ? interceptor() : interceptor;
+        if (interceptorValue) {
+          subprotocols.push(interceptorValue);
+        }
       }
     }
 

package/dist/index.js

@@ -34,6 +34,12 @@ Object.defineProperty(exports, "I18nModule", {
     return _i18n.default;
   }
 });
+Object.defineProperty(exports, "InviteModule", {
+  enumerable: true,
+  get: function get() {
+    return _invite.default;
+  }
+});
 Object.defineProperty(exports, "TenantModule", {
   enumerable: true,
   get: function get() {
@@ -53,4 +59,5 @@ var _i18n = _interopRequireDefault(require("./modules/i18n"));
 var _tenant = _interopRequireDefault(require("./modules/tenant"));
 var _auth = _interopRequireDefault(require("./modules/auth"));
 var _about = _interopRequireDefault(require("./modules/about"));
-var _index2 = _interopRequireDefault(require("./modules/attentionrequired/index.js"));
+var _index2 = _interopRequireDefault(require("./modules/attentionrequired/index.js"));
+var _invite = _interopRequireDefault(require("./modules/invite"));

package/dist/modules/auth/header.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.AuthHeaderDropdown = AuthHeaderDropdown;
-exports.AuthHeaderInvitation = AuthHeaderInvitation;
 var _react = _interopRequireDefault(require("react"));
 var _reactRouter = require("react-router");
 var _reactI18next = require("react-i18next");
@@ -33,35 +32,15 @@ require("./header.scss");
 
 */
 
-function AuthHeaderInvitation(props) {
-  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 navigate = (0, _reactRouter.useNavigate)();
-  var {
-    t
-  } = (0, _reactI18next.useTranslation)();
-  if (!tenant || !(0, _seacatAuth.isAuthorized)(['seacat:tenant:assign'], props.app)) {
-    return null;
-  }
-  ;
-  return /*#__PURE__*/_react.default.createElement(_reactstrap.Button, {
-    outline: true,
-    onClick: e => {
-      e.preventDefault(), navigate('/auth/invite');
-    },
-    title: t('AuthHeader|Invite other users'),
-    className: "invite-nav-button",
-    color: "primary"
-  }, /*#__PURE__*/_react.default.createElement("i", {
-    className: "bi bi-person-plus me-2"
-  }), t('AuthHeader|Invite other users'));
-}
 function AuthHeaderDropdown(props) {
+  var _props$app;
   var {
     t
   } = (0, _reactI18next.useTranslation)();
+  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, _asab_webui_components.useAppSelector)(state => {
     var _state$auth;
     return (_state$auth = state.auth) === null || _state$auth === void 0 ? void 0 : _state$auth.userinfo;
@@ -70,6 +49,9 @@ function AuthHeaderDropdown(props) {
   var logout = () => {
     props.AuthModule.logout();
   };
+
+  // Validation on displaying the invite option
+  var displayInvite = ((_props$app = props.app) === null || _props$app === void 0 || (_props$app = _props$app.Modules) === null || _props$app === void 0 ? void 0 : _props$app.some(obj => (obj === null || obj === void 0 ? void 0 : obj.Name) === "InviteModule")) && tenant && (0, _seacatAuth.isAuthorized)(['seacat:tenant:assign'], props.app);
   return /*#__PURE__*/_react.default.createElement(_reactstrap.UncontrolledDropdown, {
     direction: "down"
   }, /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownToggle, {
@@ -88,7 +70,14 @@ function AuthHeaderDropdown(props) {
     className: "shadow"
   }, /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownItem, {
     header: true
-  }, t('AuthHeader|My account')), /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownItem, {
+  }, t('AuthHeader|My account')), displayInvite && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownItem, {
+    divider: true
+  }), /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownItem, {
+    tag: _reactRouter.Link,
+    to: "/auth/invite"
+  }, t('AuthHeader|Invite other users')), /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownItem, {
+    divider: true
+  })), /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownItem, {
     tag: _reactRouter.Link,
     to: "/auth/access-control"
   }, t('AuthHeader|Access control')), /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownItem, {

package/dist/modules/auth/index.js

@@ -17,7 +17,6 @@ var _locationReplace = require("../../components/locationReplace");
 var _SessionExpirationAlert = require("./components/SessionExpirationAlert");
 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); } // TODO: Use SessionExpirationAlert only after proper fix of the component
 var AccessControlScreen = /*#__PURE__*/(0, _react.lazy)(() => Promise.resolve().then(() => _interopRequireWildcard(require("./screens/AccessControlScreen"))));
-var InvitationScreen = /*#__PURE__*/(0, _react.lazy)(() => Promise.resolve().then(() => _interopRequireWildcard(require("./screens/InvitationScreen"))));
 class AuthModule extends _asab_webui_components.Module {
   constructor(app, name) {
     super(app, "AuthModule");
@@ -41,27 +40,11 @@ class AuthModule extends _asab_webui_components.Module {
       component: AccessControlScreen,
       resource: "*"
     });
-
-    // Invitation screen
-    app.Router.addRoute({
-      path: '/auth/invite',
-      end: true,
-      name: 'Invite',
-      component: InvitationScreen,
-      resource: "seacat:tenant:assign"
-    });
   }
   initialize() {
     var _this = this;
     return (0, _asyncToGenerator2.default)(function* () {
       var headerService = _this.App.locateService("HeaderService");
-      headerService.addComponent({
-        component: _header.AuthHeaderInvitation,
-        componentProps: {
-          AuthModule: _this
-        },
-        order: 200
-      });
       headerService.addComponent({
         component: _header.AuthHeaderDropdown,
         componentProps: {
@@ -195,7 +178,8 @@ class AuthModule extends _asab_webui_components.Module {
     return interceptor;
   }
   webSocketAuthInterceptor() {
-    return "access_token_".concat(this.OAuthTokens['access_token']);
+    // Return a function to ensure that the token is always current and not static
+    return () => "access_token_".concat(this.OAuthTokens['access_token']);
   }
   simulateUserinfo(mock_userinfo) {
     var _this2 = this;

package/dist/modules/invite/index.js

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _asab_webui_components = require("asab_webui_components");
+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); }
+var InvitationScreen = /*#__PURE__*/(0, _react.lazy)(() => Promise.resolve().then(() => _interopRequireWildcard(require("./InvitationScreen"))));
+class InviteModule extends _asab_webui_components.Module {
+  constructor(app, name) {
+    super(app, 'InviteModule');
+    // Invitation screen
+    app.Router.addRoute({
+      path: '/auth/invite',
+      end: true,
+      name: 'Invite',
+      component: InvitationScreen,
+      resource: 'seacat:tenant:assign'
+    });
+  }
+}
+exports.default = InviteModule;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "asab_webui_shell",
-	"version": "27.2.7",
+	"version": "27.3.1",
 	"license": "BSD-3-Clause",
 	"description": "TeskaLabs ASAB WebUI Shell Application",
 	"contributors": [