Notifications how workspace details, rather than the actual resource

Fixes microsoft#3746
marrobi · Oct 16, 2023 · 8bbb654 · 8bbb654
1 parent 6edea32
commit 8bbb654
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ FEATURES:
 ENHANCEMENTS:
 
 BUG FIXES:
+* Fix notifications displaying workspace name rather than actual resource ([#3746](https://github.com/microsoft/AzureTRE/issues/3746))
 
 COMPONENTS:
 

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

diff --git a/ui/app/src/components/shared/notifications/NotificationItem.tsx b/ui/app/src/components/shared/notifications/NotificationItem.tsx
@@ -47,14 +47,15 @@ export const NotificationItem: React.FunctionComponent<NotificationItemProps> =
         if (op.resourcePath.indexOf(ApiEndpoint.Workspaces) !== -1) {
           const wsId = op.resourcePath.split('/')[2];
           let scopeId = (await apiCall(`${ApiEndpoint.Workspaces}/${wsId}/scopeid`, HttpMethod.Get)).workspaceAuth.scopeId;
+          ws = (await apiCall(`${ApiEndpoint.Workspaces}/${wsId}`, HttpMethod.Get, scopeId)).workspace;
 
-          // is actually a workspace operation or workspace child resource operation
+          // is a workspace child resource operation
           if (op.resourcePath.split('/').length >= 3) {
-            ws = (await apiCall(`${ApiEndpoint.Workspaces}/${wsId}`, HttpMethod.Get, scopeId)).workspace;
-            resource = ws;
-          } else {
             let r = await apiCall(op.resourcePath, HttpMethod.Get, scopeId);
             resource = getResourceFromResult(r);
+          // is a workspace operation
+          } else {
+            resource = ws;
           }
         } else {
           let r = await apiCall(op.resourcePath, HttpMethod.Get);