asab_webui_shell 27.2.6 → 27.2.8-alpha.0

package/dist/containers/Application.js

@@ -75,10 +75,14 @@ class Application extends _react.Component {
     // This is important to preserve 64bit numbers from the server such as IP addresses, timestamps etc.
     this.JSONParseBigInt = new Set(props === null || props === void 0 ? void 0 : props.bigint);
     this._handleKeyUp = this._handleKeyUp.bind(this);
+    // Clear print-ready timeout handler
+    this._clearPrintReadyTimeout = this._clearPrintReadyTimeout.bind(this);
+    this._printReadyTimeout = null;
     this.state = {
       networking: 0,
       // If more than zero, some networking activity is happening
-      splashscreenRequestors: 0
+      splashscreenRequestors: 0,
+      printReadyIndicators: 1 // Initial value is set to 1, because we start the application with Splashscreen. When the Splashscreen is removed, the value is extracted. If value is more than zero, some print-ready activity is happening
     };
 
     // Subscribe and unsubscribe handlers for connectivity detection
@@ -254,6 +258,7 @@ class Application extends _react.Component {
       if (!networkingIndicatorOff) {
         that.pushNetworkingIndicator();
       }
+      that.pushPrintReadyIndicator();
       // Remove the X-Networking-Indicator header before sending to service (its only for internal use)
       config === null || config === void 0 || (_config$headers2 = config.headers) === null || _config$headers2 === void 0 || delete _config$headers2['X-Networking-Indicator'];
       config.headers['X-App'] = "webui"; // Include X-App header in every axios API request
@@ -270,7 +275,7 @@ class Application extends _react.Component {
       if (!response.config._networkingIndicatorOff) {
         that.popNetworkingIndicator();
       }
-
+      that.popPrintReadyIndicator();
       /*
       	Custom flag to control JSON parsing for specific requests.
       	If 'skipJsonParsing' is set to true in the request config,
@@ -314,6 +319,7 @@ class Application extends _react.Component {
       if (!((_error$config = error.config) !== null && _error$config !== void 0 && _error$config._networkingIndicatorOff)) {
         that.popNetworkingIndicator();
       }
+      that.popPrintReadyIndicator();
       var contentType = error === null || error === void 0 || (_error$response = error.response) === null || _error$response === void 0 || (_error$response = _error$response.headers) === null || _error$response === void 0 ? void 0 : _error$response['content-type'];
       // Check if the response content type is 'application/json' and data is a string
       if (contentType !== null && contentType !== void 0 && contentType.startsWith('application/json') && typeof (error === null || error === void 0 || (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : _error$response2.data) === 'string') {
@@ -396,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);
+        }
       }
     }
 
@@ -416,6 +429,26 @@ class Application extends _react.Component {
       networking: prevState.networking - 1
     }));
   }
+
+  // Display and hide print-ready indication
+  pushPrintReadyIndicator() {
+    this.setState(prevState => ({
+      printReadyIndicators: prevState.printReadyIndicators + 1
+    }));
+    console.log('print-ready', document.body.getAttribute('print-ready'), 'push');
+  }
+  popPrintReadyIndicator() {
+    this.setState(prevState => {
+      var nextValue = prevState.printReadyIndicators - 1;
+      if (nextValue < 0) {
+        console.warn('printReadyIndicators would go negative, setting its value to 0. The value was:', nextValue);
+      }
+      return {
+        printReadyIndicators: Math.max(nextValue, 0)
+      };
+    });
+    console.log('print-ready', document.body.getAttribute('print-ready'), 'pop');
+  }
   registerService(service) {
     if (service.Name in this.Services) {
       console.warn("Service ".concat(service.Name, " is already registered."));
@@ -448,12 +481,32 @@ class Application extends _react.Component {
 
     // Subscribe to Application.status! once PubSub is available
     this._initConnectivitySubscription();
-
     // Add print-landscape class to body if not present
     if (!document.body.classList.contains('print-landscape')) {
       document.body.classList.add('print-landscape');
     }
   }
+  componentDidUpdate(prevProps, prevState) {
+    if (prevState.printReadyIndicators === this.state.printReadyIndicators) {
+      return;
+    }
+
+    // Setting a print-ready attribute to the body of the application element
+    if (this.state.printReadyIndicators === 0) {
+      this._clearPrintReadyTimeout();
+      this._printReadyTimeout = setTimeout(() => {
+        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() {
     document.removeEventListener("keyup", this._handleKeyUp, false);
 
@@ -462,11 +515,24 @@ class Application extends _react.Component {
       this._unsubscribeConnectivity();
       this._unsubscribeConnectivity = null;
     }
+    this._clearPrintReadyTimeout();
+    document.body.removeAttribute('print-ready');
+    console.log('print-ready', document.body.getAttribute('print-ready'), 'unmount removed');
+  }
+  _clearPrintReadyTimeout() {
+    if (this._printReadyTimeout !== null) {
+      clearTimeout(this._printReadyTimeout);
+      this._printReadyTimeout = null;
+    }
   }
 
   // Splash screen
 
   addSplashScreenRequestor(obj) {
+    /*
+    	For print-ready, the initial value is set to 1, because we always start the application
+    	with Splashscreen and therefore we dont need to increment the print-ready number here.
+    */
     var origLen = this.SplashscreenRequestors.size;
     this.SplashscreenRequestors.add(obj);
     if (origLen != this.SplashscreenRequestors.size) {
@@ -486,6 +552,9 @@ class Application extends _react.Component {
     if (this.SplashscreenRequestors.size == 0) {
       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/modules/auth/index.js

@@ -195,7 +195,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/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.6",
+	"version": "27.2.8-alpha.0",
 	"license": "BSD-3-Clause",
 	"description": "TeskaLabs ASAB WebUI Shell Application",
 	"contributors": [