TRE UI does not update when an action on a VM completes

Fixes microsoft#3353
marrobi · Sep 22, 2023 · 98c4610 · 98c4610
1 parent a59e807
commit 98c4610
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,7 +11,7 @@ BUG FIXES:
 * Upgrade unresticted and airlock base template versions due to diagnostic settings retention period being depreciated ([#3704](https://github.com/microsoft/AzureTRE/pull/3704))
 * Fix shared services list return restricted resource for admins causing issues with updates ([#3716](https://github.com/microsoft/AzureTRE/issues/3716))
 * Fix grey box appearing on resource card when costs are not available. ([#3254](https://github.com/microsoft/AzureTRE/issues/3254))
-
+* Fix notification panel not passing the workspace scope id to the API hence UI not updating ([#3353](https://github.com/microsoft/AzureTRE/issues/3353))
 
 ## 0.14.1 (September 1, 2023)
 

diff --git a/ui/app/src/components/shared/notifications/NotificationItem.tsx b/ui/app/src/components/shared/notifications/NotificationItem.tsx
@@ -45,9 +45,9 @@ export const NotificationItem: React.FunctionComponent<NotificationItemProps> =
 
       try {
         if (op.resourcePath.indexOf(ApiEndpoint.Workspaces) !== -1) {
-          // we need the workspace to get auth details
           const wsId = op.resourcePath.split('/')[2];
-          ws = (await apiCall(`${ApiEndpoint.Workspaces}/${wsId}`, HttpMethod.Get)).workspace;
+          let scopeId = (await apiCall(`${ApiEndpoint.Workspaces}/${wsId}/scopeid`, HttpMethod.Get)).workspaceAuth.scopeId;
+          ws = (await apiCall(`${ApiEndpoint.Workspaces}/${wsId}`, HttpMethod.Get, scopeId)).workspace;
 
           if (op.resourcePath.split('/').length === 3) {
             isWs = true;

diff --git a/ui/app/src/components/workspaces/WorkspaceLeftNav.tsx b/ui/app/src/components/workspaces/WorkspaceLeftNav.tsx
@@ -25,7 +25,7 @@ export const WorkspaceLeftNav: React.FunctionComponent<WorkspaceLeftNavProps> =
   useEffect(() => {
     const getWorkspaceServices = async () => {
       // get the workspace services
-
+      if(workspaceCtx.workspace.id === undefined) return;
       let serviceLinkArray: Array<any> = [];
       props.workspaceServices.forEach((service: WorkspaceService) => {
         serviceLinkArray.push(
@@ -74,7 +74,7 @@ export const WorkspaceLeftNav: React.FunctionComponent<WorkspaceLeftNavProps> =
       ];
 
       // Only show airlock link if enabled for workspace
-      if (workspaceCtx.workspace.properties.enable_airlock) {
+      if (workspaceCtx.workspace.properties.enable_airlock !== undefined && workspaceCtx.workspace.properties.enable_airlock) {
         serviceNavLinks[0].links.push({
           name: 'Airlock',
           key: ApiEndpoint.AirlockRequests,

diff --git a/ui/app/src/components/workspaces/WorkspaceServiceItem.tsx b/ui/app/src/components/workspaces/WorkspaceServiceItem.tsx
@@ -48,6 +48,8 @@ export const WorkspaceServiceItem: React.FunctionComponent<WorkspaceServiceItemP
 
   useEffect(() => {
     const getData = async () => {
+      if(workspaceCtx.workspace.id === undefined) return;
+
       setHasUserResourceTemplates(false);
       try {
         let svc = props.workspaceService || {} as WorkspaceService;