Merge branch 'dev' of github.com:AliceO2Group/WebUi into feature/TKN/OGUI-1776/create-command-for-getting-token

Author: OmegaCreations

.github/workflows/configuration.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: '22.x'
       - run: (cd Configuration/webapp; npm ci )
@@ -29,7 +29,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: '22.x'
       - run: (cd Configuration/webapp; npm ci )

.github/workflows/control.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: '22.x'
       - run: (cd Control; npm ci )
@@ -29,7 +29,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: '22.x'
       - run: (cd Control; npm ci )

.github/workflows/framework.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: '22.x'
       - run: (cd Framework/Backend; openssl req -new  -newkey rsa:2048 -days 365 -nodes -x509 -subj "/C=CH/ST=Test/L=Test/O=Tst/CN=localhost" -keyout test.key -out test.pem)
@@ -29,7 +29,7 @@ jobs:
     timeout-minutes: 6
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version: '22.x'
       - run: (cd Framework; npm ci )
@@ -47,7 +47,7 @@ jobs:
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version: '22.x'
       - run: cd Framework; npm ci
@@ -64,7 +64,7 @@ jobs:
         run : (echo "Run Control tests by using @aliceo2/web-ui from local ../Framework";) 
       - uses: actions/checkout@v5
       - name: Setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: '22.x'
       - run: (cd Framework; npm ci)
@@ -86,7 +86,7 @@ jobs:
   #       run : (echo "Run QualityControl tests by using @aliceo2/web-ui from local ../Framework";) 
   #     - uses: actions/checkout@v5
   #     - name: Setup node
-  #       uses: actions/setup-node@v4
+  #       uses: actions/setup-node@v5
   #       with:
   #         node-version: '22.x'
   #     - run: (cd Framework; npm ci)
@@ -107,7 +107,7 @@ jobs:
         run : (echo "Run InfoLogger tests by using @aliceo2/web-ui from local ../Framework";) 
       - uses: actions/checkout@v5
       - name: Setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: '22.x'
       - run: (cd Framework; npm ci)

.github/workflows/infologger.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: '22.x'
       - run: (cd InfoLogger; npm ci )
@@ -27,7 +27,7 @@ jobs:
     timeout-minutes: 6
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version: '22.x'
       - run: (cd InfoLogger; npm ci )

.github/workflows/qc.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: '22.x'
       - run: (cd QualityControl; npm ci )
@@ -30,7 +30,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: '22.x'
       - run: (cd QualityControl; npm run docker-test )
@@ -42,7 +42,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: '22.x'
       - run: mkdir -p QualityControl/coverage 

.github/workflows/release.yml

@@ -12,7 +12,7 @@ jobs:
       TAG: ${{ steps.set-project.outputs.tag }}
     steps:
     - uses: actions/checkout@v5
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v5
       with:
         node-version: '22.x'
         registry-url: 'https://registry.npmjs.org'
@@ -52,7 +52,7 @@ jobs:
       ASSET_URL: ${{ steps.upload.outputs.asset_url }}
     steps:
     - uses: actions/checkout@v5
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v5
       with:
         node-version: '22.x'
         registry-url: 'https://registry.npmjs.org'

Configuration/webapp/package-lock.json

@@ -260,9 +260,16 @@ module.exports.setup = (http, ws) => {
     requireDetectorOrGlobalRoleMiddleware,
     lockController.actionLockHandler.bind(lockController)
   );
+
+  http.put(`/locks/force/:action/${DetectorId.ALL}`,
+    minimumRoleMiddleware(Role.ADMIN),
+    addDetectorIdMiddleware(DetectorId.ALL),
+    lockController.actionForceLockHandler.bind(lockController)
+  );
   http.put('/locks/force/:action/:detectorId',
     minimumRoleMiddleware(Role.GLOBAL),
-    lockController.actionForceLockHandler.bind(lockController));
+    lockController.actionForceLockHandler.bind(lockController)
+  );
 
   // Status Service
   http.get('/status/consul', statusController.getConsulStatus.bind(statusController));

Control/lib/api.js

@@ -43,10 +43,10 @@
     "eslint": "^8.56.0",
     "jsonwebtoken": "^9.0.2",
     "mocha": "^11.7.0",
-    "nock": "^14.0.0",
+    "nock": "^15.0.0",
     "nyc": "^17.1.0",
     "proxyquire": "^2.1.3",
-    "puppeteer": "^24.22.0",
+    "puppeteer": "^24.23.0",
     "sinon": "21.0.0",
     "supertest": "7.1.0"
   },