From a76b8d163d7c687808d819912c68c80407d484be Mon Sep 17 00:00:00 2001
From: "gridsuite-actions[bot]"
 <184927986+gridsuite-actions[bot]@users.noreply.github.com>
Date: Mon, 5 May 2025 10:11:55 +0000
Subject: [PATCH 1/2] Bump version to v2.18.0-SNAPSHOT

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0af6675..1375047 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "gridadmin-app",
-    "version": "2.17.0-SNAPSHOT",
+    "version": "2.18.0-SNAPSHOT",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "gridadmin-app",
-            "version": "2.17.0-SNAPSHOT",
+            "version": "2.18.0-SNAPSHOT",
             "license": "MPL-2.0",
             "dependencies": {
                 "@emotion/react": "^11.14.0",
diff --git a/package.json b/package.json
index e9d7d75..7d022aa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "gridadmin-app",
-    "version": "2.17.0-SNAPSHOT",
+    "version": "2.18.0-SNAPSHOT",
     "license": "MPL-2.0",
     "private": true,
     "type": "module",

From 6099a42603acb03074674d185e4c1f673f1d0752 Mon Sep 17 00:00:00 2001
From: Abdelsalem <abdelsalem.hedhili@rte-france.com>
Date: Mon, 5 May 2025 14:20:45 +0200
Subject: [PATCH 2/2] remove_unsafe_regex

Signed-off-by: Abdelsalem <abdelsalem.hedhili@rte-france.com>
---
 src/utils/api-ws.ts | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/utils/api-ws.ts b/src/utils/api-ws.ts
index 84b37a9..0f19958 100644
--- a/src/utils/api-ws.ts
+++ b/src/utils/api-ws.ts
@@ -11,7 +11,17 @@ export type * from './api';
 
 export function getWsBase(): string {
     // We use the `baseURI` (from `<base/>` in index.html) to build the URL, which is corrected by httpd/nginx
-    return document.baseURI.replace(/^http(s?):\/\//, 'ws$1://').replace(/\/+$/, '') + import.meta.env.VITE_WS_GATEWAY;
+
+    let baseUri = document.baseURI.replace(/^http(s?):\/\//, 'ws$1://');
+    return removeTrailingSlashes(baseUri) + import.meta.env.VITE_WS_GATEWAY;
+}
+
+function removeTrailingSlashes(str: string) {
+    let end = str.length;
+    while (end > 0 && str[end - 1] === '/') {
+        end--;
+    }
+    return str.slice(0, end);
 }
 
 export function getUrlWithToken(baseUrl: string): string {