asab_webui_shell 27.2.7 → 27.2.8-alpha.0

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);
+        }
       }
     }
 
@@ -428,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 => {
@@ -439,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) {
@@ -489,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() {
@@ -506,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) {
@@ -541,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/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.7",
+	"version": "27.2.8-alpha.0",
 	"license": "BSD-3-Clause",
 	"description": "TeskaLabs ASAB WebUI Shell Application",
 	"contributors": [