From e4084602455635dba6692fff2e1113445a8f2e6a Mon Sep 17 00:00:00 2001 From: vktrrdk Date: Wed, 18 Oct 2023 10:49:00 +0200 Subject: [PATCH] fix(SimpleVM): Link to new platform --- .../projectmanagement/overview.component.html | 12 ++- .../migration-information.component.html | 12 ++- .../cluster-actions.component.html | 6 +- .../cluster-actions.component.ts | 4 +- .../vmcard/vmcard.component.html | 82 ++++++++++--------- .../vmcard/vmcard.component.ts | 3 + .../vmdetail/vmdetail.component.html | 8 +- .../vmdetail/vmdetail.component.ts | 3 + 8 files changed, 83 insertions(+), 47 deletions(-) diff --git a/src/app/projectmanagement/overview.component.html b/src/app/projectmanagement/overview.component.html index f37d4390d1..9fb1c9335c 100644 --- a/src/app/projectmanagement/overview.component.html +++ b/src/app/projectmanagement/overview.component.html @@ -754,8 +754,16 @@

" class="card-body" > -
-
+
+
+ The project is migrated to the new SimpleVM platform. You can access the platform here: + {{ + NEW_SVM_PORTAL_LINK + }} +
diff --git a/src/app/shared/shared_modules/migration-information/migration-information.component.html b/src/app/shared/shared_modules/migration-information/migration-information.component.html index 6225dcd65c..43ec4fcd7a 100644 --- a/src/app/shared/shared_modules/migration-information/migration-information.component.html +++ b/src/app/shared/shared_modules/migration-information/migration-information.component.html @@ -17,7 +17,10 @@
Project migrated to new SimpleVM platform

This machine is part of a project migrated to the new SimpleVM platform. You are not able to control this - machine using the current platform. + machine using the current platform. You can access the new platform here: + {{ + NEW_SVM_PORTAL_LINK + }}

@@ -42,8 +45,11 @@
Project migrated to new SimpleVM platform

- You can get to the new platform - here. + You can get to the new platform here: + {{ + NEW_SVM_PORTAL_LINK + }}.

diff --git a/src/app/virtualmachines/clusters/cluster-actions/cluster-actions.component.html b/src/app/virtualmachines/clusters/cluster-actions/cluster-actions.component.html index e9a8669414..7683faca70 100644 --- a/src/app/virtualmachines/clusters/cluster-actions/cluster-actions.component.html +++ b/src/app/virtualmachines/clusters/cluster-actions/cluster-actions.component.html @@ -137,7 +137,11 @@
- You are not able to control this instance via this platform as it is part of a migrated project! + You are not able to control this instance via this platform as it is part of a migrated project! You can + access the new platform here: + {{ + NEW_SVM_PORTAL_LINK + }}
diff --git a/src/app/virtualmachines/clusters/cluster-actions/cluster-actions.component.ts b/src/app/virtualmachines/clusters/cluster-actions/cluster-actions.component.ts index 925a1d95a9..7c49875c4b 100644 --- a/src/app/virtualmachines/clusters/cluster-actions/cluster-actions.component.ts +++ b/src/app/virtualmachines/clusters/cluster-actions/cluster-actions.component.ts @@ -4,7 +4,7 @@ import { import { ClipboardService } from 'ngx-clipboard'; import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal'; import { Subscription } from 'rxjs'; -import { CLOUD_PORTAL_SUPPORT_MAIL } from '../../../../links/links'; +import { CLOUD_PORTAL_SUPPORT_MAIL, NEW_SVM_PORTAL_LINK } from '../../../../links/links'; import { Clusterinfo, WorkerBatch } from '../clusterinfo'; import { VirtualMachineStates } from '../../virtualmachinemodels/virtualmachinestates'; import { ResumeClusterComponent } from '../../modals/resume-cluster/resume-cluster.component'; @@ -260,4 +260,6 @@ export class ClusterActionsComponent implements OnDestroy { }), ); } + + protected readonly NEW_SVM_PORTAL_LINK = NEW_SVM_PORTAL_LINK; } diff --git a/src/app/virtualmachines/vmcard/vmcard.component.html b/src/app/virtualmachines/vmcard/vmcard.component.html index e23da2f349..f1a2d59859 100644 --- a/src/app/virtualmachines/vmcard/vmcard.component.html +++ b/src/app/virtualmachines/vmcard/vmcard.component.html @@ -4,8 +4,8 @@
@@ -51,8 +51,8 @@ - - + +
@@ -131,7 +131,7 @@ vm?.backend?.playbook_done && !vm?.backend?.playbook_successful && vm?.conda_packages?.length === 0 && - (vm?.status | hasStatus : VirtualMachineStates.staticACTIVE) + (vm?.status | hasStatus: VirtualMachineStates.staticACTIVE) " class="col-md-1" > @@ -222,7 +222,7 @@ *ngIf=" vm?.backend?.playbook_done && !vm?.backend?.playbook_successful && - (vm?.status | hasStatus : VirtualMachineStates.staticACTIVE) + (vm?.status | hasStatus: VirtualMachineStates.staticACTIVE) " > Some steps in your playbook have failed!
You can download the playbook logs on the detailed overview of the @@ -280,9 +280,9 @@ [id]="'showDetailsButton_' + vm?.name" *ngIf="vm.elixir_id === user_elixir_id || is_vo_admin || is_vm_admin" [disabled]=" - !(vm?.status | hasStatus : VirtualMachineStates.staticACTIVE) && - !(vm?.status | hasStatus : VirtualMachineStates.staticSHUTOFF) && - !(vm?.status | hasStatus : VirtualMachineStates.staticDELETED) + !(vm?.status | hasStatus: VirtualMachineStates.staticACTIVE) && + !(vm?.status | hasStatus: VirtualMachineStates.staticSHUTOFF) && + !(vm?.status | hasStatus: VirtualMachineStates.staticDELETED) " [routerLink]="['/virtualmachines/detail/' + vm?.openstackid]" > @@ -293,7 +293,7 @@