UI airlock review requests

api_app/_version.py

@@ -1 +1 @@
-__version__ = "0.4.45"
+__version__ = "0.4.46"

api_app/api/routes/airlock.py

@@ -7,7 +7,7 @@
 from api.dependencies.database import get_repository
 from api.dependencies.workspaces import get_workspace_by_id_from_path, get_deployed_workspace_by_id_from_path
 from api.dependencies.airlock import get_airlock_request_by_id_from_path
-from models.domain.airlock_request import AirlockRequestStatus, AirlockRequestType
+from models.domain.airlock_request import AirlockRequestStatus, AirlockRequestType, AirlockReviewDecision
 
 from models.schemas.airlock_request_url import AirlockRequestTokenInResponse
 
@@ -83,7 +83,11 @@ async def create_airlock_review(airlock_review_input: AirlockReviewInCreate, air
         logging.error(f"Failed creating airlock review model instance: {e}")
         raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(e))
     # Store review with new status in cosmos, and send status_changed event
-    review_status = AirlockRequestStatus(airlock_review.reviewDecision.value)
+    if airlock_review.reviewDecision.value == AirlockReviewDecision.Approved:
+        review_status = AirlockRequestStatus.ApprovalInProgress
+    elif airlock_review.reviewDecision.value == AirlockReviewDecision.Rejected:
+        review_status = AirlockRequestStatus.RejectionInProgress
+
     updated_airlock_request = await update_and_publish_event_airlock_request(airlock_request=airlock_request, airlock_request_repo=airlock_request_repo, user=user, new_status=review_status, workspace=workspace, airlock_review=airlock_review)
     return AirlockRequestInResponse(airlockRequest=updated_airlock_request)
 

api_app/core/config.py

@@ -7,6 +7,7 @@
 API_PREFIX = "/api"
 PROJECT_NAME: str = config("PROJECT_NAME", default="Azure TRE API")
 DEBUG: bool = config("DEBUG", cast=bool, default=False)
+ENABLE_LOCAL_DEBUGGING: bool = config("ENABLE_LOCAL_DEBUGGING", cast=bool, default=False)
 VERSION = __version__
 API_DESCRIPTION = "Welcome to the Azure TRE API - for more information about templates and workspaces see the [Azure TRE documentation](https://microsoft.github.io/AzureTRE)"
 

api_app/main.py

@@ -4,6 +4,7 @@
 
 from fastapi import FastAPI
 from fastapi.exceptions import RequestValidationError
+from fastapi.middleware.cors import CORSMiddleware
 from fastapi_utils.tasks import repeat_every
 from service_bus.airlock_request_status_update import receive_step_result_message_and_update_status
 
@@ -45,6 +46,15 @@ def get_application() -> FastAPI:
         logging.error(f"Failed to add RequestTracerMiddleware: {e}")
 
     application.add_middleware(ServerErrorMiddleware, handler=generic_error_handler)
+    # Allow local UI debugging with local API
+    if config.ENABLE_LOCAL_DEBUGGING:
+        application.add_middleware(
+            CORSMiddleware,
+            allow_origins=["http://localhost:3000"],
+            allow_credentials=True,
+            allow_methods=["*"],
+            allow_headers=["*"])
+
     application.add_exception_handler(HTTPException, http_error_handler)
     application.add_exception_handler(RequestValidationError, http422_error_handler)
 

api_app/models/domain/airlock_request.py

@@ -41,8 +41,8 @@ class AirlockFile(AzureTREModel):
 
 
 class AirlockReviewDecision(str, Enum):
-    Approved = strings.AIRLOCK_RESOURCE_STATUS_APPROVAL_INPROGRESS
-    Rejected = strings.AIRLOCK_RESOURCE_STATUS_REJECTION_INPROGRESS
+    Approved = strings.AIRLOCK_REVIEW_DECISION_APPROVED
+    Rejected = strings.AIRLOCK_REVIEW_DECISION_REJECTED
 
 
 class AirlockReview(AzureTREModel):

api_app/resources/strings.py

@@ -210,6 +210,10 @@
 AIRLOCK_ACTION_CANCEL = "cancel"
 AIRLOCK_ACTION_SUBMIT = "submit"
 
+# Airlock Review Decisions
+AIRLOCK_REVIEW_DECISION_APPROVED = "approved"
+AIRLOCK_REVIEW_DECISION_REJECTED = "rejected"
+
 # Deployments
 RESOURCE_STATUS_AWAITING_DEPLOYMENT_MESSAGE = "This resource is waiting to be deployed"
 RESOURCE_STATUS_AWAITING_UPDATE_MESSAGE = "This resource is waiting to be updated"

devops/scripts/aad/create_api_application.sh

@@ -239,7 +239,7 @@ if [[ $grantAdminConsent -eq 1 ]]; then
 fi
 
 # Create the UX App Registration
-redirectUris="\"http://localhost:8000/api/docs/oauth2-redirect\""
+redirectUris="\"http://localhost:8000/api/docs/oauth2-redirect\", \"http://localhost:3000\""
 if [[ -n ${treUrl} ]]; then
     echo "Adding reply/redirect URL \"${treUrl}\" to \"${appName}\""
     redirectUris="${redirectUris}, \"${treUrl}\", \"${treUrl}/api/docs/oauth2-redirect\""

ui/app/src/components/shared/airlock/Airlock.tsx

@@ -3,7 +3,7 @@ import { CommandBarButton, DetailsList, getTheme, IColumn, Persona, PersonaSize,
 import { HttpMethod, useAuthApiCall } from '../../../hooks/useAuthApiCall';
 import { ApiEndpoint } from '../../../models/apiEndpoints';
 import { WorkspaceContext } from '../../../contexts/WorkspaceContext';
-import { AirlockRequest } from '../../../models/airlock';
+import { AirlockRequest, AirlockRequestAction } from '../../../models/airlock';
 import moment from 'moment';
 import { Route, Routes, useNavigate } from 'react-router-dom';
 import { AirlockViewRequest } from './AirlockViewRequest';
@@ -37,7 +37,14 @@ export const Airlock: React.FunctionComponent<AirlockProps> = (props: AirlockPro
             HttpMethod.Get,
             workspaceCtx.workspaceApplicationIdURI
           );
-          requests = result.airlockRequests.map((r: { airlockRequest: AirlockRequest }) => r.airlockRequest);
+          requests = result.airlockRequests.map((r: {
+            airlockRequest: AirlockRequest,
+            allowed_user_actions: Array<AirlockRequestAction>
+          }) => {
+            const request = r.airlockRequest;
+            request.allowed_user_actions = r.allowed_user_actions;
+            return request;
+          });
         } else {
           // TODO: Get all requests across workspaces
           requests = [];
@@ -56,7 +63,7 @@ export const Airlock: React.FunctionComponent<AirlockProps> = (props: AirlockPro
   }, [apiCall, workspaceCtx.workspace, workspaceCtx.workspaceApplicationIdURI]);
 
   // Order data by selected column
-  const reorderRequests = useCallback((orderByColumn) => {
+  const reorderRequests = useCallback((orderByColumn, invert = true) => {
     if (orderByColumn) {
       setOrderBy(orderByColumn);
       // Reset sorting on other columns and invert selected column if already sorted asc/desc
@@ -65,7 +72,7 @@ export const Airlock: React.FunctionComponent<AirlockProps> = (props: AirlockPro
         const selectedColumn: IColumn = orderedColumns.filter(selCol => orderByColumn.key === selCol.key)[0];
         orderedColumns.forEach((newCol: IColumn) => {
           if (newCol === selectedColumn) {
-            selectedColumn.isSortedDescending = !selectedColumn.isSortedDescending;
+            if (invert) selectedColumn.isSortedDescending = !selectedColumn.isSortedDescending;
             selectedColumn.isSorted = true;
           } else {
             newCol.isSorted = false;
@@ -209,12 +216,12 @@ export const Airlock: React.FunctionComponent<AirlockProps> = (props: AirlockPro
       return updatedRequests;
     });
     // Trigger re-ordering to ensure request appears in the right order
-    reorderRequests(orderBy);
+    reorderRequests(orderBy, false);
   };
 
   const handleNewRequest = (newRequest: AirlockRequest) => {
     setAirlockRequests(requests => [...requests, newRequest]);
-    reorderRequests(orderBy);
+    reorderRequests(orderBy, false);
     navigate(newRequest.id);
   };