Merge branch 'feature/keycloak-middleware-clean' into enhancement/openremote-client-service-register

Author: dominiquekleeven

frontend/src/common/util.ts

@@ -24,41 +24,20 @@
 export function getRootPath() {
     const scriptElement = document.querySelector('script[src*="bundle"]');
 
-    if (scriptElement && scriptElement.getAttribute('src')) {
+    if (scriptElement?.getAttribute('src')) {
         const scriptPath = new URL(scriptElement.getAttribute('src')!, window.location.href).pathname;
         // Positive lookahead to match everything up to bundle.js
-        const match = scriptPath.match(/(.*?)(?=bundle)/);
-        return match ? (match[1].endsWith('/') ? match[1].slice(0, -1) : match[1]) : '';
+        const regex = /(.*?)(?=bundle)/;
+        const match = regex.exec(scriptPath);
+        let rootPath = '';
+        if (match) {
+            rootPath = match[1].endsWith('/') ? match[1].slice(0, -1) : match[1];
+        }
+        return rootPath;
     }
     return '';
 }
 
-/**
- * Setup console logging to add a prefix to all console logs
- * Enabling proper distinction between logs from the service and other sources
- */
-export function setupConsoleLogging() {
-    const originalConsoleLog = console.log;
-    console.log = (...args) => {
-        originalConsoleLog('[ml-forecast]', ...args);
-    };
-
-    const originalConsoleInfo = console.info;
-    console.info = (...args) => {
-        originalConsoleInfo('[ml-forecast]', ...args);
-    };
-
-    const originalConsoleWarn = console.warn;
-    console.warn = (...args) => {
-        originalConsoleWarn('[ml-forecast]', ...args);
-    };
-
-    const originalConsoleError = console.error;
-    console.error = (...args) => {
-        originalConsoleError('[ml-forecast]', ...args);
-    };
-}
-
 /**
  * Get the realm search param from the url (?realm=)
  * @returns The realm search param

frontend/src/index.ts

@@ -18,7 +18,7 @@
 import { setupORIcons } from './common/theme';
 import { setupRouter } from './router';
 import { IS_EMBEDDED, ML_OR_KEYCLOAK_URL, ML_OR_URL } from './common/constants';
-import { getRealmSearchParam, setupConsoleLogging } from './common/util';
+import { getRealmSearchParam } from './common/util';
 import { manager } from '@openremote/core';
 import { Auth, EventProviderType, ManagerConfig } from '@openremote/model';
 
@@ -32,8 +32,6 @@ import './components/loading-spinner';
 import './components/breadcrumb-nav';
 import './components/alert-message';
 
-// Override default log statements with service prefix
-setupConsoleLogging();
 
 const DEFAULT_MANAGER_CONFIG: ManagerConfig = {
     managerUrl: ML_OR_URL || '/',