Merge pull request #22 from ImperialCollegeLondon/ImperialDataEngineer

Imperial data engineer
ImperialCollegeLondon · Feb 12, 2024 · 8ee89a7 · 8ee89a7
2 parents e6b8c3d + 7b11d3a
commit 8ee89a7
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/api_app/_version.py b/api_app/_version.py
@@ -1 +1 @@
-__version__ = "0.18.7"
+__version__ = "0.18.8"
diff --git a/api_app/services/airlock.py b/api_app/services/airlock.py
@@ -71,7 +71,7 @@ def validate_user_allowed_to_access_storage_account(user: User, airlock_request:
     allowed_roles = []
 
     if (airlock_request.status == AirlockRequestStatus.InReview):
-        allowed_roles = ["AirlockManager", "WorkspaceOwner"]
+        allowed_roles = ["AirlockManager", "WorkspaceOwner", "ImperialWorkspaceDataEngineer"]
     else:
         allowed_roles = ["WorkspaceResearcher", "WorkspaceOwner", "ImperialWorkspaceDataEngineer"]
 

diff --git a/ui/app/package.json b/ui/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tre-ui",
-  "version": "0.5.27",
+  "version": "0.5.28",
   "private": true,
   "dependencies": {
     "@azure/msal-browser": "^2.35.0",

diff --git a/ui/app/src/components/shared/ResourceBody.tsx b/ui/app/src/components/shared/ResourceBody.tsx
@@ -25,14 +25,14 @@ export const ResourceBody: React.FunctionComponent<ResourceBodyProps> = (props:
     [ResourceType.Workspace]: [RoleName.TREAdmin, WorkspaceRoleName.WorkspaceOwner],
     [ResourceType.SharedService]: [RoleName.TREAdmin],
     [ResourceType.WorkspaceService]: [WorkspaceRoleName.WorkspaceOwner],
-    [ResourceType.UserResource]: [WorkspaceRoleName.WorkspaceOwner, WorkspaceRoleName.WorkspaceResearcher, WorkspaceRoleName.ImperialWorkspaceResearcher, WorkspaceRoleName.ImperialWorkspaceOwner]
+    [ResourceType.UserResource]: [WorkspaceRoleName.WorkspaceOwner, WorkspaceRoleName.WorkspaceResearcher, WorkspaceRoleName.ImperialWorkspaceResearcher, WorkspaceRoleName.ImperialWorkspaceOwner, WorkspaceRoleName.ImperialWorkspaceDataEngineer]
   };
 
   const historyRolesByResourceType = {
     [ResourceType.Workspace]: [RoleName.TREAdmin, WorkspaceRoleName.WorkspaceOwner],
     [ResourceType.SharedService]: [RoleName.TREAdmin],
     [ResourceType.WorkspaceService]: [WorkspaceRoleName.WorkspaceOwner],
-    [ResourceType.UserResource]: [WorkspaceRoleName.WorkspaceOwner, WorkspaceRoleName.WorkspaceResearcher, WorkspaceRoleName.ImperialWorkspaceResearcher, WorkspaceRoleName.ImperialWorkspaceOwner]
+    [ResourceType.UserResource]: [WorkspaceRoleName.WorkspaceOwner, WorkspaceRoleName.WorkspaceResearcher, WorkspaceRoleName.ImperialWorkspaceResearcher, WorkspaceRoleName.ImperialWorkspaceOwner, WorkspaceRoleName.ImperialWorkspaceDataEngineer]
   };
 
   const operationsRoles = operationsRolesByResourceType[props.resource.resourceType];

diff --git a/ui/app/src/components/shared/airlock/Airlock.tsx b/ui/app/src/components/shared/airlock/Airlock.tsx
@@ -347,10 +347,10 @@ export const Airlock: React.FunctionComponent = () => {
       </div>
 
       <Routes>
-        <Route path="new" element={ <SecuredByRole allowedWorkspaceRoles={[WorkspaceRoleName.AirlockManager]} element={
+        <Route path="new" element={ <SecuredByRole allowedWorkspaceRoles={[WorkspaceRoleName.AirlockManager, WorkspaceRoleName.ImperialWorkspaceDataEngineer]} element={
           <AirlockNewRequest onCreateRequest={handleNewRequest} />
         } /> } />
-        <Route path=":requestId" element={ <SecuredByRole allowedWorkspaceRoles={[WorkspaceRoleName.AirlockManager]} element={
+        <Route path=":requestId" element={ <SecuredByRole allowedWorkspaceRoles={[WorkspaceRoleName.AirlockManager, WorkspaceRoleName.ImperialWorkspaceDataEngineer]} element={
           <AirlockViewRequest requests={airlockRequests} onUpdateRequest={getAirlockRequests} />
         } /> } />
       </Routes>