Skip to content

Commit d434edb

Browse files
authored
[release/cog/2.0.5] - [OGUI-1807] and [OGUI-1808] (#3157)
* [OGUI-1808] Allow Global roles to use force lock actions * [OGUI-1807] Fix miss-spell of broadcast key * Bump COG 2.0.5
1 parent 7e8cbd9 commit d434edb

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

Control/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Control/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@aliceo2/control",
3-
"version": "2.0.4",
3+
"version": "2.0.5",
44
"description": "ALICE O2 Control GUI",
55
"author": "George Raduta",
66
"contributors": [

Control/public/common/enums/BroadcastKeys.enum.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export const BroadcastKeys = Object.freeze({
1919
PADLOCK_UPDATE: 'padlock-update',
2020
NOTIFICATION: 'notification',
2121
O2_ROC_CONFIG: 'o2-roc-config',
22-
COMPONENT_STATUS: 'component-STATUS',
22+
COMPONENT_STATUS: 'components-STATUS',
2323
CALIBRATION_RUNS_BY_DETECTOR: 'CALIBRATION_RUNS_BY_DETECTOR',
2424
CALIBRATION_RUNS_REQUESTS: 'CALIBRATION_RUNS_REQUESTS',
2525
DCS: {

Control/public/lock/lockPage.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ const detectorLocksTable = (model, detectorLocksState) => {
102102
h('thead',
103103
h('tr',
104104
LOCK_TABLE_HEADER_KEYS.map((header) => h('th', header)),
105-
isUserAllowedRole(ROLES.Admin) && h('th', 'Admin actions')
105+
isUserAllowedRole(ROLES.Global) && h('th', 'Global actions')
106106
)
107107
),
108108
h('tbody', [
@@ -138,7 +138,7 @@ const detectorLockRow = (model, detector, lockState) => {
138138
])
139139
),
140140
h('td', ownerName),
141-
isUserAllowedRole(ROLES.Admin) && h('td', [
141+
isUserAllowedRole(ROLES.Global) && h('td', [
142142
detectorLockActionButton(model.lock, detector, lockState, DetectorLockAction.RELEASE, true, 'Force Release'),
143143
detectorLockActionButton(model.lock, detector, lockState, DetectorLockAction.TAKE, true, 'Force Take')
144144
])

0 commit comments

Comments
 (0)