asab_webui_shell 27.5.2-alpha.0 → 27.5.4-alpha.1

package/dist/containers/Application.scss

@@ -109,6 +109,10 @@ body {
 		overflow-y: visible; // We want the full content to be displayed
 	}
 
+	.progress {
+		display: none;
+	}
+
 }
 
 }

package/dist/containers/Sidebar/index.js

@@ -99,7 +99,9 @@ function Sidebar(props) {
     setSidebarBottomBranding((0, _BrandImage.getBrandImage)(props, theme, 'sidebarLogo'));
   }, [theme]);
   var toggleSidebarModal = () => setIsSmallResolution(!isSmallResolution);
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, windowWidth <= 768 ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, windowWidth <= 768 ? /*#__PURE__*/_react.default.createElement("div", {
+    id: "app-sidebar"
+  }, /*#__PURE__*/_react.default.createElement("div", {
     onClick: toggleSidebarModal
   }, /*#__PURE__*/_react.default.createElement("i", {
     className: "bi ms-2 bi-list text-primary fs-1"

package/dist/modules/auth/api.js

@@ -11,21 +11,25 @@ var _locationReplace = require("../../components/locationReplace");
 class SeaCatAuthApi {
   /*
   SeaCat Auth Open ID Connect / OAuth2.0
-  
-  From config.js:
-  	module.exports = {
-  	app: {
-  		BASE_URL: 'http://localhost:3000',
-  		API_PATH: 'api',
-  		SERVICES: {openidconnect: 'openidconnect'},
-  		...
+  	From webpack.common.js:
+  	To change a Client ID, set the seacat.auth.client_id configuration variable in the webpack.common.js file:
+  	const { DefinePlugin } = require('webpack');
+  	...
+  	new DefinePlugin({
+  		'LOCAL_CONFIG': JSON.stringify({
+  			"seacat.auth.scope": "openid tenant userinfo:*",
+  			"seacat.auth.client_id": "llm-microlink-webui",
+  		}),
+  	})
   */
 
   constructor(app) {
     this.App = app;
-    var scope = this.App.Config.get('seacat.auth.scope');
-    this.Scope = scope ? scope : "openid tenant userinfo:* batman";
-    this.ClientId = "asab-webui-auth";
+    this.Scope = this.App.Config.get('seacat.auth.scope') || "openid tenant userinfo:* batman";
+    this.ClientId = this.App.Config.get('seacat.auth.client_id') || "asab-webui-auth";
+
+    // The console log is intentionally left here so that we can see the Client ID in the console
+    console.log('OpenID Connect Client ID:', this.ClientId);
     this.SeaCatAuthAPI = this.App.axiosCreate('seacat-auth');
     this.OidcAPI = this.App.axiosCreate('openidconnect');
   }
@@ -90,7 +94,6 @@ class SeaCatAuthApi {
     if (access_token != null) {
       headers.Authorization = 'Bearer ' + access_token;
     }
-    console.log("userinfo", access_token, internal);
     if (internal) {
       return this.SeaCatAuthAPI.get('/openidconnect/userinfo', {
         headers: headers

package/dist/modules/auth/index.js

@@ -32,11 +32,9 @@ class AuthModule extends _asab_webui_components.Module {
       // 	})
       // }),
       this.OAuthTokens = OAUTH_TOKENS;
-      console.log("OAuthTokens from OAUTH_TOKENS  (development mode!)", this.OAuthTokens);
     } else {
       // Read OAuth tokens from session storage
       this.OAuthTokens = JSON.parse(sessionStorage.getItem('SeaCatOAuth2Tokens'));
-      console.log("OAuthTokens from session storage", this.OAuthTokens);
     }
     this.UserInfo = null;
     this.Api = new _api.SeaCatAuthApi(app);
@@ -333,6 +331,11 @@ class AuthModule extends _asab_webui_components.Module {
     if (this.UserInfo !== null) {
       resources = this.UserInfo.resources ? this.UserInfo.resources[currentTenant] : [];
       tenants = this.UserInfo.tenants ? this.UserInfo.tenants : [];
+      if (tenants == null || tenants.length === 0) {
+        var _this$UserInfo$resour;
+        // Fallback to tenant from resources if tenants list is not available
+        tenants = Object.keys((_this$UserInfo$resour = this.UserInfo.resources) !== null && _this$UserInfo$resour !== void 0 ? _this$UserInfo$resour : {}).filter(tenant => tenant !== '*');
+      }
     }
     var valid = tenants ? tenants.indexOf(currentTenant) !== -1 : false;
     // If user is superuser, then tenant access is granted
@@ -344,8 +347,8 @@ class AuthModule extends _asab_webui_components.Module {
   updateUserInfo() {
     var _this3 = this;
     return (0, _asyncToGenerator2.default)(function* () {
+      var _this3$UserInfo;
       var internal = _this3.OAuthTokens.internal || false;
-      console.log("updateUserInfo", _this3.OAuthTokens, internal);
       if (!internal) {
         var _response$data;
         var response;
@@ -415,10 +418,20 @@ class AuthModule extends _asab_webui_components.Module {
         });
       }
 
-      /** Check for TenantService and pass tenants list obtained from userinfo */
+      // Check for TenantService and pass tenants list obtained from userinfo resources
       var availableTenants = _this3.UserInfo.tenants;
+      if (availableTenants == null || availableTenants.length === 0) {
+        var _this3$UserInfo$resou;
+        // Fallback to tenant from resources if tenants list is not available
+        availableTenants = Object.keys((_this3$UserInfo$resou = _this3.UserInfo.resources) !== null && _this3$UserInfo$resou !== void 0 ? _this3$UserInfo$resou : {}).filter(tenant => tenant !== '*');
+      }
+      if (((_this3$UserInfo = _this3.UserInfo) === null || _this3$UserInfo === void 0 ? void 0 : _this3$UserInfo.tenants) == null) {
+        // This is a monkey patch to add the tenants list to the userinfo if missing
+        _this3.UserInfo['tenants'] = availableTenants;
+      }
       if (_this3.App.Services.TenantService) {
-        yield _this3.App.Services.TenantService.setTenants(availableTenants, _this3._getAuthorizedTenant(_this3.UserInfo));
+        yield _this3.App.Services.TenantService.setTenants(availableTenants, _this3._getAuthorizedTenant(_this3.UserInfo) // Get the authorized tenant
+        );
       }
       return true;
     })();

package/dist/modules/tenant/TenantDropdown.js

@@ -1,9 +1,11 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = TenantDropdown;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _asab_webui_components = require("asab_webui_components");
 var _reactI18next = require("react-i18next");
@@ -12,6 +14,10 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 function TenantDropdown() {
   var _useTranslation = (0, _reactI18next.useTranslation)(),
     t = _useTranslation.t;
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    isOpen = _useState2[0],
+    setIsOpen = _useState2[1];
   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;
@@ -20,9 +26,12 @@ function TenantDropdown() {
     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, {
+  var toggle = () => setIsOpen(prev => !prev);
+  return /*#__PURE__*/_react.default.createElement(_reactstrap.Dropdown, {
+    isOpen: isOpen,
+    toggle: toggle,
     direction: "down",
-    title: t('tenant|Tenant')
+    title: t('General|Tenant')
   }, /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownToggle, {
     nav: true,
     caret: true
@@ -30,17 +39,20 @@ function TenantDropdown() {
     className: "bi bi-house-lock pe-2"
   }), /*#__PURE__*/_react.default.createElement(TenantLabel, {
     tenant: current
-  })), tenants && tenants.length > 0 ? /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownMenu, {
-    className: "shadow"
+  })), isOpen && (tenants === null || tenants === void 0 ? void 0 : tenants.length) > 0 && /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownMenu, {
+    className: "shadow overflow-y-auto",
+    style: {
+      maxHeight: '20em'
+    }
   }, /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownItem, {
     header: true
-  }, "Tenants"), tenants.map((tenant, i) => /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownItem, {
+  }, t('General|Tenants')), tenants.map((tenant, i) => /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownItem, {
     key: i,
     tag: "a",
     href: '?tenant=' + tenant + '#/'
   }, /*#__PURE__*/_react.default.createElement(TenantLabel, {
     tenant: tenant
-  })))) : null);
+  })))));
 }
 function TenantLabel(_ref) {
   var tenant = _ref.tenant;

package/dist/styles/constants/theme-print.scss

@@ -1,10 +1,11 @@
 @page print-portrait {
-	size: A4 portrait;
+	size: a4 portrait;
+	margin: 10mm;
 }
 
 @page print-landscape {
-	size: A4 landscape;
-	margin: 2cm 1cm 1.5cm;
+	size: a4 landscape;
+	margin: 10mm;
 }
 
 @media print {
@@ -79,7 +80,7 @@
 		--table-row-hover-bg-color-rgb: var(--soft-gray-rgb);
 
 		&.print-portrait {
-			width: 900px;
+			width: 1200px;
 		}
 
 		#app {
@@ -95,25 +96,7 @@
 		.card {
 			box-shadow: none !important;
 			border: 0 !important;
-			.card-header {
-				background-color: var(--white);
-				&.print-card-header {
-					min-height: auto;
-					.flex-fill {
-						height: auto;
-					}
-				}
 
-				i:not(.text-warning) {
-					display: none !important;
-				}
-				h3 {
-					font-size: 32px !important;
-				}
-			}
-			.card-body {
-				color: inherit !important;
-			}
 			.card-footer, .card-footer-flex, .input-group {
 				display: none !important;
 			}
@@ -165,48 +148,25 @@
 			}
 		}
 
+		// Taken from here: https://github.com/react-grid-layout/react-grid-layout/issues/589
 
-		.reports-container {
-			margin-top: 0 !important; /* Remove margin-top to prevent blank first page */
-			padding-top: 0 !important; /* Remove padding to prevent blank first page */
-			padding-bottom: 0 !important; /* Remove bottom padding to prevent blank spaces at the endof the sheet */
-			margin-bottom: 0 !important; /* Remove bottom margin to prevent blank spaces at the endof the sheet */
-			.react-grid-layout {
-				height: unset !important;
-				display: table;
-				text-align: center;
-				.react-grid-item {
-					display: inline-block;
-					position: unset !important;
-					transform: unset !important;
-					text-align: initial;
-					break-inside: avoid;
-				}
-				.react-grid-item:not(:has(.recharts-responsive-container)) {
-					height: initial !important; /* Allow table widgets to expand and show all content */
-				}
+		.react-grid-item {
+			position: unset !important;
+			transform: unset !important;
+			margin: 10px;
+			display: inline-block;
+	
+			> div {
+				page-break-inside: avoid;
+				break-inside: avoid;
 			}
 		}
-
-		.dashboard-container {
-			&.display-print {
-				.react-grid-layout {
-					position: static !important;
-					height: initial !important;
-					.react-grid-item {
-						display: block !important; /*avoid widgets breaking on transition between pages*/
-						margin: 0 auto 20px;
-						position: static !important;
-						width: initial !important; /* Alternatively, set "width: initial !important;" */
-						break-inside: avoid;
-						page-break-inside: avoid; /*avoid widgets breaking on transition between pages*/
-					}
-					.react-grid-item:not(:has(.recharts-responsive-container)) {
-						height: initial !important;
-					}
-				}
-			}
+	
+		.react-grid-layout {
+			height: unset !important;
+			display: table;
 		}
+	
 	}
 
 }

package/package.json

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