From fbb9a220bcde3cfadf79e556808db15980d4fc43 Mon Sep 17 00:00:00 2001 From: George Raduta Date: Fri, 15 Nov 2024 14:11:14 +0100 Subject: [PATCH 1/2] Display ALL actions just for Global and above --- Control/public/lock/lockPage.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Control/public/lock/lockPage.js b/Control/public/lock/lockPage.js index bf49f146a..24915eabf 100644 --- a/Control/public/lock/lockPage.js +++ b/Control/public/lock/lockPage.js @@ -60,11 +60,9 @@ export const content = (model) => { Failure: (error) => errorPage(error), Success: (detectorsLocksState) => h('.flex-column', [ h('.flex-row.g2.pv2', [ - isUserAllowedRole(ROLES.Admin) && [ + isUserAllowedRole(ROLES.Global) && [ detectorLockActionButton(lock, DETECTOR_ALL, {}, DetectorLockAction.RELEASE, true, 'Force Release ALL'), detectorLockActionButton(lock, DETECTOR_ALL, {}, DetectorLockAction.TAKE, true, 'Force Take ALL'), - ], - isUserAllowedRole(ROLES.Detector) && [ detectorLockActionButton(lock, DETECTOR_ALL, {}, DetectorLockAction.RELEASE, false, 'Release ALL*'), detectorLockActionButton(lock, DETECTOR_ALL, {}, DetectorLockAction.TAKE, false, 'Take ALL*'), ], From 7499d6d98e07f0773565a9931ba37b05ffe3b052 Mon Sep 17 00:00:00 2001 From: George Raduta Date: Fri, 15 Nov 2024 14:11:21 +0100 Subject: [PATCH 2/2] Patch COG version --- Control/package-lock.json | 4 ++-- Control/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Control/package-lock.json b/Control/package-lock.json index 49215ca62..6b0ca208f 100644 --- a/Control/package-lock.json +++ b/Control/package-lock.json @@ -1,12 +1,12 @@ { "name": "@aliceo2/control", - "version": "1.74.0", + "version": "1.74.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@aliceo2/control", - "version": "1.74.0", + "version": "1.74.1", "bundleDependencies": [ "@aliceo2/web-ui", "@grpc/grpc-js", diff --git a/Control/package.json b/Control/package.json index 90f2051e6..da5f24a98 100644 --- a/Control/package.json +++ b/Control/package.json @@ -1,6 +1,6 @@ { "name": "@aliceo2/control", - "version": "1.74.0", + "version": "1.74.1", "description": "ALICE O2 Control GUI", "author": "George Raduta", "contributors": [