diff --git a/src/app/projectmanagement/overview.component.html b/src/app/projectmanagement/overview.component.html index d3c5047c13..b10234b0e3 100644 --- a/src/app/projectmanagement/overview.component.html +++ b/src/app/projectmanagement/overview.component.html @@ -504,7 +504,9 @@

*ngIf="!project_application?.project_application_openstack_project && isAbleToStart()" class="btn btn-outline-success" [href]=" - project_application?.migrated_simple_vm_resources ? NEW_SVM_PORTAL_LINK : '#/virtualmachines/newVM' + project_application?.migrated_simple_vm_resources + ? NEW_SVM_KEYCLOAK_LOGIN + : '#/virtualmachines/newVM' " >Start a VM diff --git a/src/app/projectmanagement/overview.component.ts b/src/app/projectmanagement/overview.component.ts index 402e0ee007..3275c00ced 100644 --- a/src/app/projectmanagement/overview.component.ts +++ b/src/app/projectmanagement/overview.component.ts @@ -38,7 +38,7 @@ import { STATUS_LINK, WIKI_MEMBER_MANAGEMENT, WIKI_PUBLICATIONS, - NEW_SVM_PORTAL_LINK, + NEW_SVM_KEYCLOAK_LOGIN, } from '../../links/links'; import { Doi } from '../applications/doi/doi'; import { ApiSettings } from '../api-connector/api-settings.service'; @@ -81,7 +81,7 @@ export class OverviewComponent extends ApplicationBaseClassComponent implements SIMPLE_VM_LINK: string = SIMPLE_VM_LINK; OPENSTACK_LINK: string = OPENSTACK_LINK; STATUS_LINK: string = STATUS_LINK; - NEW_SVM_PORTAL_LINK: string = NEW_SVM_PORTAL_LINK; + NEW_SVM_KEYCLOAK_LOGIN: string = NEW_SVM_KEYCLOAK_LOGIN; @ViewChild('creditsChart') creditsCanvas: ElementRef; @ViewChild('publicKeyModal') publicKeyModal: any; publicKeyToShow: string = ''; 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 8d09cc58d2..1967dd29dc 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 @@ -31,7 +31,7 @@

Project migrated to new SimpleVM platform

You can get to the new platform - here. + here.

diff --git a/src/app/shared/shared_modules/migration-information/migration-information.component.ts b/src/app/shared/shared_modules/migration-information/migration-information.component.ts index 471f03b614..a7f187e51a 100644 --- a/src/app/shared/shared_modules/migration-information/migration-information.component.ts +++ b/src/app/shared/shared_modules/migration-information/migration-information.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit, OnDestroy, Input, } from '@angular/core'; import { Subscription } from 'rxjs'; -import { NEW_SVM_PORTAL_LINK, WIKI_SVM_MIGRATION_LINK } from '../../../../links/links'; +import { NEW_SVM_KEYCLOAK_LOGIN, WIKI_SVM_MIGRATION_LINK } from '../../../../links/links'; @Component({ selector: 'app-migration-information', @@ -14,7 +14,7 @@ export class MigrationInformationComponent implements OnInit, OnDestroy { WIKI_SVM_MIGRATION_LINK: string = WIKI_SVM_MIGRATION_LINK; - NEW_SVM_PORTAL_LINK: string = NEW_SVM_PORTAL_LINK; + NEW_SVM_KEYCLOAK_LOGIN: string = NEW_SVM_KEYCLOAK_LOGIN; @Input() isCreationPage: boolean = false; @Input() affectedProjects: string[] = []; diff --git a/src/app/virtualmachines/clusters/add-cluster/add-cluster.component.ts b/src/app/virtualmachines/clusters/add-cluster/add-cluster.component.ts index 9d0538793a..47021af8fd 100644 --- a/src/app/virtualmachines/clusters/add-cluster/add-cluster.component.ts +++ b/src/app/virtualmachines/clusters/add-cluster/add-cluster.component.ts @@ -377,17 +377,17 @@ export class AddClusterComponent implements OnInit, OnDestroy { } startCluster(): void { - const re: RegExp = /\+/gi; this.cluster_error = null; this.cluster_id = null; - const masterFlavor: string = this.selectedMasterFlavor.name.replace(re, '%2B'); + // not needed anymore when using body directly in POST request + // const masterFlavor: string = this.selectedMasterFlavor.name.replace(re, '%2B'); const additional_elixir_ids: string[] = this.members_to_add.map((mem: ProjectMember): string => mem.elixirId); this.subscription.add( this.virtualmachineservice .startCluster( - masterFlavor, + this.selectedMasterFlavor.name, this.selectedMasterImage, this.selectedWorkerBatches, this.selectedProject[1], diff --git a/src/environments/environment.custom.ts b/src/environments/environment.custom.ts index a5bcee8dba..4ed66451cf 100644 --- a/src/environments/environment.custom.ts +++ b/src/environments/environment.custom.ts @@ -17,5 +17,6 @@ export const environment: any = { login: `https://${API_HOST}/portal/api/v0/loggedUser/`, webapp: `https://${API_HOST}/portal/webapp/`, new_svm_webapp: NEW_SIMPLE_VM, + new_svm_keycloak_login: `${NEW_SIMPLE_VM}/accounts/keycloak/login/?process=login`, matomoServer: '//cloud.denbi.de/matomo/', }; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index b62a524864..b2d0bdefde 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -23,5 +23,6 @@ export const environment: any = { login: 'http://localhost:8000/api/v0/loggedUser/', webapp: 'http://localhost:8001/', new_svm_webapp: '', + matomoServer: '', }; diff --git a/src/links/links.ts b/src/links/links.ts index 21a779a454..54c93a9cf8 100644 --- a/src/links/links.ts +++ b/src/links/links.ts @@ -53,6 +53,7 @@ export const WIKI_PERSISTENT_TERMINAL_LINK = `${environment.WIKI_PRE}Tutorials/P export const WIKI_SVM_MIGRATION_LINK = `${environment.WIKI_PRE}`; export const NEW_SVM_PORTAL_LINK = `${environment.new_svm_webapp}`; +export const NEW_SVM_KEYCLOAK_LOGIN: string = `${environment.new_svm_keycloak_login}`; export const TESTIMONIAL_PAGE_LINK: string = `${environment.wagtailBase}about/testimonials/`;