Merge branch 'main' into prevent-timeouts-on-acr-login-of-the-first-j…

…ob-that-runs-first-time
microsoft · Feb 20, 2024 · 8f7c5c9 · 8f7c5c9
2 parents 01ed7c8 + 1e48253
commit 8f7c5c9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -42,12 +42,12 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
 
@@ -57,6 +57,6 @@ jobs:
         run: mvn package
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         with:
           category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/deploy_tre_reusable.yml b/.github/workflows/deploy_tre_reusable.yml
@@ -385,8 +385,6 @@ jobs:
              BUNDLE_DIR: "./templates/workspace_services/guacamole"}
           - {BUNDLE_TYPE: "workspace_service",
              BUNDLE_DIR: "./templates/workspace_services/azureml"}
-          - {BUNDLE_TYPE: "workspace_service",
-             BUNDLE_DIR: "./templates/workspace_services/innereye"}
           - {BUNDLE_TYPE: "workspace_service",
              BUNDLE_DIR: "./templates/workspace_services/gitea"}
           - {BUNDLE_TYPE: "workspace_service",
@@ -546,8 +544,6 @@ jobs:
              BUNDLE_DIR: "./templates/workspace_services/guacamole"}
           - {BUNDLE_TYPE: "workspace_service",
              BUNDLE_DIR: "./templates/workspace_services/azureml"}
-          - {BUNDLE_TYPE: "workspace_service",
-             BUNDLE_DIR: "./templates/workspace_services/innereye"}
           - {BUNDLE_TYPE: "workspace_service",
              BUNDLE_DIR: "./templates/workspace_services/gitea"}
           - {BUNDLE_TYPE: "workspace_service",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ BUG FIXES:
 * Fix issue with workspace menu not working correctly([#3819](https://github.com/microsoft/AzureTRE/issues/3819))
 * Fix issue with connect button showing when no uri([#3820](https://github.com/microsoft/AzureTRE/issues/3820))
 * Fix user resource upgrade validation: use the parent_service_template_name instead of the parent_resource_id. ([#3824](https://github.com/microsoft/AzureTRE/issues/3824))
+* Airlock: Creating an import/export request causes a routing error ([#3830](https://github.com/microsoft/AzureTRE/issues/3830))
 
 COMPONENTS:
 

diff --git a/ui/app/package.json b/ui/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tre-ui",
-  "version": "0.5.19",
+  "version": "0.5.20",
   "private": true,
   "dependencies": {
     "@azure/msal-browser": "^2.35.0",
@@ -24,7 +24,7 @@
     "react-dom": "^18.2.0",
     "react-markdown": "^8.0.3",
     "react-redux": "^8.0.4",
-    "react-router-dom": "6",
+    "react-router-dom": "6.21.1",
     "remark-gfm": "^3.0.1",
     "typescript": "^5.1.6",
     "web-vitals": "^3.3.0"

diff --git a/ui/app/src/components/shared/airlock/Airlock.tsx b/ui/app/src/components/shared/airlock/Airlock.tsx
@@ -255,7 +255,7 @@ export const Airlock: React.FunctionComponent = () => {
 
   const handleNewRequest = async (newRequest: AirlockRequest) => {
     await getAirlockRequests();
-    navigate(newRequest.id);
+    navigate(`/workspaces/${newRequest.workspaceId}/requests/${newRequest.id}`);
   };
 
   const quickFilters: ICommandBarItemProps[] = [