Merge branch 'dev' into feat/testimonial_adustments

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@denbi/cloud-portal-webapp",
-  "version": "4.715.0",
+  "version": "4.716.0",
   "description": "de.NBI Cloud Portal",
   "scripts": {
     "ng": "ng serve",
@@ -85,17 +85,17 @@
     "zone.js": "0.13.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "15.2.8",
+    "@angular-devkit/build-angular": "15.2.9",
     "@angular-eslint/builder": "15.2.1",
     "@angular-eslint/eslint-plugin-template": "15.2.1",
     "@angular-eslint/schematics": "15.2.1",
     "@angular-eslint/template-parser": "15.2.1",
-    "@angular/cli": "15.2.8",
+    "@angular/cli": "15.2.9",
     "@angular/compiler-cli": "15.2.9",
     "@compodoc/compodoc": "1.1.21",
     "@playwright/test": "1.34.3",
-    "@types/jasmine": "4.3.4",
-    "@types/node": "18.16.18",
+    "@types/jasmine": "4.3.5",
+    "@types/node": "18.16.19",
     "@typescript-eslint/eslint-plugin": "^5.43.0",
     "@typescript-eslint/parser": "^5.43.0",
     "async": "3.2.4",
@@ -115,7 +115,7 @@
     "karma": "6.4.2",
     "karma-chrome-launcher": "3.2.0",
     "less-loader": "11.1.3",
-    "lint-staged": "13.2.2",
+    "lint-staged": "13.2.3",
     "ngx-spec": "2.1.6",
     "npm-run-all": "4.1.5",
     "prettier": "2.8.8",

src/app/applications/application-formular/application-formular.component.html

@@ -394,7 +394,7 @@ <h5 class="col-md-12 form-control-label">Resources</h5>
 								><strong
 									>Number of storage volumes<i class="fa fa-asterisk" aria-hidden="true"></i>
 									<i
-										data-balloon="The number of storage volumes allowed to create. Each vm is allowed to mount only one storage volume. The sum of the volumes size equals the value provided in the storage limit field"
+										data-balloon="The number of storage volumes allowed to create. Multiple storage volumes can be attached to one VM. The sum of the volumes size equals the value provided in the storage limit field"
 										data-balloon-pos="right"
 										data-balloon-length="large"
 										><i class="icon-question" style="cursor: pointer"></i></i></strong

src/app/projectmanagement/overview.component.html

@@ -504,7 +504,9 @@ <h3>
 									*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</a
 								>

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';
@@ -80,7 +80,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 = '';

src/app/shared/shared_modules/migration-information/migration-information.component.html

@@ -31,7 +31,7 @@ <h5 class="alert-heading">Project migrated to new SimpleVM platform</h5>
 			<hr />
 			<p class="mb-0">
 				You can get to the new platform
-				<a class="alert-link" href="{{ NEW_SVM_PORTAL_LINK }}" target="_blank" rel="noopener noreferrer">here</a>.
+				<a class="alert-link" href="{{ NEW_SVM_KEYCLOAK_LOGIN }}" target="_blank" rel="noopener noreferrer">here</a>.
 			</p>
 		</div>
 	</div>

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[] = [];

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],

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/',
 };

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: '',
 };

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/`;