Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 4 commits into from
Sep 25, 2023
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
98c4610
TRE UI does not update when an action on a VM completes
marrobi Sep 22, 2023
ce14fb6
update ui version
marrobi Sep 22, 2023
64fd9f6
Refactor workspace operation retrieval
marrobi Sep 25, 2023
f0355ee
update based on review
marrobi Sep 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion ui/app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tre-ui",
"version": "0.5.6",
"version": "0.5.7",
marrobi marked this conversation as resolved.
Show resolved Hide resolved
"private": true,
"dependencies": {
"@azure/msal-browser": "^2.35.0",
Expand Down
4 changes: 2 additions & 2 deletions ui/app/src/components/shared/notifications/NotificationItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
marrobi marked this conversation as resolved.
Show resolved Hide resolved

if (op.resourcePath.split('/').length === 3) {
isWs = true;
Expand Down
4 changes: 2 additions & 2 deletions ui/app/src/components/workspaces/WorkspaceLeftNav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const WorkspaceLeftNav: React.FunctionComponent<WorkspaceLeftNavProps> =
useEffect(() => {
const getWorkspaceServices = async () => {
// get the workspace services

if(workspaceCtx.workspace.id === undefined) return;
marrobi marked this conversation as resolved.
Show resolved Hide resolved
let serviceLinkArray: Array<any> = [];
props.workspaceServices.forEach((service: WorkspaceService) => {
serviceLinkArray.push(
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 2 additions & 0 deletions ui/app/src/components/workspaces/WorkspaceServiceItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ export const WorkspaceServiceItem: React.FunctionComponent<WorkspaceServiceItemP

useEffect(() => {
const getData = async () => {
if(workspaceCtx.workspace.id === undefined) return;
marrobi marked this conversation as resolved.
Show resolved Hide resolved

setHasUserResourceTemplates(false);
try {
let svc = props.workspaceService || {} as WorkspaceService;
Expand Down
Loading