asab_webui_shell 26.1.3 → 26.2.1

package/dist/containers/Application.js

@@ -25,9 +25,7 @@ var _reducer4 = _interopRequireDefault(require("./Navigation/reducer"));
 var _reducer5 = _interopRequireDefault(require("./Router/reducer"));
 var _reducer6 = _interopRequireDefault(require("./FullscreenMode/reducer"));
 var _reducer7 = _interopRequireDefault(require("./AdvancedMode/reducer"));
-var _reducer8 = _interopRequireDefault(require("./AttentionRequired/reducer"));
 var _ReduxService = _interopRequireDefault(require("../services/ReduxService"));
-var _AttentionRequiredService = _interopRequireDefault(require("../services/AttentionRequiredService"));
 var _ConfigService = _interopRequireDefault(require("../config/ConfigService"));
 var _HeaderService = _interopRequireDefault(require("../services/HeaderService"));
 var _ThemeService = _interopRequireDefault(require("../theme/ThemeService"));
@@ -91,7 +89,6 @@ class Application extends _react.Component {
     this.Config = this.ConfigService.Config;
 
     // Register reducers which are not part of any app service
-    this.ReduxService.addReducer("attentionrequired", _reducer8.default);
     this.ReduxService.addReducer("alerts", _reducer.default);
     this.ReduxService.addReducer("advmode", _reducer7.default);
     this.ReduxService.addReducer("fullscreenmode", _reducer6.default);
@@ -104,7 +101,6 @@ class Application extends _react.Component {
     this.SplashscreenRequestors = new Set(); // If not empty, the splash screen will be rendered
     this.AxiosInterceptors = new Set();
     this.WebSocketInterceptors = new Set();
-    this.AttentionRequiredService = new _AttentionRequiredService.default(this, "AttentionRequired");
     this.HeaderService = new _HeaderService.default(this, "HeaderService");
     this.ThemeService = new _ThemeService.default(this, "ThemeService");
     this.BrandingService = new _BrandingService.default(this, "BrandingService");

package/dist/containers/Sidebar/SidebarItem.js

@@ -38,7 +38,7 @@ var SidebarItem = _ref => {
   var [isActive, setActive] = (0, _react.useState)(false);
   var lowercasedItemName = item === null || item === void 0 || (_item$name = item.name) === null || _item$name === void 0 ? void 0 : _item$name.toLowerCase();
   // Attention requred flag
-  var itemBeacon = beacon ? beacon["beacon.".concat(lowercasedItemName)] : attentionRequired["beacon.".concat(lowercasedItemName)];
+  var itemBeacon = beacon ? beacon["beacon.".concat(lowercasedItemName)] : attentionRequired === null || attentionRequired === void 0 ? void 0 : attentionRequired["beacon.".concat(lowercasedItemName)];
   (0, _react.useEffect)(() => {
     // TODO: refactor the handling of active and open states, since it does not behave as expected in some cases
     if (isOpen && !isActive) {

package/dist/index.js

@@ -16,6 +16,12 @@ Object.defineProperty(exports, "Application", {
     return _Application.default;
   }
 });
+Object.defineProperty(exports, "AttentionRequiredModule", {
+  enumerable: true,
+  get: function get() {
+    return _index2.default;
+  }
+});
 Object.defineProperty(exports, "AuthModule", {
   enumerable: true,
   get: function get() {
@@ -46,4 +52,5 @@ var _BrandImage = require("./components/branding/BrandImage");
 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 _about = _interopRequireDefault(require("./modules/about"));
+var _index2 = _interopRequireDefault(require("./modules/attentionrequired/index.js"));

package/dist/modules/attentionrequired/index.js

@@ -0,0 +1,21 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _asab_webui_components = require("asab_webui_components");
+var _service = _interopRequireDefault(require("./service.js"));
+var _reducer = _interopRequireDefault(require("./reducer.js"));
+class AttentionRequiredModule extends _asab_webui_components.Module {
+  constructor(app) {
+    var name = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "AttentionRequiredModule";
+    super(app, name);
+    this.App = app;
+    this.AttentionRequiredService = new _service.default(app, "AttentionRequiredService");
+    this.App.ReduxService.addReducer("attentionrequired", _reducer.default);
+  }
+}
+exports.default = AttentionRequiredModule;

package/dist/modules/attentionrequired/index.jsx

@@ -0,0 +1,17 @@
+import React from 'react';
+import { Module } from 'asab_webui_components';
+import AttentionRequiredService from './service.jsx';
+import reducer from './reducer.jsx';
+
+export default class AttentionRequiredModule extends Module {
+
+	constructor(app, name = "AttentionRequiredModule") {
+		super(app, name);
+		this.App = app;
+
+		this.AttentionRequiredService = new AttentionRequiredService(app, "AttentionRequiredService");
+
+		this.App.ReduxService.addReducer("attentionrequired", reducer);
+	}
+
+}

package/dist/modules/attentionrequired/reducer.jsx

@@ -0,0 +1,20 @@
+import { SET_ATTENTION_REQUIRED_BEACON } from "../../actions";
+
+const initialState = {
+	beacon: {},
+}
+
+// Reducer for attention required, returning beacon
+export default function attentionRequiredReducer(state = initialState, action) {
+	switch (action.type) {
+		case SET_ATTENTION_REQUIRED_BEACON: {
+			return {
+				...state,
+				beacon: action.beacon
+			}
+		}
+
+		default:
+			return state;
+	}
+}

package/dist/{services/AttentionRequiredService.js → modules/attentionrequired/service.js}

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _asab_webui_components = require("asab_webui_components");
-var _actions = require("../actions");
+var _actions = require("../../actions");
 // Service handling attention required
 class AttentionRequiredService extends _asab_webui_components.Service {
   constructor(app) {
@@ -101,6 +101,7 @@ class AttentionRequiredService extends _asab_webui_components.Service {
   distributeData(data) {
     var _this$App2, _this$App2$dispatch;
     var transformedData = this.transformData(data);
+    // TODO: use a pubsub instead of the appstore dispatch
     (_this$App2 = this.App) === null || _this$App2 === void 0 || (_this$App2 = _this$App2.AppStore) === null || _this$App2 === void 0 || (_this$App2$dispatch = _this$App2.dispatch) === null || _this$App2$dispatch === void 0 || _this$App2$dispatch.call(_this$App2, {
       type: _actions.SET_ATTENTION_REQUIRED_BEACON,
       beacon: transformedData

package/dist/modules/attentionrequired/service.jsx

@@ -0,0 +1,141 @@
+import { Service } from 'asab_webui_components';
+import { SET_ATTENTION_REQUIRED_BEACON } from '../../actions';
+
+// Service handling attention required
+export default class AttentionRequiredService extends Service {
+
+	constructor(app, serviceName="AttentionRequiredService"){
+		super(app, serviceName);
+		this.beaconWebSocket = null; // beacon websocket variable
+		this.reconnectTimeout = null; // timeout variable
+		this.reconnectInterval = 5000; // initial reconnection interval (5 seconds)
+	}
+
+	// Start beacon websocket connection on initialization
+	initialize() {
+		this.connectBeaconWebSocket();
+	}
+
+	// Method for connection to beacon websocket
+	connectBeaconWebSocket() {
+		// Retrieve current tenant
+		const currentTenant = this.App?.Services?.TenantService?.getCurrentTenant();
+		// Gracefully reconnect if tenant was not found
+		if (!currentTenant) {
+			console.error("Beacon WebSocket error: Tenant was not found!");
+			this.reconnectBeaconWebSocket();
+			return;
+		}
+
+		const BeaconServiceClient = this.App.createWebSocket('asab-remote-control', `/beacon/${currentTenant}/ws`);
+		this.beaconWebSocket = BeaconServiceClient;
+
+		this.beaconWebSocket.onopen = () => {
+			// TODO: may be removed
+			console.log('Beacon WebSocket connection established.');
+		};
+
+		this.beaconWebSocket.onmessage = (message) => {
+			try {
+				const data = JSON.parse(message.data);
+				// TODO: implement some type based recognition
+				this.distributeData(data);
+			} catch (e) {
+				console.error("Error parsing Beacon WebSocket message data:", e);
+				this.distributeData({});
+			}
+		};
+
+		this.beaconWebSocket.onerror = (error) => {
+			console.error("Beacon WebSocket error:", error);
+			console.error("Beacon WebSocket is attempting to reconnect...");
+			this.distributeData({});
+			this.reconnectBeaconWebSocket();
+		};
+
+		this.beaconWebSocket.onclose = () => {
+			/*
+				WebSocket connection is closed by the browser automatically when user
+				leaves the application (not the screen).
+			*/
+			if (this.beaconWebSocket) {
+				// Close the WebSocket connection
+				this.beaconWebSocket.close();
+
+				// Clean up event listeners
+				this.beaconWebSocket.onopen = null;
+				this.beaconWebSocket.onmessage = null;
+				this.beaconWebSocket.onerror = null;
+				this.beaconWebSocket.onclose = null;
+
+				// Set WebSocket reference to null to free up memory
+				this.beaconWebSocket = null;
+			}
+
+			// Clear the reconnect timeout if it exists
+			if (this.reconnectTimeout) {
+				clearTimeout(this.reconnectTimeout);
+				this.reconnectTimeout = null;
+			}
+
+			console.log("Beacon WebSocket connection closed.");
+		};
+	}
+
+	// Method for reconnection to beacon websocket
+	reconnectBeaconWebSocket() {
+		if (this.reconnectTimeout) {
+			clearTimeout(this.reconnectTimeout);
+		}
+		this.reconnectTimeout = setTimeout(() => {
+			this.connectBeaconWebSocket();
+		}, this.reconnectInterval); // Retry connection after the reconnection interval
+
+		// Increase reconnection time by 5s, the limit is 60s (so that we dont overload the server)
+		if ((this.reconnectInterval + 5000) <= 60000) {
+			this.reconnectInterval += 5000;
+		}
+	}
+
+	// Method for distributing the data into Application store
+	distributeData(data) {
+		const transformedData = this.transformData(data);
+		// TODO: use a pubsub instead of the appstore dispatch
+		this.App?.AppStore?.dispatch?.({ type: SET_ATTENTION_REQUIRED_BEACON, beacon: transformedData });
+	}
+
+	// Transform and group beacon data
+	transformData(inputData) {
+		// Validate if input data are array
+		if (!Array.isArray(inputData)) {
+			return {};
+		}
+
+		return inputData.reduce((acc, entry) => {
+			const { type, _c, reference_path } = entry;
+
+			// Identify the dynamic key (it could be 'library', 'configuration', 'services', etc.)
+			const dynamicKey = Object.keys(entry).find(key => (typeof entry[key] === 'object') && (entry[key] !== null) && !Array.isArray(entry[key]));
+
+			if (!dynamicKey) {
+				// Skip if no valid dynamic key is found
+				return acc;
+			}
+
+			const data = entry[dynamicKey];
+			// Ensure type is present in the accumulator
+			if (!acc[type]) {
+				acc[type] = {
+					count: 0,
+					data: []
+				};
+			}
+			// Push each entry into the data array
+			acc[type].data.push(data);
+			// Increment count for the type
+			acc[type].count += 1;
+
+			return acc;
+		}, {});
+	};
+}

package/package.json

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