asab_webui_shell 27.2.8 → 27.3.2-alpha.0

package/README.md

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

package/dist/containers/Application.js

@@ -435,6 +435,7 @@ class Application extends _react.Component {
     this.setState(prevState => ({
       printReadyIndicators: prevState.printReadyIndicators + 1
     }));
+    console.log('print-ready', document.body.getAttribute('print-ready'), 'push');
   }
   popPrintReadyIndicator() {
     this.setState(prevState => {
@@ -446,6 +447,7 @@ class Application extends _react.Component {
         printReadyIndicators: Math.max(nextValue, 0)
       };
     });
+    console.log('print-ready', document.body.getAttribute('print-ready'), 'pop');
   }
   registerService(service) {
     if (service.Name in this.Services) {
@@ -496,11 +498,13 @@ class Application extends _react.Component {
         if (this.state.printReadyIndicators === 0) {
           document.body.setAttribute('print-ready', 'true');
           this._printReadyTimeout = null;
+          console.log('print-ready', document.body.getAttribute('print-ready'), 'set true');
         }
       }, 500); // Add 500ms delay to ensure that the print-ready attribute is set after the last print-ready indicator is popped
     } else {
       this._clearPrintReadyTimeout();
       document.body.setAttribute('print-ready', 'false');
+      console.log('print-ready', document.body.getAttribute('print-ready'), 'set false');
     }
   }
   componentWillUnmount() {
@@ -513,6 +517,7 @@ class Application extends _react.Component {
     }
     this._clearPrintReadyTimeout();
     document.body.removeAttribute('print-ready');
+    console.log('print-ready', document.body.getAttribute('print-ready'), 'unmount removed');
   }
   _clearPrintReadyTimeout() {
     if (this._printReadyTimeout !== null) {
@@ -548,6 +553,7 @@ class Application extends _react.Component {
       var splashscreen = document.getElementById('app-splashscreen'); // See public/index.html
       splashscreen === null || splashscreen === void 0 || splashscreen.classList.add("d-none");
       // Decrement print-ready indicator value if no splash screen requestors are present
+      console.log('print-ready', document.body.getAttribute('print-ready'), 'splash last removed, pop');
       this.popPrintReadyIndicator();
     }
   }

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: {

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/dist/screens/UnauthorizedAccessScreen.js

@@ -36,15 +36,18 @@ function UnauthorizedAccessScreen(props) {
     if (!isAuthorized) {
       document.body.setAttribute('print-ready', 'true');
       document.body.setAttribute('print-unauthorized', 'true');
+      console.log('print-ready', document.body.getAttribute('print-ready'), 'UnauthorizedAccessScreen set true');
     } else {
       document.body.removeAttribute('print-ready');
       document.body.removeAttribute('print-unauthorized');
+      console.log('print-ready', document.body.getAttribute('print-ready'), 'UnauthorizedAccessScreen cleared');
     }
 
     // Cleanup function to remove the attributes when the component unmounts
     return () => {
       document.body.removeAttribute('print-ready');
       document.body.removeAttribute('print-unauthorized');
+      console.log('print-ready', document.body.getAttribute('print-ready'), 'UnauthorizedAccessScreen cleanup');
     };
   }, [isAuthorized]);
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "asab_webui_shell",
-	"version": "27.2.8",
+	"version": "27.3.2-alpha.0",
 	"license": "BSD-3-Clause",
 	"description": "TeskaLabs ASAB WebUI Shell Application",
 	"contributors": [