Merge remote-tracking branch 'origin/main' into feature/BAI-1570-writ…

…e-a-script-that-calculates-the-total-size-of-all-files-in-bailo
gchq · Jan 8, 2025 · f136fe5 · f136fe5
2 parents cb60d15 + b763203
commit f136fe5
Show file tree

Hide file tree

Showing 23 changed files with 10,214 additions and 3,566 deletions.
diff --git a/.github/workflows/build.js.yml b/.github/workflows/build.js.yml
@@ -101,7 +101,7 @@ jobs:
       - name: Use Node.js 18
         uses: actions/setup-node@v3
         with:
-          node-version: 18.17.1
+          node-version: 18.18.0
           cache: "npm"
 
       # Install dependencies
@@ -124,7 +124,7 @@ jobs:
       - name: Use Node.js 18
         uses: actions/setup-node@v3
         with:
-          node-version: 18.17.1
+          node-version: 18.18.0
           cache: "npm"
 
       # Install dependencies
@@ -144,7 +144,7 @@ jobs:
       - name: Use Node.js 18
         uses: actions/setup-node@v3
         with:
-          node-version: 18.17.1
+          node-version: 18.18.0
           cache: "npm"
 
       # Setup BuildX
@@ -305,7 +305,7 @@ jobs:
       - name: Use Node.js 18
         uses: actions/setup-node@v3
         with:
-          node-version: 18.17.1
+          node-version: 18.18.0
           cache: "npm"
 
       # Setup BuildX
@@ -431,7 +431,7 @@ jobs:
       - name: Use Node.js 18
         uses: actions/setup-node@v3
         with:
-          node-version: 18.17.1
+          node-version: 18.18.0
           cache: "npm"
 
       # Setup BuildX

diff --git a/backend/src/connectors/authorisation/base.ts b/backend/src/connectors/authorisation/base.ts
@@ -111,7 +111,11 @@ export class BasicAuthorisationConnector {
           return { id: model.id, success: false, info: 'You do not have permission to update a model card.' }
         }
 
-        if (ModelAction.Update === action && (await missingRequiredRole(user, model, ['owner', 'mtr', 'msro']))) {
+        if (
+          ModelAction.Update === action &&
+          (await missingRequiredRole(user, model, ['owner', 'mtr', 'msro'])) &&
+          !(await authentication.hasRole(user, Roles.Admin))
+        ) {
           return { id: model.id, success: false, info: 'You do not have permission to update a model.' }
         }