Merge pull request #6307 from deNBI/dev

Dev

src/app/api-connector/applications.service.ts

@@ -337,16 +337,15 @@ export class ApplicationsService {
 		})
 	}
 
-	checkForTakenShortname(shortname: string,exclude_project_id?:string|number): Observable<any> {
-
-		let params:any={ shortname: shortname }
-		if (exclude_project_id){
-			params={ shortname: shortname ,exclude_project_id:exclude_project_id}
+	checkForTakenShortname(shortname: string, exclude_project_id?: string | number): Observable<any> {
+		let params: any = { shortname: shortname }
+		if (exclude_project_id) {
+			params = { shortname: shortname, exclude_project_id: exclude_project_id }
 		}
+
 		return this.http.get(`${ApiSettings.getApiBaseURL()}project_applications/shortname/`, {
 			params: params,
 			withCredentials: true
-		});
-
+		})
 	}
 }

src/app/applications/application-detail/resource-detail/resource-detail.component.ts

@@ -51,7 +51,7 @@ export class ResourceDetailComponent extends ApplicationBaseClassComponent imple
 			this.flavorDiffs.push({
 				name: flavor.name,
 				current: flavor.counter,
-				diff: 0,
+				diff: 0 - flavor.counter,
 				new: 0
 			})
 		})

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

@@ -33,8 +33,8 @@ import { UserService } from '../../api-connector/user.service'
 import { Userinfo } from '../../userinfo/userinfo.model'
 import { User } from '../application.model/user.model'
 import { NotificationModalComponent } from '../../shared/modal/notification-modal'
-import { Subject } from 'rxjs';
-import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
+import { Subject } from 'rxjs'
+import { debounceTime, distinctUntilChanged } from 'rxjs/operators'
 
 /**
  * Application formular component.
@@ -53,8 +53,8 @@ export class ApplicationFormularComponent extends ApplicationBaseClassComponent
 	@Input() application: Application
 	@Input() is_validation: boolean = false
 	@Input() hash: string
-	DEFAULT_SHORTNAME_MAX_LENGTH:number=15
-	shortNameMaxLength:number=15
+	DEFAULT_SHORTNAME_MAX_LENGTH: number = 15
+	shortNameMaxLength: number = 15
 
 	userinfo: Userinfo
 	valid_pi_affiliations
@@ -91,9 +91,9 @@ export class ApplicationFormularComponent extends ApplicationBaseClassComponent
 	WIKI_BACKUP_LINK: string = WIKI_BACKUP_LINK
 	GDPR_LINK: string = GDPR_LINK
 	survey_link_visible: boolean = false
-	private nameCheckPipe = new Subject<string>();
-	shortnameChecking: boolean = false;
-	shortNameTaken: boolean = false;
+	private nameCheckPipe = new Subject<string>()
+	shortnameChecking: boolean = false
+	shortNameTaken: boolean = false
 
 	MAX_LIFETIME_DEFAULT: number = 6
 	max_lifetime: number = this.MAX_LIFETIME_DEFAULT
@@ -126,7 +126,9 @@ export class ApplicationFormularComponent extends ApplicationBaseClassComponent
 		this.getListOfFlavors()
 		this.getListOfTypes()
 		this.is_vo_admin = is_vo
-		this.nameCheckPipe.pipe(debounceTime(600), distinctUntilChanged()).subscribe(value => {this.checkIfNameIsTaken(value)});
+		this.nameCheckPipe.pipe(debounceTime(600), distinctUntilChanged()).subscribe(value => {
+			this.checkIfNameIsTaken(value)
+		})
 
 		if (this.openstack_project) {
 			this.simple_vm_min_vm = true
@@ -146,19 +148,20 @@ export class ApplicationFormularComponent extends ApplicationBaseClassComponent
 		}
 	}
 
-	setDefaulShortnameLength():void{
-		this.shortNameMaxLength=this.DEFAULT_SHORTNAME_MAX_LENGTH
+	setDefaulShortnameLength(): void {
+		this.shortNameMaxLength = this.DEFAULT_SHORTNAME_MAX_LENGTH
 	}
 
 	checkIfNameIsTaken(shortname: string): void {
-		this.shortnameChecking = true;
-
-		this.applicationsService.checkForTakenShortname(shortname,this.application?.project_application_id).subscribe((result: boolean): void => {
-			let nameExists: boolean = result['exists'];
-			this.shortnameChecking = false;
-			this.shortNameTaken = nameExists;
-		});
-
+		this.shortnameChecking = true
+
+		this.applicationsService
+			.checkForTakenShortname(shortname, this.application?.project_application_id)
+			.subscribe((result: boolean): void => {
+				const nameExists: boolean = result['exists']
+				this.shortnameChecking = false
+				this.shortNameTaken = nameExists
+			})
 	}
 
 	checkValidityComment(): boolean {
@@ -196,8 +199,8 @@ export class ApplicationFormularComponent extends ApplicationBaseClassComponent
 		if (this.application && !this.initiated_validation && this.is_validation) {
 			this.openstack_project = this.application.project_application_openstack_project
 
-			if(this.application.project_application_shortname.length > 15){
-				this.shortNameMaxLength=this.application.project_application_shortname.length
+			if (this.application.project_application_shortname.length > 15) {
+				this.shortNameMaxLength = this.application.project_application_shortname.length
 			}
 
 			this.simple_vm_project = !this.openstack_project
@@ -266,10 +269,9 @@ export class ApplicationFormularComponent extends ApplicationBaseClassComponent
 	public checkShortname(shortname: string): void {
 		this.invalid_shortname = !/^[a-zA-Z0-9\s]*$/.test(shortname)
 		if (!this.invalid_shortname) {
-			this.shortnameChecking = true;
-			this.nameCheckPipe.next(shortname);
+			this.shortnameChecking = true
+			this.nameCheckPipe.next(shortname)
 		}
-
 	}
 
 	public checkLongname(longname: string): void {

src/app/applications/application-list/application-list.component.ts

@@ -36,7 +36,6 @@ export class ApplicationListComponent implements OnInit, OnChanges {
 	}
 
 	setDataTestId(): void {
-		console.log('set data test id')
 		switch (this.tabState) {
 			case ApplicationTabStates.SUBMITTED: {
 				this.dataTestId = 'submitted_applications_container'

src/app/applications/application-vo-actions/application-vo-actions.component.ts

@@ -99,7 +99,7 @@ export class ApplicationVoActionsComponent extends AbstractBaseClass implements
 
 		this.bsModalRef = this.modalService.show(ModificationRequestComponent, {
 			initialState,
-			class: 'modal-lg'
+			class: 'modal-xl'
 		})
 		this.subscribeToBsModalRef()
 		// this.subscribeForExtensionResult(this.ExtensionRequestType.MODIFICATION);