From 7fce27e0f224463f05211a0274eb282590466b5c Mon Sep 17 00:00:00 2001 From: dweinholz Date: Mon, 8 Jul 2024 14:51:48 +0200 Subject: [PATCH 01/11] fix(Application): reload application when resetting pi or some changes for the application --- .../application-card.component.html | 85 +- .../application-card.component.ts | 292 +----- .../application-facility-actions.component.ts | 436 ++++----- .../application-list.component.ts | 1 + .../application-vo-actions.component.ts | 831 +++++++++--------- 5 files changed, 687 insertions(+), 958 deletions(-) diff --git a/src/app/applications/application-card/application-card.component.html b/src/app/applications/application-card/application-card.component.html index 05d0a2ab73..77761eec7b 100644 --- a/src/app/applications/application-card/application-card.component.html +++ b/src/app/applications/application-card/application-card.component.html @@ -1,46 +1,49 @@ - - - - {{ application?.project_application_name }} - {{ application?.project_application_shortname }} - {{ application?.project_application_date_submitted }} - - @if (application?.project_application_user?.username) { - {{ application?.project_application_user?.username }} - } @else { - - } - - {{ application?.project_application_institute }} + + + + {{ application?.project_application_name }} + {{ application?.project_application_shortname }} + {{ application?.project_application_date_submitted }} + + @if (application?.project_application_user?.username) { + {{ application?.project_application_user?.username }} + } @else { + + } + + {{ application?.project_application_institute }} - @if (voView) { - - } @else if (facilityView) { - - } + @if (voView) { + + } @else if (facilityView) { + + } - @if (!isCollapsed) { - - } + @if (!isCollapsed) { + + } diff --git a/src/app/applications/application-card/application-card.component.ts b/src/app/applications/application-card/application-card.component.ts index e6c0a61873..41d61deec8 100644 --- a/src/app/applications/application-card/application-card.component.ts +++ b/src/app/applications/application-card/application-card.component.ts @@ -1,19 +1,16 @@ import { - Component, EventEmitter, Input, OnInit, Output, + Component, EventEmitter, Input, OnInit, Output, ViewChild, } from '@angular/core'; -import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal'; -import { Subscription } from 'rxjs'; -import { HttpStatusCode } from '@angular/common/http'; +import { BsModalRef } from 'ngx-bootstrap/modal'; import { AbstractBaseClass, Application_States } from '../../shared/shared_modules/baseClass/abstract-base-class'; import { ConfirmationActions } from '../../shared/modal/confirmation_actions'; import { Application } from '../application.model/application.model'; import { ApplicationTabStates } from '../../shared/enums/application-tab-states'; import { ApplicationsService } from '../../api-connector/applications.service'; -import { NotificationModalComponent } from '../../shared/modal/notification-modal'; import { is_vo } from '../../shared/globalvar'; import { ComputecenterComponent } from '../../projectmanagement/computecenter.component'; -import { GroupService } from '../../api-connector/group.service'; import { User } from '../application.model/user.model'; +import { ApplicationDetailComponent } from '../application-detail/application-detail.component'; @Component({ selector: 'app-application-card', @@ -21,7 +18,6 @@ import { User } from '../application.model/user.model'; styleUrl: './application-card.component.scss', }) export class ApplicationCardComponent extends AbstractBaseClass implements OnInit { - private subscription: Subscription = new Subscription(); @Input() application: Application; @Input() tabState: ApplicationTabStates = ApplicationTabStates.SUBMITTED; @@ -30,10 +26,10 @@ export class ApplicationCardComponent extends AbstractBaseClass implements OnIni @Output() removeApplicationTrigger: EventEmitter = new EventEmitter(); @Input() facilityView: boolean = false; @Input() voView: boolean = false; + @ViewChild('applicationdetail') applicationDetailComponent: ApplicationDetailComponent; bsModalRef: BsModalRef; is_vo_admin: boolean = false; - selectedComputeCenter: ComputecenterComponent; ngOnInit() { this.is_vo_admin = is_vo; @@ -63,8 +59,7 @@ export class ApplicationCardComponent extends AbstractBaseClass implements OnIni constructor( private applicationsService: ApplicationsService, - private modalService: BsModalService, - private groupService: GroupService, + ) { super(); } @@ -88,288 +83,11 @@ export class ApplicationCardComponent extends AbstractBaseClass implements OnIni ); } - resetApplicationPI(): void { - this.applicationsService.resetPIValidation(this.application).subscribe(() => { - this.getApplication(); - }); - } - switchCollaps() { this.isCollapsed = !this.isCollapsed; } - showNotificationModal( - notificationModalTitle: string, - notificationModalMessage: string, - notificationModalType: string, - ) { - const initialState = { notificationModalTitle, notificationModalType, notificationModalMessage }; - if (this.bsModalRef) { - this.bsModalRef.hide(); - } - - this.bsModalRef = this.modalService.show(NotificationModalComponent, { initialState }); - this.bsModalRef.setClass('modal-lg'); - } - - createSimpleVmProjectGroup(): void { - this.showNotificationModal('Info', 'Creating Project...', 'info'); - - if (this.selectedComputeCenter && this.selectedComputeCenter.FacilityId) { - this.groupService - .createGroupByApplication(this.application.project_application_id, this.selectedComputeCenter.FacilityId) - .subscribe( - (res: any): void => { - if (!res['client_available'] && !res['created']) { - this.showNotificationModal( - 'Failed', - `The client ${res['client_name']} has not the necessary resources left!`, - 'danger', - ); - } else { - this.showNotificationModal('Success', 'The project was created!', 'success'); - this.triggerRemoveApplication(); - this.triggerReloadNumbers(); - } - }, - (error: any): void => { - console.log(error); - const errorMessage = error && error.error === 'locked' - ? 'Project is locked and could not be created!' - : 'Project could not be created!'; - - this.showNotificationModal('Failed', errorMessage, 'danger'); - console.log(error); - }, - ); - } - } - - approveModificationRequest(): void { - this.applicationsService.approveModificationRequest(this.application.project_application_id).subscribe( - (res: Response): void => { - this.showNotificationModal('Success', 'The resource modification request was approved!', 'success'); - if (!this.application.project_application_openstack_project) { - if (res.status === HttpStatusCode.Accepted) { - this.triggerRemoveApplication(); - this.triggerReloadNumbers(); - - // this.all_applications.splice(this.all_applications.indexOf(application), 1); - } - } else { - this.getApplication(); - } - }, - (err: any): void => { - console.log('error', err.status); - this.showNotificationModal('Failed', 'Approval of resource modification failed!', 'danger'); - }, - ); - } - - declineModificationRequest(): void { - this.applicationsService.deleteModificationRequest(this.application.project_application_id).subscribe( - (): void => { - this.showNotificationModal('Declined', 'The resource modification request was declined!', 'success'); - this.triggerReloadNumbers(); - this.triggerRemoveApplication(); - - this.getApplication(); - }, - (err: any): void => { - console.log('error', err.status); - this.showNotificationModal('Failed', 'Decline of resource modification failed!', 'danger'); - }, - ); - } - - deleteApplication(): void { - // const idx: number = this.all_applications.indexOf(application); - - this.subscription.add( - this.applicationsService.deleteApplication(this.application.project_application_id).subscribe( - (): void => { - this.showNotificationModal('Success', 'The application has been successfully removed', 'success'); - this.triggerRemoveApplication(); - this.triggerReloadNumbers(); - }, - (): void => { - this.updateNotificationModal('Failed', 'Application could not be removed!', true, 'danger'); - }, - ), - ); - } - - declineLifetimeExtension(): void { - this.applicationsService.deleteAdditionalLifetimeRequests(this.application.project_application_id).subscribe( - (): void => { - this.showNotificationModal('Declined', 'The project extension was declined!', 'success'); - this.triggerRemoveApplication(); - this.triggerReloadNumbers(); - }, - (err: any): void => { - console.log('error', err.status); - this.showNotificationModal('Failed', 'Decline of project extension failed!', 'danger'); - }, - ); - } - - declineCreditExtension(): void { - this.applicationsService.deleteAdditionalCreditsRequests(this.application.project_application_id).subscribe( - (): void => { - this.showNotificationModal('Declined', 'The credit extension request was declined!', 'success'); - this.triggerRemoveApplication(); - this.triggerReloadNumbers(); - }, - (err: any): void => { - console.log('error', err.status); - this.showNotificationModal('Failed', 'Decline of credit extension failed!', 'danger'); - }, - ); - } - - declineApplication(): void { - // const idx: number = this.all_applications.indexOf(app); - this.applicationsService.declineApplication(this.application.project_application_id).subscribe( - (): void => { - const message: string = 'The Application was declined.'; - - this.showNotificationModal('Success', message, 'success'); - this.triggerRemoveApplication(); - this.triggerReloadNumbers(); - }, - (): void => { - this.showNotificationModal('Failed', 'Application could not be declined!', 'danger'); - }, - ); - } - - approveLifetimeExtension(): void { - this.applicationsService.approveAdditionalLifetime(this.application.project_application_id).subscribe( - (res: Response): void => { - if (this.application.project_application_openstack_project) { - this.getApplication(); - this.showNotificationModal('Success', 'The request has been sent to the facility manager.', 'success'); - } else { - this.showNotificationModal('Success', 'The project has been extended!', 'success'); - } - if (!this.application.project_application_openstack_project) { - if (res.status === HttpStatusCode.Accepted) { - this.triggerReloadNumbers(); - this.triggerRemoveApplication(); - } - } - }, - (err: any): void => { - console.log('error', err.status); - this.showNotificationModal('Failed', 'Project lifetime could not be extendend!', 'danger'); - }, - ); - } - - approveCreditExtension(): void { - this.applicationsService.approveAdditionalCreditsRequest(this.application.project_application_id).subscribe( - (res: Response): void => { - this.showNotificationModal('Success', 'The credit extension request was approved!', 'success'); - if (!this.application.project_application_openstack_project) { - if (res.status === HttpStatusCode.Accepted) { - this.triggerReloadNumbers(); - this.triggerRemoveApplication(); - } - } else { - this.getApplication(); - } - }, - (err: any): void => { - console.log('error', err.status); - this.showNotificationModal('Failed', 'Approval of credit extension failed!', 'danger'); - }, - ); - } - - createOpenStackProjectGroup(): void { - this.groupService - .createGroupOpenStack(this.application.project_application_id, this.selectedComputeCenter.FacilityId) - .subscribe( - (result: { [key: string]: string }): void => { - if (result['Error']) { - this.showNotificationModal('Failed', result['Error'], 'danger'); - } else { - this.showNotificationModal('Success', 'The project was assigned to the facility.', 'success'); - this.getApplication(); - // this.switchApproveLocked(false); - } - }, - (error: any): void => { - const errorMessage = error && error.error === 'locked' - ? 'Project is locked and could not be created!' - : 'Project could not be created!'; - - this.showNotificationModal('Failed', errorMessage, 'danger'); - console.log(error); - }, - ); - } - - /** - * Function to listen to modal results. - */ - subscribeToBsModalRef(): void { - this.subscription.add( - this.bsModalRef.content.event.subscribe((result: any) => { - let action = null; - if ('action' in result) { - action = result['action']; - } - if ('createSimpleVM' in result) { - this.createSimpleVmProjectGroup(); - } - if (action === ConfirmationActions.APPROVE_MODIFICATION) { - this.approveModificationRequest(); - } - if ('closed' in result) { - // this.switchApproveLocked(false); - } - if (action === ConfirmationActions.DECLINE_MODIFICATION) { - this.declineModificationRequest(); - } - if (action === ConfirmationActions.DELETE_APPLICATION) { - this.deleteApplication(); - } - if (action === ConfirmationActions.DECLINE_EXTENSION) { - this.declineLifetimeExtension(); - } - if (action === ConfirmationActions.DECLINE_CREDITS) { - this.declineCreditExtension(); - } - if (action === ConfirmationActions.DECLINE_APPLICATION) { - this.declineApplication(); - } - - if (action === ConfirmationActions.APPROVE_EXTENSION) { - this.approveLifetimeExtension(); - } - if (action === ConfirmationActions.RESET_PI) { - this.resetApplicationPI(); - } - if (action === ConfirmationActions.APPROVE_CREDITS) { - this.approveCreditExtension(); - } - if (action === ConfirmationActions.APPROVE_APPLICATION) { - if (this.application.project_application_openstack_project) { - this.createOpenStackProjectGroup(); - } - } - if (action === 'adjustedModificationRequest') { - // this.isLoaded = false; - // this.changeTabState(ApplicationTabStates.MODIFICATION_EXTENSION); - } - }), - ); - } - isCollapsed: boolean = true; protected readonly Application_States = Application_States; protected readonly ConfirmationActions = ConfirmationActions; - protected readonly ApplicationTabStates = ApplicationTabStates; } diff --git a/src/app/applications/application-facility-actions/application-facility-actions.component.ts b/src/app/applications/application-facility-actions/application-facility-actions.component.ts index f0435db1b8..562c3a7b0e 100644 --- a/src/app/applications/application-facility-actions/application-facility-actions.component.ts +++ b/src/app/applications/application-facility-actions/application-facility-actions.component.ts @@ -33,250 +33,256 @@ export class ApplicationFacilityActionsComponent extends AbstractBaseClass { isCollapsed: boolean = true; bsModalRef: BsModalRef; @Output() switchCollapseEvent: EventEmitter = new EventEmitter(); + @Output() reloadApplicationTrigger: EventEmitter = new EventEmitter(); - constructor( + constructor( private facilityService: FacilityService, private modalService: BsModalService, private applicationsService: ApplicationsService, - ) { - super(); - } + ) { + super(); + } - switchCollaps() { - this.switchCollapseEvent.emit(); - } + switchCollaps() { + this.switchCollapseEvent.emit(); + } - triggerRemoveApplication() { - this.removeApplicationTrigger.emit(this.application.project_application_id); - } + triggerRemoveApplication() { + this.removeApplicationTrigger.emit(this.application.project_application_id); + } - triggerReloadNumbers() { - this.reloadNumbersTrigger.emit(); - } + triggerReloadNumbers() { + this.reloadNumbersTrigger.emit(); + } - declineApplication(): void { - this.showNotificationModal('Decline Application', 'Waiting..', 'info'); + triggerReloadApplication():void { + this.reloadApplicationTrigger.emit(); - this.facilityService - .declineFacilityApplication( - this.application.project_application_compute_center.FacilityId, - this.application.project_application_id, - ) - .subscribe( - (): void => { - this.showNotificationModal('Success', 'Successfully declined the application.', 'success'); - this.triggerReloadNumbers(); - this.triggerRemoveApplication(); + } - // this.getAllApplicationsHistory(this.selectedFacility['FacilityId']); - }, - (): void => { - this.showNotificationModal('Failed', 'Failed to decline the application.', 'danger'); - }, - ); - } + declineApplication(): void { + this.showNotificationModal('Decline Application', 'Waiting..', 'info'); - public approveExtension(): void { - this.applicationsService.approveAdditionalLifetime(this.application.project_application_id).subscribe( - (): void => { - this.showNotificationModal('Success', 'Successfully approved extension!', 'success'); - this.triggerReloadNumbers(); - this.triggerRemoveApplication(); - }, - (): void => { - this.showNotificationModal('Failed', 'The approval of the extension request has failed.', 'danger'); - }, - ); - } + this.facilityService + .declineFacilityApplication( + this.application.project_application_compute_center.FacilityId, + this.application.project_application_id, + ) + .subscribe( + (): void => { + this.showNotificationModal('Success', 'Successfully declined the application.', 'success'); + this.triggerReloadNumbers(); + this.triggerRemoveApplication(); - /** + // this.getAllApplicationsHistory(this.selectedFacility['FacilityId']); + }, + (): void => { + this.showNotificationModal('Failed', 'Failed to decline the application.', 'danger'); + }, + ); + } + + public approveExtension(): void { + this.applicationsService.approveAdditionalLifetime(this.application.project_application_id).subscribe( + (): void => { + this.showNotificationModal('Success', 'Successfully approved extension!', 'success'); + this.triggerReloadNumbers(); + this.triggerRemoveApplication(); + }, + (): void => { + this.showNotificationModal('Failed', 'The approval of the extension request has failed.', 'danger'); + }, + ); + } + + /** * Decline an extension request. * * @param application_id */ - public declineExtension(): void { - this.applicationsService.declineAdditionalLifetime(this.application.project_application_id).subscribe( - (): void => { - this.showNotificationModal('Success', 'Successfully declined extension!', 'success'); - this.triggerReloadNumbers(); - this.triggerRemoveApplication(); - }, - (): void => { - this.showNotificationModal('Failed', 'The decline of the extension request has failed.', 'danger'); - }, - ); - } + public declineExtension(): void { + this.applicationsService.declineAdditionalLifetime(this.application.project_application_id).subscribe( + (): void => { + this.showNotificationModal('Success', 'Successfully declined extension!', 'success'); + this.triggerReloadNumbers(); + this.triggerRemoveApplication(); + }, + (): void => { + this.showNotificationModal('Failed', 'The decline of the extension request has failed.', 'danger'); + }, + ); + } - showNotificationModal( - notificationModalTitle: string, - notificationModalMessage: string, - notificationModalType: string, - ) { - const initialState = { notificationModalTitle, notificationModalType, notificationModalMessage }; - if (this.bsModalRef) { - this.bsModalRef.hide(); - } + showNotificationModal( + notificationModalTitle: string, + notificationModalMessage: string, + notificationModalType: string, + ) { + const initialState = { notificationModalTitle, notificationModalType, notificationModalMessage }; + if (this.bsModalRef) { + this.bsModalRef.hide(); + } - this.bsModalRef = this.modalService.show(NotificationModalComponent, { initialState }); - this.bsModalRef.setClass('modal-lg'); - } + this.bsModalRef = this.modalService.show(NotificationModalComponent, { initialState }); + this.bsModalRef.setClass('modal-lg'); + } - approveApplication(): void { - this.showNotificationModal('Approving Application', 'Waiting..', 'info'); - this.facilityService - .approveFacilityApplication( - this.application.project_application_compute_center.FacilityId, - this.application.project_application_id, - ) - .subscribe( - (): void => { - this.showNotificationModal('Success', 'Successfully approved the application.', 'success'); - this.triggerReloadNumbers(); - this.triggerRemoveApplication(); + approveApplication(): void { + this.showNotificationModal('Approving Application', 'Waiting..', 'info'); + this.facilityService + .approveFacilityApplication( + this.application.project_application_compute_center.FacilityId, + this.application.project_application_id, + ) + .subscribe( + (): void => { + this.showNotificationModal('Success', 'Successfully approved the application.', 'success'); + this.triggerReloadNumbers(); + this.triggerRemoveApplication(); - // this.getAllApplicationsHistory(this.selectedFacility['FacilityId']); - }, - (): void => { - this.showNotificationModal('Failed', 'Failed to approve the application.', 'danger'); - }, - ); - } + // this.getAllApplicationsHistory(this.selectedFacility['FacilityId']); + }, + (): void => { + this.showNotificationModal('Failed', 'Failed to approve the application.', 'danger'); + }, + ); + } - showConfirmationModal(action: ConfirmationActions): void { - const initialState = { - application: this.application, - action, - }; + showConfirmationModal(action: ConfirmationActions): void { + const initialState = { + application: this.application, + action, + }; - this.bsModalRef = this.modalService.show(ConfirmationModalComponent, { initialState, class: 'modal-lg' }); - this.subscribeToBsModalRef(); - } + this.bsModalRef = this.modalService.show(ConfirmationModalComponent, { initialState, class: 'modal-lg' }); + this.subscribeToBsModalRef(); + } - approveModification(): void { - this.applicationsService.approveModificationRequest(this.application.project_application_id).subscribe( - (): void => { - this.showNotificationModal('Success', 'Successfully approved modification!', 'success'); - this.triggerReloadNumbers(); - this.triggerRemoveApplication(); - }, - (): void => { - this.showNotificationModal('Failed', 'The approval of the modification request has failed.', 'danger'); - }, - ); - } + approveModification(): void { + this.applicationsService.approveModificationRequest(this.application.project_application_id).subscribe( + (): void => { + this.showNotificationModal('Success', 'Successfully approved modification!', 'success'); + this.triggerReloadNumbers(); + this.triggerRemoveApplication(); + }, + (): void => { + this.showNotificationModal('Failed', 'The approval of the modification request has failed.', 'danger'); + }, + ); + } - declineModification(): void { - this.applicationsService.declineModificationRequest(this.application.project_application_id).subscribe( - (): void => { - this.showNotificationModal('Success', 'Successfully declined modification!', 'success'); - this.triggerReloadNumbers(); - this.triggerRemoveApplication(); - }, - (): void => { - this.showNotificationModal('Failed', 'The decline of the modification request has failed.', 'danger'); - }, - ); - } + declineModification(): void { + this.applicationsService.declineModificationRequest(this.application.project_application_id).subscribe( + (): void => { + this.showNotificationModal('Success', 'Successfully declined modification!', 'success'); + this.triggerReloadNumbers(); + this.triggerRemoveApplication(); + }, + (): void => { + this.showNotificationModal('Failed', 'The decline of the modification request has failed.', 'danger'); + }, + ); + } - approveTermination(): void { - this.facilityService - .approveTerminationByFM( - this.application.project_application_perun_id, - this.application.project_application_compute_center.FacilityId, - ) - .subscribe( - (): void => { - this.triggerReloadNumbers(); - this.triggerRemoveApplication(); - this.showNotificationModal('Success', 'The project was terminated.', 'success'); - }, - (error: any): void => { - if (error['status'] === 409) { - this.showNotificationModal( - 'Failed', - `The project could not be terminated. Reason: ${error['error']['reason']} for ${error['error']['openstackid']}`, + approveTermination(): void { + this.facilityService + .approveTerminationByFM( + this.application.project_application_perun_id, + this.application.project_application_compute_center.FacilityId, + ) + .subscribe( + (): void => { + this.triggerReloadNumbers(); + this.triggerRemoveApplication(); + this.showNotificationModal('Success', 'The project was terminated.', 'success'); + }, + (error: any): void => { + if (error['status'] === 409) { + this.showNotificationModal( + 'Failed', + `The project could not be terminated. Reason: ${error['error']['reason']} for ${error['error']['openstackid']}`, - 'danger', - ); - } else { - this.showNotificationModal('Failed', 'The project could not be terminated.', 'danger'); - } - }, - ); - } + 'danger', + ); + } else { + this.showNotificationModal('Failed', 'The project could not be terminated.', 'danger'); + } + }, + ); + } - declineTermination(): void { - this.facilityService - .declineTerminationByFM( - this.application.project_application_perun_id, - this.application.project_application_compute_center.FacilityId, - ) - .subscribe( - (): void => { - this.triggerReloadNumbers(); - this.triggerRemoveApplication(); - this.showNotificationModal('Success', 'The termination of the project was declined.', 'success'); - }, - (error: any): void => { - if (error['status'] === 409) { - this.showNotificationModal( - 'Failed', - `The decline of the project was not successful. Reason: ${error['error']['reason']} for ${error['error']['openstackid']}`, + declineTermination(): void { + this.facilityService + .declineTerminationByFM( + this.application.project_application_perun_id, + this.application.project_application_compute_center.FacilityId, + ) + .subscribe( + (): void => { + this.triggerReloadNumbers(); + this.triggerRemoveApplication(); + this.showNotificationModal('Success', 'The termination of the project was declined.', 'success'); + }, + (error: any): void => { + if (error['status'] === 409) { + this.showNotificationModal( + 'Failed', + `The decline of the project was not successful. Reason: ${error['error']['reason']} for ${error['error']['openstackid']}`, - 'danger', - ); - } else { - this.showNotificationModal('Failed', 'The decline of the project failed.', 'danger'); - } - }, - ); - } + 'danger', + ); + } else { + this.showNotificationModal('Failed', 'The decline of the project failed.', 'danger'); + } + }, + ); + } - subscribeToBsModalRef(): void { - this.subscription.add( - this.bsModalRef.content.event.subscribe((event: any) => { - const action: ConfirmationActions = event.action; - switch (action) { - case ConfirmationActions.APPROVE_APPLICATION: { - this.approveApplication(); - break; - } - case ConfirmationActions.DECLINE_APPLICATION: { - this.declineApplication(); - break; - } - case ConfirmationActions.DECLINE_EXTENSION: { - this.declineExtension(); - break; - } - case ConfirmationActions.APPROVE_EXTENSION: { - this.approveExtension(); - break; - } - case ConfirmationActions.DECLINE_MODIFICATION: { - this.declineModification(); - break; - } - case ConfirmationActions.APPROVE_MODIFICATION: { - this.approveModification(); - break; - } - case ConfirmationActions.APPROVE_TERMINATION: { - this.approveTermination(); - break; - } - case ConfirmationActions.DECLINE_TERMINATION: { - this.declineTermination(); - break; - } - default: - break; - } - }), - ); - } + subscribeToBsModalRef(): void { + this.subscription.add( + this.bsModalRef.content.event.subscribe((event: any) => { + const action: ConfirmationActions = event.action; + switch (action) { + case ConfirmationActions.APPROVE_APPLICATION: { + this.approveApplication(); + break; + } + case ConfirmationActions.DECLINE_APPLICATION: { + this.declineApplication(); + break; + } + case ConfirmationActions.DECLINE_EXTENSION: { + this.declineExtension(); + break; + } + case ConfirmationActions.APPROVE_EXTENSION: { + this.approveExtension(); + break; + } + case ConfirmationActions.DECLINE_MODIFICATION: { + this.declineModification(); + break; + } + case ConfirmationActions.APPROVE_MODIFICATION: { + this.approveModification(); + break; + } + case ConfirmationActions.APPROVE_TERMINATION: { + this.approveTermination(); + break; + } + case ConfirmationActions.DECLINE_TERMINATION: { + this.declineTermination(); + break; + } + default: + break; + } + }), + ); + } - ngOnInit() {} + ngOnInit() {} - protected readonly Application_States = Application_States; + protected readonly Application_States = Application_States; } diff --git a/src/app/applications/application-list/application-list.component.ts b/src/app/applications/application-list/application-list.component.ts index f761a7873e..96816ed888 100644 --- a/src/app/applications/application-list/application-list.component.ts +++ b/src/app/applications/application-list/application-list.component.ts @@ -22,6 +22,7 @@ export class ApplicationListComponent implements OnInit, OnChanges { @Input() computeCenters: ComputecenterComponent[] = []; @Input() facilityView: boolean = false; @Input() voView: boolean = false; + dataTestId: string = ''; is_vo_admin: boolean = false; diff --git a/src/app/applications/application-vo-actions/application-vo-actions.component.ts b/src/app/applications/application-vo-actions/application-vo-actions.component.ts index 68191fff20..86ef775905 100644 --- a/src/app/applications/application-vo-actions/application-vo-actions.component.ts +++ b/src/app/applications/application-vo-actions/application-vo-actions.component.ts @@ -14,9 +14,15 @@ import { is_vo } from '../../shared/globalvar'; import { ApplicationsService } from '../../api-connector/applications.service'; import { VoService } from '../../api-connector/vo.service'; import { GroupService } from '../../api-connector/group.service'; -import { AdjustLifetimeRequestComponent } from '../../projectmanagement/modals/adjust-lifetime/adjust-lifetime-request.component'; -import { AdjustApplicationComponent } from '../../projectmanagement/modals/adjust-application/adjust-application.component'; -import { ModificationRequestComponent } from '../../projectmanagement/modals/modification-request/modification-request.component'; +import { + AdjustLifetimeRequestComponent, +} from '../../projectmanagement/modals/adjust-lifetime/adjust-lifetime-request.component'; +import { + AdjustApplicationComponent, +} from '../../projectmanagement/modals/adjust-application/adjust-application.component'; +import { + ModificationRequestComponent, +} from '../../projectmanagement/modals/modification-request/modification-request.component'; import { ConfirmationModalComponent } from '../../shared/modal/confirmation-modal.component'; import { ClientLimitsComponent } from '../../vo_manager/clients/modals/client-limits..component'; import { NotificationModalComponent } from '../../shared/modal/notification-modal'; @@ -29,224 +35,386 @@ import { NotificationModalComponent } from '../../shared/modal/notification-moda export class ApplicationVoActionsComponent extends AbstractBaseClass implements OnInit { private subscription: Subscription = new Subscription(); - @Input() application: Application; - @Input() tabState: ApplicationTabStates = ApplicationTabStates.SUBMITTED; - @Input() computeCenters: ComputecenterComponent[] = []; - @Output() reloadNumbersTrigger: EventEmitter = new EventEmitter(); - @Output() removeApplicationTrigger: EventEmitter = new EventEmitter(); - @Output() switchCollapseEvent: EventEmitter = new EventEmitter(); - - bsModalRef: BsModalRef; - is_vo_admin: boolean = false; - selectedComputeCenter: ComputecenterComponent; - - ngOnInit() { - this.is_vo_admin = is_vo; - } - - constructor( - private applicationsService: ApplicationsService, - private modalService: BsModalService, - private voService: VoService, - private groupService: GroupService, - private adjustLifeTimeExtensionModal: AdjustLifetimeRequestComponent, - private adjustApplicationModal: AdjustApplicationComponent, - ) { - super(); - } - - triggerRemoveApplication() { - this.removeApplicationTrigger.emit(this.application.project_application_id); - } - - showAdjustLifetimeExtensionModal() { - this.adjustLifeTimeExtensionModal - .showAdjustLifetimeExtensionModal(this.application) - .subscribe((eventSuccess: boolean) => { - if (eventSuccess) { - this.getApplication(); - this.showNotificationModal( - 'Success', - 'The lifetime of the extension request were adjusted successfully!', - 'success', - ); + @Input() application: Application; + @Input() tabState: ApplicationTabStates = ApplicationTabStates.SUBMITTED; + @Input() computeCenters: ComputecenterComponent[] = []; + @Output() reloadNumbersTrigger: EventEmitter = new EventEmitter(); + @Output() reloadApplicationTrigger: EventEmitter = new EventEmitter(); + @Output() removeApplicationTrigger: EventEmitter = new EventEmitter(); + @Output() switchCollapseEvent: EventEmitter = new EventEmitter(); + + bsModalRef: BsModalRef; + is_vo_admin: boolean = false; + selectedComputeCenter: ComputecenterComponent; + + ngOnInit() { + this.is_vo_admin = is_vo; + } + + constructor( + private applicationsService: ApplicationsService, + private modalService: BsModalService, + private voService: VoService, + private groupService: GroupService, + private adjustLifeTimeExtensionModal: AdjustLifetimeRequestComponent, + private adjustApplicationModal: AdjustApplicationComponent, + ) { + super(); + } + + triggerRemoveApplication() { + this.removeApplicationTrigger.emit(this.application.project_application_id); + } + + showAdjustLifetimeExtensionModal() { + this.adjustLifeTimeExtensionModal + .showAdjustLifetimeExtensionModal(this.application) + .subscribe((eventSuccess: boolean) => { + if (eventSuccess) { + this.triggerReloadApplication(); + this.showNotificationModal( + 'Success', + 'The lifetime of the extension request were adjusted successfully!', + 'success', + ); + } else { + this.showNotificationModal('Failed', 'The adjustment of the lifetime has failed!', 'danger'); + } + }); + } + + triggerReloadApplication(): void { + this.reloadApplicationTrigger.emit(); + + } + + showAdjustApplicationModal() { + this.adjustApplicationModal.showAdjustApplicationModal(this.application).subscribe((changed: boolean) => { + if (changed) { + this.triggerReloadApplication(); + + this.showNotificationModal('Success', 'The resources of the application were adjusted successfully!', 'success'); } else { - this.showNotificationModal('Failed', 'The adjustment of the lifetime has failed!', 'danger'); + this.showNotificationModal('Failed', 'The adjustment of the resources has failed!', 'danger'); } }); - } + } + + showModificationAdjustmentModal() { + const initialState = { + project: this.application, + adjustment: true, + }; + + this.bsModalRef = this.modalService.show(ModificationRequestComponent, { + initialState, + class: 'modal-lg', + }); + this.subscribeToBsModalRef(); + // this.subscribeForExtensionResult(this.ExtensionRequestType.MODIFICATION); + } + + triggerReloadNumbers() { + this.reloadNumbersTrigger.emit(); + } - showAdjustApplicationModal() { - this.adjustApplicationModal.showAdjustApplicationModal(this.application).subscribe((changed: boolean) => { - if (changed) { - this.getApplication(); + setCurrentUserProcessingVoManager(application: Application): void { + if (this.is_vo_admin) { + this.voService.setCurrentUserProcessingVoManager(application.project_application_id).subscribe((res: any) => { + application.processing_vo_initials = res['processing_vo_initials']; + }); + } + } - this.showNotificationModal('Success', 'The resources of the application were adjusted successfully!', 'success'); + showConfirmationModal(action: ConfirmationActions): void { + let initialState = {}; + if (action === ConfirmationActions.APPROVE_APPLICATION) { + const application_center = !this.selectedComputeCenter.FacilityId; + initialState = { application: this.application, action, application_center }; } else { - this.showNotificationModal('Failed', 'The adjustment of the resources has failed!', 'danger'); + initialState = { + application: this.application, + action, + }; } - }); - } - - showModificationAdjustmentModal() { - const initialState = { - project: this.application, - adjustment: true, - }; - - this.bsModalRef = this.modalService.show(ModificationRequestComponent, { - initialState, - class: 'modal-lg', - }); - this.subscribeToBsModalRef(); - // this.subscribeForExtensionResult(this.ExtensionRequestType.MODIFICATION); - } - - triggerReloadNumbers() { - this.reloadNumbersTrigger.emit(); - } - - setCurrentUserProcessingVoManager(application: Application): void { - if (this.is_vo_admin) { - this.voService.setCurrentUserProcessingVoManager(application.project_application_id).subscribe((res: any) => { - application.processing_vo_initials = res['processing_vo_initials']; - }); + this.bsModalRef = this.modalService.show(ConfirmationModalComponent, { initialState, class: 'modal-lg' }); + this.subscribeToBsModalRef(); } - } - - showConfirmationModal(action: ConfirmationActions): void { - let initialState = {}; - if (action === ConfirmationActions.APPROVE_APPLICATION) { - const application_center = !this.selectedComputeCenter.FacilityId; - initialState = { application: this.application, action, application_center }; - } else { - initialState = { - application: this.application, - action, - }; + + unsetProcessingVoManager(application: Application): void { + if (this.is_vo_admin) { + this.voService.unsetProcessingVoManager(application.project_application_id).subscribe(() => { + application.processing_vo_initials = null; + }); + } + } + + showClientsLimitsModal(is_modification_request: boolean = false): void { + let initialState = {}; + if (is_modification_request) { + initialState = { + compute_center_id: this.application.project_application_compute_center.FacilityId, + application: this.application, + is_modification_request, + }; + } else { + initialState = { + compute_center_id: this.selectedComputeCenter.FacilityId, + application: this.application, + is_modification_request, + }; + } + + this.bsModalRef = this.modalService.show(ClientLimitsComponent, { initialState }); + this.subscribeToBsModalRef(); + } + + removeApplicationFromFacilityConfirmation(): void { + this.groupService.removeGroupFromResource(this.application.project_application_perun_id.toString()).subscribe( + (): void => { + this.triggerReloadApplication(); + this.showNotificationModal('Success', 'The application was removed from the compute center', 'success'); + }, + (): void => { + this.showNotificationModal('Failed', 'The application was removed from the compute center', 'danger'); + }, + ); + } + + assignGroupToFacility(): void { + if (this.selectedComputeCenter) { + this.groupService + .assignGroupToResource(this.application.project_application_perun_id, this.selectedComputeCenter.FacilityId) + .subscribe( + (): void => { + this.triggerReloadApplication(); + + this.showNotificationModal('Success', 'The project was assigned to the facility.', 'success'); + }, + (error: object): void => { + console.log(error); + this.showNotificationModal('Failed', 'Project could not be created!', 'danger'); + }, + ); + } else { + this.showNotificationModal('Failed', 'You need to select an compute center!', 'danger'); + } } - this.bsModalRef = this.modalService.show(ConfirmationModalComponent, { initialState, class: 'modal-lg' }); - this.subscribeToBsModalRef(); - } - - unsetProcessingVoManager(application: Application): void { - if (this.is_vo_admin) { - this.voService.unsetProcessingVoManager(application.project_application_id).subscribe(() => { - application.processing_vo_initials = null; + + resetApplicationPI(): void { + this.applicationsService.resetPIValidation(this.application).subscribe(() => { + this.triggerReloadApplication(); }); } - } - - showClientsLimitsModal(is_modification_request: boolean = false): void { - let initialState = {}; - if (is_modification_request) { - initialState = { - compute_center_id: this.application.project_application_compute_center.FacilityId, - application: this.application, - is_modification_request, - }; - } else { - initialState = { - compute_center_id: this.selectedComputeCenter.FacilityId, - application: this.application, - is_modification_request, - }; + + switchCollaps() { + this.switchCollapseEvent.emit(); } - this.bsModalRef = this.modalService.show(ClientLimitsComponent, { initialState }); - this.subscribeToBsModalRef(); - } - - removeApplicationFromFacilityConfirmation(): void { - this.groupService.removeGroupFromResource(this.application.project_application_perun_id.toString()).subscribe( - (): void => { - this.getApplication(); - this.showNotificationModal('Success', 'The application was removed from the compute center', 'success'); - }, - (): void => { - this.showNotificationModal('Failed', 'The application was removed from the compute center', 'danger'); - }, - ); - } - - getApplication(): void { - this.applicationsService.getApplication(this.application.project_application_id.toString()).subscribe( - (aj: Application): void => { - this.application = aj; - }, - (error: any): void => { - console.log(error); - }, - ); - } - - assignGroupToFacility(): void { - if (this.selectedComputeCenter) { - this.groupService - .assignGroupToResource(this.application.project_application_perun_id, this.selectedComputeCenter.FacilityId) - .subscribe( - (): void => { - this.getApplication(); + showNotificationModal( + notificationModalTitle: string, + notificationModalMessage: string, + notificationModalType: string, + ) { + const initialState = { notificationModalTitle, notificationModalType, notificationModalMessage }; + if (this.bsModalRef) { + this.bsModalRef.hide(); + } + + this.bsModalRef = this.modalService.show(NotificationModalComponent, { initialState }); + this.bsModalRef.setClass('modal-lg'); + } + + createSimpleVmProjectGroup(): void { + this.showNotificationModal('Info', 'Creating Project...', 'info'); + + if (this.selectedComputeCenter && this.selectedComputeCenter.FacilityId) { + this.groupService + .createGroupByApplication(this.application.project_application_id, this.selectedComputeCenter.FacilityId) + .subscribe( + (res: any): void => { + if (!res['client_available'] && !res['created']) { + this.showNotificationModal( + 'Failed', + `The client ${res['client_name']} has not the necessary resources left!`, + 'danger', + ); + } else { + this.showNotificationModal('Success', 'The project was created!', 'success'); + this.triggerRemoveApplication(); + this.triggerReloadNumbers(); + } + }, + (error: any): void => { + console.log(error); + const errorMessage = error && error.error === 'locked' + ? 'Project is locked and could not be created!' + : 'Project could not be created!'; + + this.showNotificationModal('Failed', errorMessage, 'danger'); + console.log(error); + }, + ); + } + } + + approveModificationRequest(): void { + this.applicationsService.approveModificationRequest(this.application.project_application_id).subscribe( + (res: Response): void => { + this.showNotificationModal('Success', 'The resource modification request was approved!', 'success'); + if (!this.application.project_application_openstack_project) { + if (res.status === HttpStatusCode.Accepted) { + this.triggerRemoveApplication(); + this.triggerReloadNumbers(); + + // this.all_applications.splice(this.all_applications.indexOf(application), 1); + } + } else { + this.triggerReloadApplication(); + } + }, + (err: any): void => { + console.log('error', err.status); + this.showNotificationModal('Failed', 'Approval of resource modification failed!', 'danger'); + }, + ); + } + + declineModificationRequest(): void { + this.applicationsService.deleteModificationRequest(this.application.project_application_id).subscribe( + (): void => { + this.showNotificationModal('Declined', 'The resource modification request was declined!', 'success'); + this.triggerReloadNumbers(); + this.triggerRemoveApplication(); + + this.triggerReloadApplication(); + }, + (err: any): void => { + console.log('error', err.status); + this.showNotificationModal('Failed', 'Decline of resource modification failed!', 'danger'); + }, + ); + } + + deleteApplication(): void { + // const idx: number = this.all_applications.indexOf(application); - this.showNotificationModal('Success', 'The project was assigned to the facility.', 'success'); + this.subscription.add( + this.applicationsService.deleteApplication(this.application.project_application_id).subscribe( + (): void => { + this.showNotificationModal('Success', 'The application has been successfully removed', 'success'); + this.triggerRemoveApplication(); + this.triggerReloadNumbers(); }, - (error: object): void => { - console.log(error); - this.showNotificationModal('Failed', 'Project could not be created!', 'danger'); + (): void => { + this.updateNotificationModal('Failed', 'Application could not be removed!', true, 'danger'); }, - ); - } else { - this.showNotificationModal('Failed', 'You need to select an compute center!', 'danger'); + ), + ); } - } - - resetApplicationPI(): void { - this.applicationsService.resetPIValidation(this.application).subscribe(() => { - this.getApplication(); - }); - } - - switchCollaps() { - this.switchCollapseEvent.emit(); - } - - showNotificationModal( - notificationModalTitle: string, - notificationModalMessage: string, - notificationModalType: string, - ) { - const initialState = { notificationModalTitle, notificationModalType, notificationModalMessage }; - if (this.bsModalRef) { - this.bsModalRef.hide(); + + declineLifetimeExtension(): void { + this.applicationsService.deleteAdditionalLifetimeRequests(this.application.project_application_id).subscribe( + (): void => { + this.showNotificationModal('Declined', 'The project extension was declined!', 'success'); + this.triggerRemoveApplication(); + this.triggerReloadNumbers(); + }, + (err: any): void => { + console.log('error', err.status); + this.showNotificationModal('Failed', 'Decline of project extension failed!', 'danger'); + }, + ); + } + + declineCreditExtension(): void { + this.applicationsService.deleteAdditionalCreditsRequests(this.application.project_application_id).subscribe( + (): void => { + this.showNotificationModal('Declined', 'The credit extension request was declined!', 'success'); + this.triggerRemoveApplication(); + this.triggerReloadNumbers(); + }, + (err: any): void => { + console.log('error', err.status); + this.showNotificationModal('Failed', 'Decline of credit extension failed!', 'danger'); + }, + ); } - this.bsModalRef = this.modalService.show(NotificationModalComponent, { initialState }); - this.bsModalRef.setClass('modal-lg'); - } + declineApplication(): void { + // const idx: number = this.all_applications.indexOf(app); + this.applicationsService.declineApplication(this.application.project_application_id).subscribe( + (): void => { + const message: string = 'The Application was declined.'; + + this.showNotificationModal('Success', message, 'success'); + this.triggerRemoveApplication(); + this.triggerReloadNumbers(); + }, + (): void => { + this.showNotificationModal('Failed', 'Application could not be declined!', 'danger'); + }, + ); + } + + approveLifetimeExtension(): void { + this.applicationsService.approveAdditionalLifetime(this.application.project_application_id).subscribe( + (res: Response): void => { + if (this.application.project_application_openstack_project) { + this.triggerReloadApplication(); + this.showNotificationModal('Success', 'The request has been sent to the facility manager.', 'success'); + } else { + this.showNotificationModal('Success', 'The project has been extended!', 'success'); + } + if (!this.application.project_application_openstack_project) { + if (res.status === HttpStatusCode.Accepted) { + this.triggerReloadNumbers(); + this.triggerRemoveApplication(); + } + } + }, + (err: any): void => { + console.log('error', err.status); + this.showNotificationModal('Failed', 'Project lifetime could not be extendend!', 'danger'); + }, + ); + } - createSimpleVmProjectGroup(): void { - this.showNotificationModal('Info', 'Creating Project...', 'info'); + approveCreditExtension(): void { + this.applicationsService.approveAdditionalCreditsRequest(this.application.project_application_id).subscribe( + (res: Response): void => { + this.showNotificationModal('Success', 'The credit extension request was approved!', 'success'); + if (!this.application.project_application_openstack_project) { + if (res.status === HttpStatusCode.Accepted) { + this.triggerReloadNumbers(); + this.triggerRemoveApplication(); + } + } else { + this.triggerReloadApplication(); + } + }, + (err: any): void => { + console.log('error', err.status); + this.showNotificationModal('Failed', 'Approval of credit extension failed!', 'danger'); + }, + ); + } - if (this.selectedComputeCenter && this.selectedComputeCenter.FacilityId) { + createOpenStackProjectGroup(): void { this.groupService - .createGroupByApplication(this.application.project_application_id, this.selectedComputeCenter.FacilityId) + .createGroupOpenStack(this.application.project_application_id, this.selectedComputeCenter.FacilityId) .subscribe( - (res: any): void => { - if (!res['client_available'] && !res['created']) { - this.showNotificationModal( - 'Failed', - `The client ${res['client_name']} has not the necessary resources left!`, - 'danger', - ); + (result: { [key: string]: string }): void => { + if (result['Error']) { + this.showNotificationModal('Failed', result['Error'], 'danger'); } else { - this.showNotificationModal('Success', 'The project was created!', 'success'); - this.triggerRemoveApplication(); - this.triggerReloadNumbers(); + this.showNotificationModal('Success', 'The project was assigned to the facility.', 'success'); + this.triggerReloadApplication(); + // this.switchApproveLocked(false); } }, (error: any): void => { - console.log(error); - const errorMessage = error && error.error === 'locked' + const errorMessage = error && error.error === 'locked' ? 'Project is locked and could not be created!' : 'Project could not be created!'; @@ -255,233 +423,66 @@ export class ApplicationVoActionsComponent extends AbstractBaseClass implements }, ); } - } - - approveModificationRequest(): void { - this.applicationsService.approveModificationRequest(this.application.project_application_id).subscribe( - (res: Response): void => { - this.showNotificationModal('Success', 'The resource modification request was approved!', 'success'); - if (!this.application.project_application_openstack_project) { - if (res.status === HttpStatusCode.Accepted) { - this.triggerRemoveApplication(); - this.triggerReloadNumbers(); - // this.all_applications.splice(this.all_applications.indexOf(application), 1); + /** + * Function to listen to modal results. + */ + subscribeToBsModalRef(): void { + this.subscription.add( + this.bsModalRef.content.event.subscribe((result: any) => { + let action = null; + if ('action' in result) { + action = result['action']; } - } else { - this.getApplication(); - } - }, - (err: any): void => { - console.log('error', err.status); - this.showNotificationModal('Failed', 'Approval of resource modification failed!', 'danger'); - }, - ); - } - - declineModificationRequest(): void { - this.applicationsService.deleteModificationRequest(this.application.project_application_id).subscribe( - (): void => { - this.showNotificationModal('Declined', 'The resource modification request was declined!', 'success'); - this.triggerReloadNumbers(); - this.triggerRemoveApplication(); - - this.getApplication(); - }, - (err: any): void => { - console.log('error', err.status); - this.showNotificationModal('Failed', 'Decline of resource modification failed!', 'danger'); - }, - ); - } - - deleteApplication(): void { - // const idx: number = this.all_applications.indexOf(application); - - this.subscription.add( - this.applicationsService.deleteApplication(this.application.project_application_id).subscribe( - (): void => { - this.showNotificationModal('Success', 'The application has been successfully removed', 'success'); - this.triggerRemoveApplication(); - this.triggerReloadNumbers(); - }, - (): void => { - this.updateNotificationModal('Failed', 'Application could not be removed!', true, 'danger'); - }, - ), - ); - } - - declineLifetimeExtension(): void { - this.applicationsService.deleteAdditionalLifetimeRequests(this.application.project_application_id).subscribe( - (): void => { - this.showNotificationModal('Declined', 'The project extension was declined!', 'success'); - this.triggerRemoveApplication(); - this.triggerReloadNumbers(); - }, - (err: any): void => { - console.log('error', err.status); - this.showNotificationModal('Failed', 'Decline of project extension failed!', 'danger'); - }, - ); - } - - declineCreditExtension(): void { - this.applicationsService.deleteAdditionalCreditsRequests(this.application.project_application_id).subscribe( - (): void => { - this.showNotificationModal('Declined', 'The credit extension request was declined!', 'success'); - this.triggerRemoveApplication(); - this.triggerReloadNumbers(); - }, - (err: any): void => { - console.log('error', err.status); - this.showNotificationModal('Failed', 'Decline of credit extension failed!', 'danger'); - }, - ); - } - - declineApplication(): void { - // const idx: number = this.all_applications.indexOf(app); - this.applicationsService.declineApplication(this.application.project_application_id).subscribe( - (): void => { - const message: string = 'The Application was declined.'; - - this.showNotificationModal('Success', message, 'success'); - this.triggerRemoveApplication(); - this.triggerReloadNumbers(); - }, - (): void => { - this.showNotificationModal('Failed', 'Application could not be declined!', 'danger'); - }, - ); - } - - approveLifetimeExtension(): void { - this.applicationsService.approveAdditionalLifetime(this.application.project_application_id).subscribe( - (res: Response): void => { - if (this.application.project_application_openstack_project) { - this.getApplication(); - this.showNotificationModal('Success', 'The request has been sent to the facility manager.', 'success'); - } else { - this.showNotificationModal('Success', 'The project has been extended!', 'success'); - } - if (!this.application.project_application_openstack_project) { - if (res.status === HttpStatusCode.Accepted) { - this.triggerReloadNumbers(); - this.triggerRemoveApplication(); + if ('createSimpleVM' in result) { + this.createSimpleVmProjectGroup(); } - } - }, - (err: any): void => { - console.log('error', err.status); - this.showNotificationModal('Failed', 'Project lifetime could not be extendend!', 'danger'); - }, - ); - } - - approveCreditExtension(): void { - this.applicationsService.approveAdditionalCreditsRequest(this.application.project_application_id).subscribe( - (res: Response): void => { - this.showNotificationModal('Success', 'The credit extension request was approved!', 'success'); - if (!this.application.project_application_openstack_project) { - if (res.status === HttpStatusCode.Accepted) { - this.triggerReloadNumbers(); - this.triggerRemoveApplication(); + if (action === ConfirmationActions.APPROVE_MODIFICATION) { + this.approveModificationRequest(); } - } else { - this.getApplication(); - } - }, - (err: any): void => { - console.log('error', err.status); - this.showNotificationModal('Failed', 'Approval of credit extension failed!', 'danger'); - }, - ); - } - - createOpenStackProjectGroup(): void { - this.groupService - .createGroupOpenStack(this.application.project_application_id, this.selectedComputeCenter.FacilityId) - .subscribe( - (result: { [key: string]: string }): void => { - if (result['Error']) { - this.showNotificationModal('Failed', result['Error'], 'danger'); - } else { - this.showNotificationModal('Success', 'The project was assigned to the facility.', 'success'); - this.getApplication(); - // this.switchApproveLocked(false); + if ('closed' in result) { + // this.switchApproveLocked(false); + } + if (action === ConfirmationActions.DECLINE_MODIFICATION) { + this.declineModificationRequest(); + } + if (action === ConfirmationActions.DELETE_APPLICATION) { + this.deleteApplication(); + } + if (action === ConfirmationActions.DECLINE_EXTENSION) { + this.declineLifetimeExtension(); + } + if (action === ConfirmationActions.DECLINE_CREDITS) { + this.declineCreditExtension(); + } + if (action === ConfirmationActions.DECLINE_APPLICATION) { + this.declineApplication(); } - }, - (error: any): void => { - const errorMessage = error && error.error === 'locked' - ? 'Project is locked and could not be created!' - : 'Project could not be created!'; - this.showNotificationModal('Failed', errorMessage, 'danger'); - console.log(error); - }, + if (action === ConfirmationActions.APPROVE_EXTENSION) { + this.approveLifetimeExtension(); + } + if (action === ConfirmationActions.RESET_PI) { + this.resetApplicationPI(); + } + if (action === ConfirmationActions.APPROVE_CREDITS) { + this.approveCreditExtension(); + } + if (action === ConfirmationActions.APPROVE_APPLICATION) { + if (this.application.project_application_openstack_project) { + this.createOpenStackProjectGroup(); + } + } + if (action === 'adjustedModificationRequest') { + // this.isLoaded = false; + // this.changeTabState(ApplicationTabStates.MODIFICATION_EXTENSION); + } + }), ); - } - - /** - * Function to listen to modal results. - */ - subscribeToBsModalRef(): void { - this.subscription.add( - this.bsModalRef.content.event.subscribe((result: any) => { - let action = null; - if ('action' in result) { - action = result['action']; - } - if ('createSimpleVM' in result) { - this.createSimpleVmProjectGroup(); - } - if (action === ConfirmationActions.APPROVE_MODIFICATION) { - this.approveModificationRequest(); - } - if ('closed' in result) { - // this.switchApproveLocked(false); - } - if (action === ConfirmationActions.DECLINE_MODIFICATION) { - this.declineModificationRequest(); - } - if (action === ConfirmationActions.DELETE_APPLICATION) { - this.deleteApplication(); - } - if (action === ConfirmationActions.DECLINE_EXTENSION) { - this.declineLifetimeExtension(); - } - if (action === ConfirmationActions.DECLINE_CREDITS) { - this.declineCreditExtension(); - } - if (action === ConfirmationActions.DECLINE_APPLICATION) { - this.declineApplication(); - } + } - if (action === ConfirmationActions.APPROVE_EXTENSION) { - this.approveLifetimeExtension(); - } - if (action === ConfirmationActions.RESET_PI) { - this.resetApplicationPI(); - } - if (action === ConfirmationActions.APPROVE_CREDITS) { - this.approveCreditExtension(); - } - if (action === ConfirmationActions.APPROVE_APPLICATION) { - if (this.application.project_application_openstack_project) { - this.createOpenStackProjectGroup(); - } - } - if (action === 'adjustedModificationRequest') { - // this.isLoaded = false; - // this.changeTabState(ApplicationTabStates.MODIFICATION_EXTENSION); - } - }), - ); - } - - isCollapsed: boolean = true; - protected readonly Application_States = Application_States; - protected readonly ConfirmationActions = ConfirmationActions; - protected readonly ApplicationTabStates = ApplicationTabStates; + isCollapsed: boolean = true; + protected readonly Application_States = Application_States; + protected readonly ConfirmationActions = ConfirmationActions; + protected readonly ApplicationTabStates = ApplicationTabStates; } From bd01b4f50e4f61e2130570a29e1ccb092bf003d8 Mon Sep 17 00:00:00 2001 From: dweinholz Date: Tue, 9 Jul 2024 09:18:00 +0200 Subject: [PATCH 02/11] started refactoring tremplated mail --- .../facilityprojectsoverview.component.ts | 4 - ...t-csv-templated-email-modal.component.html | 213 ++++++++++++ ...ect-csv-templated-email-modal.component.ts | 109 ++++++ .../project-csv-templated-email.scss | 25 ++ .../project-email-modal.component.html | 312 +++++++++--------- .../shared_modules/shared-module.module.ts | 5 + src/app/vo_manager/VoOverviewComponent.ts | 33 +- src/app/vo_manager/voOverview.component.html | 3 +- 8 files changed, 518 insertions(+), 186 deletions(-) create mode 100644 src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.html create mode 100644 src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.ts create mode 100644 src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email.scss diff --git a/src/app/facility_manager/facilityprojectsoverview.component.ts b/src/app/facility_manager/facilityprojectsoverview.component.ts index 4bbf018218..bcade8d803 100644 --- a/src/app/facility_manager/facilityprojectsoverview.component.ts +++ b/src/app/facility_manager/facilityprojectsoverview.component.ts @@ -196,10 +196,6 @@ export class FacilityProjectsOverviewComponent extends AbstractBaseClass impleme this.sortProjectService.sortDirection = direction; } - searchForUserInFacility(searchString: string): void { - this.facilityService.getFilteredMembersOfFacility(searchString); - } - filterMembers(bare_searchString: string): void { this.filteredMembers = []; const searchString: string = bare_searchString.toLowerCase(); diff --git a/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.html b/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.html new file mode 100644 index 0000000000..337d2c0538 --- /dev/null +++ b/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.html @@ -0,0 +1,213 @@ +
+

Sent Mail to specific projects

+ +
+ +
+ @if (!csvFile || csvMailTemplate.errors.length > 0) { +
+

+ Valid Example: +

+ 
{{ validCSVExample }}
+
+

+ The following template keys would be provided by this CSV file: +

+
+ {VM}
+ {LOCATION} + +
+
+ +
+ } +
+ + +
+ @if (csvMailTemplate?.errors?.length > 0) { + +
+

Error! Unable to use the CSV file "{{ csvFile.name }}". The following errors + occurred:

+ +
    +
  • {{ err }}
    • +
+
+ } + @if (csvMailTemplate?.warnings?.length > 0) { + +
+

+ Warning! The following issues were found in the CSV file, but sending emails is still + possible: +

+ +
    +
  • {{ war }}
    • +
+
+ } + @if (csvMailTemplate) { + +
+ +
    +
  • {{ pr.project_application_shortname }}
    • +
+
+ + +
+
+
+
+ + +
+
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+
+
+

+ The following keys were provided by the CSV file: {{ csvFile.name }} +

+
+ {{ '{' + template + '}' }} +
+
+ +
+

You can use the following keys as variables:

+
+ {{ '{' + template + '}' }} +
+
+ +
+ Please consider: In case any dates are part of the sent E-Mails, they will be formatted in the german + TT.MM.YYYY-format. +
+ } + +
+ + + @if (csvMailTemplate && csvFile) { + + } + +
+ +
\ No newline at end of file diff --git a/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.ts b/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.ts new file mode 100644 index 0000000000..24c7ab91b7 --- /dev/null +++ b/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.ts @@ -0,0 +1,109 @@ +import { + Component, EventEmitter, Input, OnDestroy, OnInit, +} from '@angular/core'; +import { BsModalRef } from 'ngx-bootstrap/modal'; +import { Application } from '../../../../applications/application.model/application.model'; +import { IResponseTemplate } from '../../../../api-connector/response-template'; +import { EmailService } from '../../../../api-connector/email.service'; +import { STATUS_LINK } from '../../../../../links/links'; +import { CsvMailTemplateModel } from '../../../classes/csvMailTemplate.model'; + +@Component({ + selector: 'app-project-csv-templated-email-modal', + templateUrl: './project-csv-templated-email-modal.component.html', + styleUrls: ['./project-csv-templated-email.scss'], + providers: [EmailService], +}) +export class ProjectCsvTemplatedEmailModalComponent implements OnInit, OnDestroy { + selectedProjects: Application[]; + csvMailTemplate: CsvMailTemplateModel; + csvFile: File; + + emailAdminsOnly: boolean; + emailSubject: string; + emailReply: string; + emailText: string; + templates: string[]; + validCSVExample = `Project, VM, LOCATION +Proj1, VM_1, Bielefeld +Proj2, VM_2, Giessen`; + + public event: EventEmitter = new EventEmitter(); + + constructor( + public bsModalRef: BsModalRef, + private emailService: EmailService, + ) { + // eslint-disable-next-line no-empty-function + } + + ngOnInit() { + this.getMailTemplates(); + } + + onCsvFileSelected(event): void { + const inputElement = event.target as HTMLInputElement; + this.csvFile = inputElement.files[0]; + if (this.csvFile) { + this.emailService.sendCsvTemplate(this.csvFile).subscribe( + (csvTemplate: CsvMailTemplateModel) => { + this.csvMailTemplate = csvTemplate; + + }, + (error: CsvMailTemplateModel) => { + this.csvMailTemplate = error; + console.log(error['error']); + }, + ); + } + } + + getMailTemplates(): void { + this.emailService.getMailTemplates().subscribe((res: string[]) => { + this.templates = res; + }); + } + + sentProjectsTemplatedMail(): void { + const project_ids = this.selectedProjects.map((pr: Application) => pr.project_application_perun_id); + + this.emailService + .sendCsvTemplatedMail( + this.csvFile, + project_ids, + this.emailSubject, + this.emailText, + this.emailAdminsOnly, + this.emailReply, + ) + .subscribe( + (res: IResponseTemplate) => { + this.event.emit(res.value as boolean); + }, + () => { + this.event.emit(false); + }, + ); + } + + sentProjectsMail(): void { + const project_ids = this.selectedProjects.map((pr: Application) => pr.project_application_perun_id); + + this.emailService + .sendMailToProjects(project_ids, this.emailSubject, this.emailText, this.emailAdminsOnly, this.emailReply) + .subscribe( + (res: IResponseTemplate) => { + this.event.emit(res.value as boolean); + }, + () => { + this.event.emit(false); + }, + ); + } + + ngOnDestroy(): void { + this.bsModalRef.hide(); + } + + protected readonly STATUS_LINK = STATUS_LINK; +} diff --git a/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email.scss b/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email.scss new file mode 100644 index 0000000000..a86e9ffc41 --- /dev/null +++ b/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email.scss @@ -0,0 +1,25 @@ +.templates-container { + border: 1px solid #ccc; + padding: 10px; + background-color: #f9f9f9; +} + +.templates-list { + margin: 10px 0; + font-family: monospace; +} + +.valid-example { + border: 1px solid #ccc; + padding: 10px; + background-color: #f9f9f9; + margin-top: 10px; +} + +.valid-example-heading { + margin-bottom: 5px; +} + +.valid-example-content { + font-family: monospace; +} \ No newline at end of file diff --git a/src/app/shared/modal/email/project-email-modal/project-email-modal.component.html b/src/app/shared/modal/email/project-email-modal/project-email-modal.component.html index 5584431736..683f4adf5a 100644 --- a/src/app/shared/modal/email/project-email-modal/project-email-modal.component.html +++ b/src/app/shared/modal/email/project-email-modal/project-email-modal.component.html @@ -1,179 +1,187 @@
-

Sent Mail to specific projects

- +

Sent Mail to specific projects

+
-
- Send Mail to: -
    -
  • {{ pr.project_application_shortname }}
    • -
-
-
-
-

Error! Unable to use the CSV file "{{ csvFile.name }}". The following errors occurred:

+
+ Send Mail to: +
    +
  • {{ pr.project_application_shortname }}
    • +
+
-
    -
  • {{ err }}
    • -
-
-
-

- Valid Example: -

- 
{{ validCSVExample }}
-
-
+ @if (csvMailTemplate?.errors?.length > 0) { +
+
+

Error! Unable to use the CSV file "{{ csvFile.name }}". The following errors + occurred:

-
-

- Warning! The following issues were found in the CSV file, but sending emails is still possible: -

+
    +
  • {{ err }}
    • +
+
+
+

+ Valid Example: +

+ 
{{ validCSVExample }}
+
+
+ } @else { -
    -
  • {{ war }}
    • -
-
+
+

+ Warning! The following issues were found in the CSV file, but sending emails is still + possible: +

-
-
-
-
- - -
-
-
-
{{ war }} + +
+ } + @if (csvFile) { + + +
+
+
+ + +
+
+
+
- -
- Email subject* +
+ -
-
+ /> +
+
-
- -
- + +
+ -
-
- -
- -
+ /> +
+
+ +
+ +
-
-
- -
-

- The following keys were provided by the CSV file: {{ csvFile.name }} -

-
- {{ '{' + template + '}' }} -
-
+ > +
+
+ +
+

+ The following keys were provided by the CSV file: {{ csvFile.name }} +

+
+ {{ '{' + template + '}' }} +
+
-
-

You can use the following keys as variables:

-
- {{ '{' + template + '}' }} -
-
+
+

You can use the following keys as variables:

+
+ {{ '{' + template + '}' }} +
+
-
- Please consider: In case any dates are part of the sent E-Mails, they will be formatted in the german - TT.MM.YYYY-format. -
+
+ Please consider: In case any dates are part of the sent E-Mails, they will be formatted in the german + TT.MM.YYYY-format. +
+ }
- - - + + +
diff --git a/src/app/shared/shared_modules/shared-module.module.ts b/src/app/shared/shared_modules/shared-module.module.ts index eab670b22f..6c985ba778 100644 --- a/src/app/shared/shared_modules/shared-module.module.ts +++ b/src/app/shared/shared_modules/shared-module.module.ts @@ -16,6 +16,9 @@ import { SharedDirectivesModule } from './shared_directives.module'; import { MaintenanceNotificationComponent } from './components/maintenance-notification/maintenance-notification.component'; import { PipeModuleModule } from '../../pipe-module/pipe-module.module'; import { MembersListModalComponent } from '../modal/members/members-list-modal.component'; +import { + ProjectCsvTemplatedEmailModalComponent, +} from '../modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component'; /** * Shared module. @@ -30,6 +33,7 @@ import { MembersListModalComponent } from '../modal/members/members-list-modal.c MigrationInformationComponent, ApplicationBadgesComponent, ProjectEmailModalComponent, + ProjectCsvTemplatedEmailModalComponent, TestimonialFormComponent, MaintenanceNotificationComponent, ], @@ -53,6 +57,7 @@ import { MembersListModalComponent } from '../modal/members/members-list-modal.c MigrationInformationComponent, ApplicationBadgesComponent, ProjectEmailModalComponent, + ProjectCsvTemplatedEmailModalComponent, TestimonialFormComponent, MaintenanceNotificationComponent, ], diff --git a/src/app/vo_manager/VoOverviewComponent.ts b/src/app/vo_manager/VoOverviewComponent.ts index 9a207966b7..3f392670e6 100644 --- a/src/app/vo_manager/VoOverviewComponent.ts +++ b/src/app/vo_manager/VoOverviewComponent.ts @@ -26,6 +26,9 @@ import { ConfirmationActions } from '../shared/modal/confirmation_actions'; import { MembersListModalComponent } from '../shared/modal/members/members-list-modal.component'; import { EmailService } from '../api-connector/email.service'; import { CsvMailTemplateModel } from '../shared/classes/csvMailTemplate.model'; +import { + ProjectCsvTemplatedEmailModalComponent, +} from '../shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component'; /** * Vo Overview component. @@ -122,21 +125,6 @@ export class VoOverviewComponent extends AbstractBaseClass implements OnInit, On this.subscription.unsubscribe(); } - onCsvFileSelected(event): void { - const inputElement = event.target as HTMLInputElement; - if (inputElement.files && inputElement.files.length > 0) { - this.emailService.sendCsvTemplate(inputElement.files[0]).subscribe( - (csvTemplate: CsvMailTemplateModel) => { - this.openProjectMailsModal(inputElement.files[0], csvTemplate); - }, - (error: CsvMailTemplateModel) => { - console.log(error['error']); - this.openProjectMailsModal(inputElement.files[0], error['error']); - }, - ); - } - } - getTSVInformation(timeout: number = this.checkTSVTimeout): void { this.stopCheckTSVTimer(); this.subscription.add( @@ -252,20 +240,9 @@ export class VoOverviewComponent extends AbstractBaseClass implements OnInit, On } } - openProjectMailsModal(csvFile: File = null, csvTemplate: CsvMailTemplateModel = null): void { - let initialState = {}; - - if (csvFile) { - initialState = { - selectedProjects: csvTemplate.valid_projects, - csvFile, - csvMailTemplate: csvTemplate, - }; - } else { - initialState = { selectedProjects: this.selectedEmailProjects }; - } + openProjectMailsModal(): void { - this.bsModalRef = this.modalService.show(ProjectEmailModalComponent, { initialState, class: 'modal-lg' }); + this.bsModalRef = this.modalService.show(ProjectCsvTemplatedEmailModalComponent, { class: 'modal-lg' }); this.bsModalRef.content.event.subscribe((sent_successfully: boolean) => { if (sent_successfully) { this.updateNotificationModal('Success', 'Mails were successfully sent', true, 'success'); diff --git a/src/app/vo_manager/voOverview.component.html b/src/app/vo_manager/voOverview.component.html index 439ddfcc7d..d70da89c96 100644 --- a/src/app/vo_manager/voOverview.component.html +++ b/src/app/vo_manager/voOverview.component.html @@ -34,8 +34,7 @@ {{ selectedEmailProjects?.length }} - -
- -
diff --git a/src/app/facility_manager/facilityprojectsoverview.component.ts b/src/app/facility_manager/facilityprojectsoverview.component.ts index bcade8d803..03910a2a8c 100644 --- a/src/app/facility_manager/facilityprojectsoverview.component.ts +++ b/src/app/facility_manager/facilityprojectsoverview.component.ts @@ -19,10 +19,12 @@ import { import { ProjectSortService } from '../shared/shared_modules/services/project-sort.service'; import { AbstractBaseClass } from '../shared/shared_modules/baseClass/abstract-base-class'; import { ProjectEmailModalComponent } from '../shared/modal/email/project-email-modal/project-email-modal.component'; -import { NotificationModalComponent } from '../shared/modal/notification-modal'; import { MembersListModalComponent } from '../shared/modal/members/members-list-modal.component'; import { EmailService } from '../api-connector/email.service'; import { CsvMailTemplateModel } from '../shared/classes/csvMailTemplate.model'; +import { + ProjectCsvTemplatedEmailModalComponent, +} from '../shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component'; /** * Facility Project overview component. @@ -43,9 +45,7 @@ export class FacilityProjectsOverviewComponent extends AbstractBaseClass impleme public memberFilter: string = ''; filteredMembers: object[] = []; selectedMember: object[] = []; - facility_members: object[] = []; - filterChanged: Subject = new Subject(); isLoaded: boolean = false; projects: Application[] = []; projectsCopy: Application[] = []; @@ -183,7 +183,12 @@ export class FacilityProjectsOverviewComponent extends AbstractBaseClass impleme ); } } + openProjectCSVMailModal(): void { + console.log('show'); + + this.bsModalRef = this.modalService.show(ProjectCsvTemplatedEmailModalComponent, { class: 'modal-lg' }); + } onSort({ column, direction }: SortEvent) { // resetting other headers this.headers.forEach(header => { @@ -512,24 +517,6 @@ export class FacilityProjectsOverviewComponent extends AbstractBaseClass impleme initialState = { selectedProjects: this.selectedEmailProjects }; } this.bsModalRef = this.modalService.show(ProjectEmailModalComponent, { initialState, class: 'modal-lg' }); - this.bsModalRef.content.event.subscribe((sent_successfully: boolean) => { - if (sent_successfully) { - const initialStateNotification = { - notificationModalTitle: 'Success', - notificationModalType: 'success', - notificationModalMessage: 'Mails were successfully sent', - }; - - this.modalService.show(NotificationModalComponent, { initialState: initialStateNotification }); - } else { - const initialStateNotification = { - notificationModalTitle: 'Failed', - notificationModalType: 'danger', - notificationModalMessage: 'Failed to send mails!', - }; - this.modalService.show(NotificationModalComponent, { initialState: initialStateNotification }); - } - }); } setFacilitySupportMails(supportMails: string): void { diff --git a/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.html b/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.html index 337d2c0538..50e8fc8a12 100644 --- a/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.html +++ b/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.html @@ -10,7 +10,7 @@

Sent Mail to spe
- @if (!csvFile || csvMailTemplate.errors.length > 0) { + @if (!csvFile || csvMailTemplate?.errors?.length > 0) {

Valid Example: @@ -57,17 +57,20 @@

Sent Mail to spe

} - @if (csvMailTemplate) { + @if (csvMailTemplate?.valid_projects?.length > 0) {
    -
  • {{ pr.project_application_shortname }}
    • +
  • {{ pr.project_application_shortname }}
+ } + +
+ @if (csvMailTemplate) { -
@@ -152,7 +155,9 @@

Sent Mail to spe >

- + } + + @if (csvFile) {

The following keys were provided by the CSV file: {{ csvFile.name }} @@ -175,6 +180,7 @@

Sent Mail to spe

} +
Sent Mail to spe }
- @if (csvMailTemplate?.errors?.length > 0) { -
-
-

Error! Unable to use the CSV file "{{ csvFile.name }}". The following errors - occurred:

-
    -
  • {{ err }}
    • -
-
-
-

- Valid Example: -

- 
{{ validCSVExample }}
-
-
- } @else { - -
-

- Warning! The following issues were found in the CSV file, but sending emails is still - possible: -

- -
    -
  • {{ war }}
    • -
-
- } - @if (csvFile) { - -
-
-
-
- - -
+ +
+
+
+ +
-
- -
- Email subject* +
+ -
+ />
+
-
- -
- + +
+ -
+ />
- -
- -
+
+ +
+ +
-
-
- -
-

- The following keys were provided by the CSV file: {{ csvFile.name }} -

-
- {{ '{' + template + '}' }}
+ -
-

You can use the following keys as variables:

-
- {{ '{' + template + '}' }} -
-
-
- Please consider: In case any dates are part of the sent E-Mails, they will be formatted in the german - TT.MM.YYYY-format. +
+

You can use the following keys as variables:

+
+ {{ '{' + template + '}' }}
- } +
+ +
+ Please consider: In case any dates are part of the sent E-Mails, they will be formatted in the german + TT.MM.YYYY-format. +
+
- +
diff --git a/src/app/shared/modal/email/project-email-modal/project-email-modal.component.ts b/src/app/shared/modal/email/project-email-modal/project-email-modal.component.ts index 40c9dce8ef..b0e72e7ccd 100644 --- a/src/app/shared/modal/email/project-email-modal/project-email-modal.component.ts +++ b/src/app/shared/modal/email/project-email-modal/project-email-modal.component.ts @@ -7,7 +7,7 @@ import { VoService } from '../../../../api-connector/vo.service'; import { IResponseTemplate } from '../../../../api-connector/response-template'; import { EmailService } from '../../../../api-connector/email.service'; import { STATUS_LINK } from '../../../../../links/links'; -import { CsvMailTemplateModel } from '../../../classes/csvMailTemplate.model'; +import { NotificationModalComponent } from '../../notification-modal'; @Component({ selector: 'app-project-email-modal', @@ -16,79 +16,54 @@ import { CsvMailTemplateModel } from '../../../classes/csvMailTemplate.model'; providers: [EmailService], }) export class ProjectEmailModalComponent implements OnInit, OnDestroy { - @Input() selectedProjects: Application[]; - @Input() csvMailTemplate: CsvMailTemplateModel; - @Input() csvFile: File; + @Input() selectedProjects: Application[]; - emailAdminsOnly: boolean; - emailSubject: string; - emailReply: string; - emailText: string; - templates: string[]; - validCSVExample = `Project, Key1, Key2 -Proj1, ValK1, ValK2 -Proj2, ValK1, ValK2`; + emailAdminsOnly: boolean; + emailSubject: string; + emailReply: string; + emailText: string; + templates: string[]; - public event: EventEmitter = new EventEmitter(); + public event: EventEmitter = new EventEmitter(); - constructor( - public bsModalRef: BsModalRef, - private voService: VoService, - private emailService: EmailService, - ) { - // eslint-disable-next-line no-empty-function - } + constructor( + public bsModalRef: BsModalRef, + private emailService: EmailService, + private notificationModal: NotificationModalComponent, + ) { + // eslint-disable-next-line no-empty-function + } - ngOnInit() { - this.getMailTemplates(); - } + ngOnInit() { + this.getMailTemplates(); + } - getMailTemplates(): void { - this.emailService.getMailTemplates().subscribe((res: string[]) => { - this.templates = res; - }); - } + getMailTemplates(): void { + this.emailService.getMailTemplates().subscribe((res: string[]) => { + this.templates = res; + }); + } - sentProjectsTemplatedMail(): void { - const project_ids = this.selectedProjects.map((pr: Application) => pr.project_application_perun_id); + sentProjectsMail(): void { + const project_ids = this.selectedProjects.map((pr: Application) => pr.project_application_perun_id); + this.notificationModal.showInfoNotificationModal('Info', 'Sending Mails...'); - this.emailService - .sendCsvTemplatedMail( - this.csvFile, - project_ids, - this.emailSubject, - this.emailText, - this.emailAdminsOnly, - this.emailReply, - ) - .subscribe( - (res: IResponseTemplate) => { - this.event.emit(res.value as boolean); - }, - () => { - this.event.emit(false); - }, - ); - } + this.emailService + .sendMailToProjects(project_ids, this.emailSubject, this.emailText, this.emailAdminsOnly, this.emailReply) + .subscribe( + (res: IResponseTemplate) => { + this.notificationModal.showSuccessFullNotificationModal('Success', 'Mails were successfully sent'); + }, + () => { + this.notificationModal.showSuccessFullNotificationModal('Failed', 'Failed to send mails!'); - sentProjectsMail(): void { - const project_ids = this.selectedProjects.map((pr: Application) => pr.project_application_perun_id); + }, + ); + } - this.emailService - .sendMailToProjects(project_ids, this.emailSubject, this.emailText, this.emailAdminsOnly, this.emailReply) - .subscribe( - (res: IResponseTemplate) => { - this.event.emit(res.value as boolean); - }, - () => { - this.event.emit(false); - }, - ); - } + ngOnDestroy(): void { + this.bsModalRef.hide(); + } - ngOnDestroy(): void { - this.bsModalRef.hide(); - } - - protected readonly STATUS_LINK = STATUS_LINK; + protected readonly STATUS_LINK = STATUS_LINK; } diff --git a/src/app/shared/modal/notification-modal.component.html b/src/app/shared/modal/notification-modal.component.html index d1ed6e7157..da03ceaa33 100644 --- a/src/app/shared/modal/notification-modal.component.html +++ b/src/app/shared/modal/notification-modal.component.html @@ -1,25 +1,21 @@

{{ notificationModalTitle }}

- +
-
- + Close +
diff --git a/src/app/shared/modal/notification-modal.ts b/src/app/shared/modal/notification-modal.ts index 36e1f79258..571550f32d 100644 --- a/src/app/shared/modal/notification-modal.ts +++ b/src/app/shared/modal/notification-modal.ts @@ -1,18 +1,66 @@ -import { Component } from '@angular/core'; -import { BsModalRef } from 'ngx-bootstrap/modal'; +import { Component, Injectable, OnDestroy } from '@angular/core'; +import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal'; +import { Router } from '@angular/router'; +@Injectable({ providedIn: 'root' }) @Component({ - selector: 'app-notification-modal', - templateUrl: './notification-modal.component.html', + selector: 'app-notification-modal', + templateUrl: './notification-modal.component.html', }) -export class NotificationModalComponent { - +export class NotificationModalComponent implements OnDestroy { notificationModalTitle: string; notificationModalType: string; notificationModalMessage: string; + routerRedirectString: string; + modalId: number | string | undefined; + + hide(): void { + this.modalService.hide(this.modalId); + } - constructor(public bsModalRef: BsModalRef) { + constructor( + private router: Router, + private modalService: BsModalService, + ) { // eslint-disable-next-line no-empty-function } + showNotificationModal( + notificationModalTitle: string, + notificationModalMessage: string, + notificationModalType: string, + routerRedirectString?: string, + ): void { + const initialState = { + notificationModalTitle, + notificationModalType, + notificationModalMessage, + routerRedirectString, + }; + const bsModalRef: BsModalRef = this.modalService.show(NotificationModalComponent, { initialState }); + bsModalRef.setClass('modal-lg'); + this.modalId = bsModalRef.id; + } + + showSuccessFullNotificationModal(notificationModalTitle: string, notificationModalMessage: string, routerRedirectString?: string): void { + this.showNotificationModal(notificationModalTitle, notificationModalMessage, 'success', routerRedirectString); + } + + showDangerNotificationModal(notificationModalTitle: string, notificationModalMessage: string, routerRedirectString?: string): void { + this.showNotificationModal(notificationModalTitle, notificationModalMessage, 'danger', routerRedirectString); + } + + showWarningNotificationModal(notificationModalTitle: string, notificationModalMessage: string, routerRedirectString?: string): void { + this.showNotificationModal(notificationModalTitle, notificationModalMessage, 'warning', routerRedirectString); + } + + showInfoNotificationModal(notificationModalTitle: string, notificationModalMessage: string, routerRedirectString?: string): void { + this.showNotificationModal(notificationModalTitle, notificationModalMessage, 'info', routerRedirectString); + } + + ngOnDestroy(): void { + if (this.routerRedirectString) { + this.router.navigateByUrl(this.routerRedirectString); + } + } } diff --git a/src/app/shared/shared_modules/shared-module.module.ts b/src/app/shared/shared_modules/shared-module.module.ts index 6c985ba778..225d62803e 100644 --- a/src/app/shared/shared_modules/shared-module.module.ts +++ b/src/app/shared/shared_modules/shared-module.module.ts @@ -4,6 +4,7 @@ import { ModalModule } from 'ngx-bootstrap/modal'; import { ProgressModule, ToastModule } from '@coreui/angular'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { NgSelectModule } from '@ng-select/ng-select'; +import { RouterLink } from '@angular/router'; import { ApplicationBaseClassComponent } from './baseClass/application-base-class.component'; import { NotificationModalComponent } from '../modal/notification-modal'; import { InformationToastComponent } from '../toaster/information-toast.component'; @@ -47,6 +48,7 @@ import { NgSelectModule, SharedDirectivesModule, ReactiveFormsModule, + RouterLink, ], declarations: [ ApplicationBaseClassComponent, diff --git a/src/app/vo_manager/VoOverviewComponent.ts b/src/app/vo_manager/VoOverviewComponent.ts index 3f392670e6..b5dcdf9f2c 100644 --- a/src/app/vo_manager/VoOverviewComponent.ts +++ b/src/app/vo_manager/VoOverviewComponent.ts @@ -20,12 +20,10 @@ import { SortEvent, } from '../shared/shared_modules/directives/nbd-sortable-header.directive'; import { ProjectSortService } from '../shared/shared_modules/services/project-sort.service'; -import { ProjectEmailModalComponent } from '../shared/modal/email/project-email-modal/project-email-modal.component'; import { ConfirmationModalComponent } from '../shared/modal/confirmation-modal.component'; import { ConfirmationActions } from '../shared/modal/confirmation_actions'; import { MembersListModalComponent } from '../shared/modal/members/members-list-modal.component'; import { EmailService } from '../api-connector/email.service'; -import { CsvMailTemplateModel } from '../shared/classes/csvMailTemplate.model'; import { ProjectCsvTemplatedEmailModalComponent, } from '../shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component'; @@ -240,17 +238,10 @@ export class VoOverviewComponent extends AbstractBaseClass implements OnInit, On } } - openProjectMailsModal(): void { + openProjectCSVMailModal(): void { this.bsModalRef = this.modalService.show(ProjectCsvTemplatedEmailModalComponent, { class: 'modal-lg' }); - this.bsModalRef.content.event.subscribe((sent_successfully: boolean) => { - if (sent_successfully) { - this.updateNotificationModal('Success', 'Mails were successfully sent', true, 'success'); - } else { - this.updateNotificationModal('Failed', 'Failed to send mails!', true, 'danger'); - } - this.notificationModal.show(); - }); + } disableProject(project: Application): void { diff --git a/src/app/vo_manager/voOverview.component.html b/src/app/vo_manager/voOverview.component.html index d70da89c96..d9c4f15667 100644 --- a/src/app/vo_manager/voOverview.component.html +++ b/src/app/vo_manager/voOverview.component.html @@ -22,7 +22,7 @@ - - -
- -
-
-
- SimpleVM -
-
-
-
- -
-
- Ease -
-
- Ease of Use – SimpleVM lets you start and stop VMs with a few - clicks - which means that - there is no additional configuration necessary. -
-
-
- -
-
- Curve -
-
- Flat Learning Curve – If you want to use SimpleVM you don’t have to - learn about - resource management, like network configurations or storage management. No - background - knowledge in Cloud - Computing is necessary. -
-
-
- -
-
- Remote -
-
- Remote Desktop – If you don’t want to use SimpleVM via terminal you - can - easily connect - to your VM using a Remote Desktop. -
-
-
-
-
- -
-
- Workshop support – Create a workshop and start multiple configured - VMs - for your - participants with just a few clicks. To learn more about our workshop support click - here. -
-
-
- -
-
- Typical use cases: -
    -
  • - Tools and Pipelines: SimpleVM is a quick way to get up and - running with your tools - and pipelines in the cloud. -
    • -
  • - Remote Desktop: Launch your own Desktop or a browser-based - IDE - in the cloud (based - on Apache Guacamole, RStudio, Theia IDE, and more) and be able to run - programs - with graphical user - interfaces in addition to the command-line. -
    • -
-
-
+
+ +
+ +
+ Our de.NBI Cloud Project Types + +
+ +
+ +
+ +
+ +
+
+ + + +
+ +
+
+
+ SimpleVM +
+
+
+
+ +
+
+ Ease +
+
+ Ease of Use – SimpleVM lets you start and stop VMs with a few clicks which means that + there is no additional configuration necessary. +
+
+
+ +
+
+ Curve +
+
+ Flat Learning Curve – If you want to use SimpleVM you don’t have to learn about + resource management, like network configurations or storage management. No background knowledge in + Cloud Computing is necessary. +
+
+
+ +
+
+ Remote +
+
+ Remote Desktop – If you don’t want to use SimpleVM via terminal you can easily + connect to your VM using a Remote Desktop. +
+
+
+
+
+ +
+
+ Workshop support – Create a workshop and start multiple configured VMs for your + participants with just a few clicks. To learn more about our workshop support click + here. +
+
+
+ +
+
+ Typical use cases: +
    +
  • + Tools and Pipelines: SimpleVM is a quick way to get up and running with your + tools and pipelines in the cloud. +
    • +
  • + Remote Desktop: Launch your own Desktop or a browser-based IDE in the cloud + (based on Apache Guacamole, RStudio, Theia IDE, and more) and be able to run programs with + graphical user interfaces in addition to the command-line. +
    • +
+
+
-
-
- -
-
-
- Want to learn more about SimpleVM? -
-
- - - -
-
-
-
- -
+
+
+ +
+
+
+ Want to learn more about SimpleVM? +
+
+ + + +
+
+
+
+ +
- -
-
- - - -
- -
-
-
- Openstack -
-
-
-
- -
-
- Scale -
-
- Scalability – Easy scaling of virtual machines and distribution of - data - for efficient - computations. -
-
-
- -
-
- Configuration -
-
- Configurability – OpenStack allows the configuration of any - resource - type available, - such as virtual machines, network, block and object storage. -
-
-
- -
-
- API -
-
- API Access – Any interaction with OpenStack can be automated via - its - API enabling users - to script actions, e.g. starting and stopping of virtual machines. -
-
-
- -
-
- Typical use cases: -
    -
  • - Distributed Workflows: Distribution of workflows on - multiple - virtual machines. -
    • -
  • Services: The ability to offer services for other - researchers. -
    • -
-
-
+ +
+
+ + + +
+ +
+
+
+ Openstack +
+
+
+
+ +
+
+ Scale +
+
+ Scalability – Easy scaling of virtual machines and distribution of data for efficient + computations. +
+
+
+ +
+
+ Configuration +
+
+ Configurability – OpenStack allows the configuration of any resource type available, + such as virtual machines, network, block and object storage. +
+
+
+ +
+
+ API +
+
+ API Access – Any interaction with OpenStack can be automated via its API enabling + users to script actions, e.g. starting and stopping of virtual machines. +
+
+
+ +
+
+ Typical use cases: +
    +
  • + Distributed Workflows: Distribution of workflows on multiple virtual machines. +
    • +
  • Services: The ability to offer services for other researchers.
    • +
+
+
-
-
- -
-
-
- Want to learn more about Openstack? -
-
- - - -
-
-
-
- -
-
-
- - - -
- -
-
-
- Kubernetes -
-
-
-
- -
-
- Scale -
-
- Scalability – Easy scaling of virtual machines and distribution of - data for efficient - computations. -
-
-
- -
-
- Configuration -
-
- Configurability – Kubernetes allows the configuration of any - resource type available, - such as virtual machines, network. -
-
-
- -
-
- API -
-
- API Access – Any interaction with Kubernetes can be automated via - its API enabling - users to script actions, e.g. starting and stopping of containerized services. -
-
-
- -
-
- Typical use cases: -
    -
  • - Workflow Engines: Workflow engines like Nextflow allow you - to run your analysis on - top of Kubernetes. -
    • -
  • - Services: The ability to offer stateless and stateful - (databases) services for - other researchers. -
    • -
-
-
+
+
+ +
+
+
+ Want to learn more about Openstack? +
+
+ + + +
+
+
+
+ +
+
+
+ + + +
+ +
+
+
+ Kubernetes +
+
+
+
+ +
+
+ Scale +
+
+ Scalability – Easy scaling of containers and distribution of data for efficient + computations. +
+
+
+ +
+
+ Configuration +
+
+ Configurability – Kubernetes allows the configuration of any resource type available, + such as virtual machines, network. +
+
+
+ +
+
+ API +
+
+ API Access – Any interaction with Kubernetes can be automated via its API enabling + users to script actions, e.g. starting and stopping of containerized services. +
+
+
+ +
+
+ Typical use cases: +
    +
  • + Workflow Engines: Workflow engines like Nextflow allow you to run your analysis + on top of Kubernetes. +
    • +
  • + Services: The ability to offer stateless and stateful (databases) services for + other researchers. +
    • +
+
+
-
-
-
-
-
- Want to learn more about Kubernetes? -
-
- - - -
-
-
-
- -
+
+
+
+
+
+ Want to learn more about Kubernetes? +
+
+ + + +
+
+
+
+ +
- - -
- -
-
- -
-
- Want to learn more about SimpleVM? -
-
- - - -
-
- - -
-
- Want to learn more about Openstack? -
-
- - - -
-
-
-
- Want to learn more about Kubernetes? -
-
- - - -
-
- -
-
-
-
-
-
- Want to learn the Difference? -
-
- - - -
-
-
-
-
- -
- -
- -
- -
- -
+ +
+ +
+
+ +
+
+ Want to learn more about SimpleVM? +
+
+ + + +
+
+ + +
+
+ Want to learn more about Openstack? +
+
+ + + +
+
+
+
+ Want to learn more about Kubernetes? +
+
+ + + +
+
+
+
+
+
+
+
+ Want to learn the Difference? +
+
+ + + +
+
+
+
+
+ +
+ +
+ +
+ +
+ +
} @else { -
- -
- -
- Our de.NBI Cloud Project Types - -
- -
- -
- -
-
- - - -
-
- - - -
- -
-
- -
- -
- -
-
-
- SimpleVM -
-
-
-
- -
-
- Ease -
-
- Ease of Use – SimpleVM lets you start and stop VMs with a few - clicks which means that - there is no additional configuration necessary. -
-
-
- -
-
- Curve -
-
- Flat Learning Curve – If you want to use SimpleVM you don’t have to - learn about - resource management, like network configurations or storage management. No - background knowledge in Cloud - Computing is necessary. -
-
-
- -
-
- Remote -
-
- Remote Desktop – If you don’t want to use SimpleVM via terminal you - can easily connect - to your VM using a Remote Desktop. -
-
-
-
-
- -
-
- Workshop support – Create a workshop and start multiple configured - VMs for your - participants with just a few clicks. To learn more about our workshop support click - here. -
-
-
- -
-
-
-
- Typical use cases: -
-
-
-
-
-
- • Tools and Pipelines - – SimpleVM is a quick way to get up and running with your tools and pipelines in - the cloud. -
-
-
-
-
-
- • Remote Desktop - – Launch your own Desktop or a browser based IDE in the cloud (based on Apache - Guacamole, RStudio, - Theia IDE and more) and be able to run programs with graphical user interfaces - in addition to the - command-line. -
-
-
-
-
- -
-
-
- Want to learn more about SimpleVM? -
-
- - - -
-
-
- -
- - - -
-
-
- Want to learn the Difference between SimpleVM and Openstack? -
-
- - - -
-
-
+
+ +
+ +
+ Our de.NBI Cloud Project Types + +
+ +
+ +
+ +
+
+ + + +
+
+ + + +
+ +
+
+ +
+ +
+ +
+
+
+ SimpleVM +
+
+
+
+ +
+
+ Ease +
+
+ Ease of Use – SimpleVM lets you start and stop VMs with a few clicks which means that + there is no additional configuration necessary. +
+
+
+ +
+
+ Curve +
+
+ Flat Learning Curve – If you want to use SimpleVM you don’t have to learn about + resource management, like network configurations or storage management. No background knowledge in + Cloud Computing is necessary. +
+
+
+ +
+
+ Remote +
+
+ Remote Desktop – If you don’t want to use SimpleVM via terminal you can easily + connect to your VM using a Remote Desktop. +
+
+
+
+
+ +
+
+ Workshop support – Create a workshop and start multiple configured VMs for your + participants with just a few clicks. To learn more about our workshop support click + here. +
+
+
+ +
+
+
+
+ Typical use cases: +
+
+
+
+
+
+ • Tools and Pipelines + – SimpleVM is a quick way to get up and running with your tools and pipelines in the cloud. +
+
+
+
+
+
+ • Remote Desktop + – Launch your own Desktop or a browser based IDE in the cloud (based on Apache Guacamole, RStudio, + Theia IDE and more) and be able to run programs with graphical user interfaces in addition to the + command-line. +
+
+
+
+
+ +
+
+
+ Want to learn more about SimpleVM? +
+
+ + + +
+
+
+ +
- -
- -
-
-
- Openstack -
-
-
-
- -
-
- Scale -
-
- Scalability – Easy scaling of virtual machines and distribution of - data for efficient - computations. -
-
-
- -
-
- Configuration -
-
- Configurability – OpenStack allows the configuration of any - resource type available, - such as virtual machines, network, block and object storage. -
-
-
- -
-
- API -
-
- API Access – Any interaction with OpenStack can be automated via - its API enabling users - to script actions, e.g. starting and stopping of virtual machines. -
-
-
- -
-
-
-
- Typical use cases: -
-
-
-
-
-
- • Distributed Workflows - – Distribution of workflows on multiple virtual machines. -
-
-
-
-
-
- • Services - – The ability to offer services for other researchers. -
-
-
-
-
- -
-
-
- Want to learn more about Openstack? -
-
- - - -
-
-
-
- -
- -
- -
-
- -
-
- Want to learn more about SimpleVM? -
-
- - - -
-
- -
-
- Want to learn the Difference? -
-
- - - -
-
- -
-
- Want to learn more about Openstack? -
-
- - - -
-
-
-
- -
- -
- -
- -
- -
+ + +
+
+
+ Want to learn the Difference between SimpleVM and Openstack? +
+
+ + + +
+
+
-} \ No newline at end of file + +
+ +
+
+
+ Openstack +
+
+
+
+ +
+
+ Scale +
+
+ Scalability – Easy scaling of virtual machines and distribution of data for efficient + computations. +
+
+
+ +
+
+ Configuration +
+
+ Configurability – OpenStack allows the configuration of any resource type available, + such as virtual machines, network, block and object storage. +
+
+
+ +
+
+ API +
+
+ API Access – Any interaction with OpenStack can be automated via its API enabling + users to script actions, e.g. starting and stopping of virtual machines. +
+
+
+ +
+
+
+
+ Typical use cases: +
+
+
+
+
+
+ • Distributed Workflows + – Distribution of workflows on multiple virtual machines. +
+
+
+
+
+
+ • Services + – The ability to offer services for other researchers. +
+
+
+
+
+ +
+
+
+ Want to learn more about Openstack? +
+
+ + + +
+
+
+
+ +
+ +
+ +
+
+ +
+
+ Want to learn more about SimpleVM? +
+
+ + + +
+
+ +
+
+ Want to learn the Difference? +
+
+ + + +
+
+ +
+
+ Want to learn more about Openstack? +
+
+ + + +
+
+
+
+ +
+ +
+ +
+ +
+ +
+} From e18b41e5dd1272692cef312ead1638a971aeb717 Mon Sep 17 00:00:00 2001 From: dweinholz Date: Tue, 9 Jul 2024 15:20:21 +0200 Subject: [PATCH 05/11] fixed linting --- .../application-list.component.ts | 112 +++++++++--------- .../facilityprojectsoverview.component.ts | 7 +- .../withdraw/withdraw-modal.component.ts | 2 + .../projectmanagement.module.ts | 2 + ...ect-csv-templated-email-modal.component.ts | 12 +- .../project-email-modal.component.ts | 83 +++++++------ src/app/shared/modal/notification-modal.ts | 30 +++-- src/app/vo_manager/vo-guard.service.ts | 5 +- 8 files changed, 131 insertions(+), 122 deletions(-) diff --git a/src/app/applications/application-list/application-list.component.ts b/src/app/applications/application-list/application-list.component.ts index f761a7873e..097c8c9081 100644 --- a/src/app/applications/application-list/application-list.component.ts +++ b/src/app/applications/application-list/application-list.component.ts @@ -15,72 +15,72 @@ import { is_vo } from '../../shared/globalvar'; styleUrl: './application-list.component.scss', }) export class ApplicationListComponent implements OnInit, OnChanges { - @Output() reloadNumbersTrigger: EventEmitter = new EventEmitter(); + @Output() reloadNumbersTrigger: EventEmitter = new EventEmitter(); - @Input() applications: Application[] = []; - @Input() tabState: ApplicationTabStates = ApplicationTabStates.SUBMITTED; - @Input() computeCenters: ComputecenterComponent[] = []; - @Input() facilityView: boolean = false; - @Input() voView: boolean = false; - dataTestId: string = ''; + @Input() applications: Application[] = []; + @Input() tabState: ApplicationTabStates = ApplicationTabStates.SUBMITTED; + @Input() computeCenters: ComputecenterComponent[] = []; + @Input() facilityView: boolean = false; + @Input() voView: boolean = false; + dataTestId: string = ''; - is_vo_admin: boolean = false; + is_vo_admin: boolean = false; - ngOnInit() { - this.is_vo_admin = is_vo; - this.setDataTestId(); - } - - ngOnChanges(changes: SimpleChanges) { - this.setDataTestId(); + ngOnInit() { + this.is_vo_admin = is_vo; + this.setDataTestId(); + } - } + // eslint-disable-next-line @typescript-eslint/no-unused-vars + ngOnChanges(changes: SimpleChanges) { + this.setDataTestId(); + } - setDataTestId(): void { - console.log('set data test id'); - switch (this.tabState) { - case ApplicationTabStates.SUBMITTED: { - this.dataTestId = 'submitted_applications_container'; - break; - } - case ApplicationTabStates.CREDITS_EXTENSION: { - this.dataTestId = 'credits_requests_applications_container'; - break; - } - case ApplicationTabStates.LIFETIME_EXTENSION: { - this.dataTestId = 'lifetime_requests_applications_container'; - break; - } - case ApplicationTabStates.MODIFICATION_EXTENSION: { - this.dataTestId = 'modification_requests_applications_container'; - break; - } - case ApplicationTabStates.TERMINATION_REQUEST: { - this.dataTestId = 'termination_requests_applications_container'; - break; - } - default: { - break; - } + setDataTestId(): void { + console.log('set data test id'); + switch (this.tabState) { + case ApplicationTabStates.SUBMITTED: { + this.dataTestId = 'submitted_applications_container'; + break; + } + case ApplicationTabStates.CREDITS_EXTENSION: { + this.dataTestId = 'credits_requests_applications_container'; + break; + } + case ApplicationTabStates.LIFETIME_EXTENSION: { + this.dataTestId = 'lifetime_requests_applications_container'; + break; + } + case ApplicationTabStates.MODIFICATION_EXTENSION: { + this.dataTestId = 'modification_requests_applications_container'; + break; + } + case ApplicationTabStates.TERMINATION_REQUEST: { + this.dataTestId = 'termination_requests_applications_container'; + break; + } + default: { + break; } - console.log(this.dataTestId); } + console.log(this.dataTestId); + } - triggerReloadNumbers() { - console.log('trigger reload 2'); - this.reloadNumbersTrigger.emit(); - } + triggerReloadNumbers() { + console.log('trigger reload 2'); + this.reloadNumbersTrigger.emit(); + } - removeApplicationFromList(application_id: string | number) { - const idx: number = this.applications.findIndex( - (application: Application) => application.project_application_id === application_id, - ); + removeApplicationFromList(application_id: string | number) { + const idx: number = this.applications.findIndex( + (application: Application) => application.project_application_id === application_id, + ); - if (idx !== -1) { - console.log('remove index'); - this.applications.splice(idx, 1); - } + if (idx !== -1) { + console.log('remove index'); + this.applications.splice(idx, 1); } + } - protected readonly Application_States = Application_States; + protected readonly Application_States = Application_States; } diff --git a/src/app/facility_manager/facilityprojectsoverview.component.ts b/src/app/facility_manager/facilityprojectsoverview.component.ts index 03910a2a8c..b722a8d618 100644 --- a/src/app/facility_manager/facilityprojectsoverview.component.ts +++ b/src/app/facility_manager/facilityprojectsoverview.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit, QueryList, ViewChildren, inject, } from '@angular/core'; -import { Observable, Subject, take } from 'rxjs'; +import { Observable, take } from 'rxjs'; import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal'; import { MatomoTracker } from 'ngx-matomo-client'; import { ProjectMember } from '../projectmanagement/project_member.model'; @@ -22,9 +22,7 @@ import { ProjectEmailModalComponent } from '../shared/modal/email/project-email- import { MembersListModalComponent } from '../shared/modal/members/members-list-modal.component'; import { EmailService } from '../api-connector/email.service'; import { CsvMailTemplateModel } from '../shared/classes/csvMailTemplate.model'; -import { - ProjectCsvTemplatedEmailModalComponent, -} from '../shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component'; +import { ProjectCsvTemplatedEmailModalComponent } from '../shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component'; /** * Facility Project overview component. @@ -187,7 +185,6 @@ export class FacilityProjectsOverviewComponent extends AbstractBaseClass impleme console.log('show'); this.bsModalRef = this.modalService.show(ProjectCsvTemplatedEmailModalComponent, { class: 'modal-lg' }); - } onSort({ column, direction }: SortEvent) { // resetting other headers diff --git a/src/app/projectmanagement/modals/withdraw/withdraw-modal.component.ts b/src/app/projectmanagement/modals/withdraw/withdraw-modal.component.ts index ff6ca1edcf..bd8eef3a06 100644 --- a/src/app/projectmanagement/modals/withdraw/withdraw-modal.component.ts +++ b/src/app/projectmanagement/modals/withdraw/withdraw-modal.component.ts @@ -39,6 +39,8 @@ export class WithdrawModalComponent { this.event.emit(true); }); break; + default: + this.event.emit(false); } } diff --git a/src/app/projectmanagement/projectmanagement.module.ts b/src/app/projectmanagement/projectmanagement.module.ts index 2b53063b0a..96bd65b697 100644 --- a/src/app/projectmanagement/projectmanagement.module.ts +++ b/src/app/projectmanagement/projectmanagement.module.ts @@ -25,6 +25,7 @@ import { ResultComponent } from './modals/result/result.component'; import { SharedModuleModule } from '../shared/shared_modules/shared-module.module'; import { AdjustLifetimeRequestComponent } from './modals/adjust-lifetime/adjust-lifetime-request.component'; import { AdjustApplicationComponent } from './modals/adjust-application/adjust-application.component'; +import { WithdrawModalComponent } from './modals/withdraw/withdraw-modal.component'; /** * Projectmanagment module. @@ -59,6 +60,7 @@ import { AdjustApplicationComponent } from './modals/adjust-application/adjust-a ExtensionEntryComponent, AdjustLifetimeRequestComponent, AdjustApplicationComponent, + WithdrawModalComponent, ], exports: [ProjectOsDetailsComponent, ExtensionEntryComponent], }) diff --git a/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.ts b/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.ts index da53477b74..aa5c04b137 100644 --- a/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.ts +++ b/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.ts @@ -3,7 +3,6 @@ import { } from '@angular/core'; import { BsModalRef } from 'ngx-bootstrap/modal'; import { Application } from '../../../../applications/application.model/application.model'; -import { IResponseTemplate } from '../../../../api-connector/response-template'; import { EmailService } from '../../../../api-connector/email.service'; import { STATUS_LINK } from '../../../../../links/links'; import { CsvMailTemplateModel } from '../../../classes/csvMailTemplate.model'; @@ -31,9 +30,9 @@ Proj2, VM_2, Giessen`; public event: EventEmitter = new EventEmitter(); constructor( - public bsModalRef: BsModalRef, - private emailService: EmailService, - private notificationModal: NotificationModalComponent, + public bsModalRef: BsModalRef, + private emailService: EmailService, + private notificationModal: NotificationModalComponent, ) { // eslint-disable-next-line no-empty-function } @@ -49,7 +48,6 @@ Proj2, VM_2, Giessen`; this.emailService.sendCsvTemplate(this.csvFile).subscribe( (csvTemplate: CsvMailTemplateModel) => { this.csvMailTemplate = csvTemplate; - }, (error: CsvMailTemplateModel) => { this.csvMailTemplate = error; @@ -79,13 +77,11 @@ Proj2, VM_2, Giessen`; this.emailReply, ) .subscribe( - (res: IResponseTemplate) => { + () => { this.notificationModal.showSuccessFullNotificationModal('Success', 'Mails were successfully sent!'); - }, () => { this.notificationModal.showDangerNotificationModal('Failed', 'Failed to send mails!'); - }, ); } diff --git a/src/app/shared/modal/email/project-email-modal/project-email-modal.component.ts b/src/app/shared/modal/email/project-email-modal/project-email-modal.component.ts index b0e72e7ccd..aa9e6ce5d6 100644 --- a/src/app/shared/modal/email/project-email-modal/project-email-modal.component.ts +++ b/src/app/shared/modal/email/project-email-modal/project-email-modal.component.ts @@ -3,8 +3,6 @@ import { } from '@angular/core'; import { BsModalRef } from 'ngx-bootstrap/modal'; import { Application } from '../../../../applications/application.model/application.model'; -import { VoService } from '../../../../api-connector/vo.service'; -import { IResponseTemplate } from '../../../../api-connector/response-template'; import { EmailService } from '../../../../api-connector/email.service'; import { STATUS_LINK } from '../../../../../links/links'; import { NotificationModalComponent } from '../../notification-modal'; @@ -16,54 +14,53 @@ import { NotificationModalComponent } from '../../notification-modal'; providers: [EmailService], }) export class ProjectEmailModalComponent implements OnInit, OnDestroy { - @Input() selectedProjects: Application[]; + @Input() selectedProjects: Application[]; - emailAdminsOnly: boolean; - emailSubject: string; - emailReply: string; - emailText: string; - templates: string[]; + emailAdminsOnly: boolean; + emailSubject: string; + emailReply: string; + emailText: string; + templates: string[]; - public event: EventEmitter = new EventEmitter(); + public event: EventEmitter = new EventEmitter(); - constructor( - public bsModalRef: BsModalRef, - private emailService: EmailService, - private notificationModal: NotificationModalComponent, - ) { - // eslint-disable-next-line no-empty-function - } + constructor( + public bsModalRef: BsModalRef, + private emailService: EmailService, + private notificationModal: NotificationModalComponent, + ) { + // eslint-disable-next-line no-empty-function + } - ngOnInit() { - this.getMailTemplates(); - } + ngOnInit() { + this.getMailTemplates(); + } - getMailTemplates(): void { - this.emailService.getMailTemplates().subscribe((res: string[]) => { - this.templates = res; - }); - } + getMailTemplates(): void { + this.emailService.getMailTemplates().subscribe((res: string[]) => { + this.templates = res; + }); + } - sentProjectsMail(): void { - const project_ids = this.selectedProjects.map((pr: Application) => pr.project_application_perun_id); - this.notificationModal.showInfoNotificationModal('Info', 'Sending Mails...'); + sentProjectsMail(): void { + const project_ids = this.selectedProjects.map((pr: Application) => pr.project_application_perun_id); + this.notificationModal.showInfoNotificationModal('Info', 'Sending Mails...'); - this.emailService - .sendMailToProjects(project_ids, this.emailSubject, this.emailText, this.emailAdminsOnly, this.emailReply) - .subscribe( - (res: IResponseTemplate) => { - this.notificationModal.showSuccessFullNotificationModal('Success', 'Mails were successfully sent'); - }, - () => { - this.notificationModal.showSuccessFullNotificationModal('Failed', 'Failed to send mails!'); + this.emailService + .sendMailToProjects(project_ids, this.emailSubject, this.emailText, this.emailAdminsOnly, this.emailReply) + .subscribe( + () => { + this.notificationModal.showSuccessFullNotificationModal('Success', 'Mails were successfully sent'); + }, + () => { + this.notificationModal.showSuccessFullNotificationModal('Failed', 'Failed to send mails!'); + }, + ); + } - }, - ); - } + ngOnDestroy(): void { + this.bsModalRef.hide(); + } - ngOnDestroy(): void { - this.bsModalRef.hide(); - } - - protected readonly STATUS_LINK = STATUS_LINK; + protected readonly STATUS_LINK = STATUS_LINK; } diff --git a/src/app/shared/modal/notification-modal.ts b/src/app/shared/modal/notification-modal.ts index 571550f32d..a9932f23fe 100644 --- a/src/app/shared/modal/notification-modal.ts +++ b/src/app/shared/modal/notification-modal.ts @@ -19,8 +19,8 @@ export class NotificationModalComponent implements OnDestroy { } constructor( - private router: Router, - private modalService: BsModalService, + private router: Router, + private modalService: BsModalService, ) { // eslint-disable-next-line no-empty-function } @@ -42,25 +42,41 @@ export class NotificationModalComponent implements OnDestroy { this.modalId = bsModalRef.id; } - showSuccessFullNotificationModal(notificationModalTitle: string, notificationModalMessage: string, routerRedirectString?: string): void { + showSuccessFullNotificationModal( + notificationModalTitle: string, + notificationModalMessage: string, + routerRedirectString?: string, + ): void { this.showNotificationModal(notificationModalTitle, notificationModalMessage, 'success', routerRedirectString); } - showDangerNotificationModal(notificationModalTitle: string, notificationModalMessage: string, routerRedirectString?: string): void { + showDangerNotificationModal( + notificationModalTitle: string, + notificationModalMessage: string, + routerRedirectString?: string, + ): void { this.showNotificationModal(notificationModalTitle, notificationModalMessage, 'danger', routerRedirectString); } - showWarningNotificationModal(notificationModalTitle: string, notificationModalMessage: string, routerRedirectString?: string): void { + showWarningNotificationModal( + notificationModalTitle: string, + notificationModalMessage: string, + routerRedirectString?: string, + ): void { this.showNotificationModal(notificationModalTitle, notificationModalMessage, 'warning', routerRedirectString); } - showInfoNotificationModal(notificationModalTitle: string, notificationModalMessage: string, routerRedirectString?: string): void { + showInfoNotificationModal( + notificationModalTitle: string, + notificationModalMessage: string, + routerRedirectString?: string, + ): void { this.showNotificationModal(notificationModalTitle, notificationModalMessage, 'info', routerRedirectString); } ngOnDestroy(): void { if (this.routerRedirectString) { - this.router.navigateByUrl(this.routerRedirectString); + void this.router.navigateByUrl(this.routerRedirectString); } } } diff --git a/src/app/vo_manager/vo-guard.service.ts b/src/app/vo_manager/vo-guard.service.ts index 51dac09551..2846489dbb 100644 --- a/src/app/vo_manager/vo-guard.service.ts +++ b/src/app/vo_manager/vo-guard.service.ts @@ -1,4 +1,5 @@ /* eslint-disable */ +/* tslint:disable */ import { Injectable } from '@angular/core' import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router' import { Observable } from 'rxjs' @@ -9,9 +10,7 @@ import { is_vo } from '../shared/globalvar' */ @Injectable() export class VoGuardService { - constructor(private router: Router) { - this.router = router - } + constructor(private router: Router) {} // eslint-disable-next-line @typescript-eslint/no-unused-vars canActivate( From 5084277bc609f6ee44addcd8fb1881d2e65a4a37 Mon Sep 17 00:00:00 2001 From: dweinholz Date: Tue, 9 Jul 2024 15:26:27 +0200 Subject: [PATCH 06/11] fixed linting --- src/app/vo_manager/vo-guard.service.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/vo_manager/vo-guard.service.ts b/src/app/vo_manager/vo-guard.service.ts index 2846489dbb..9a5c65f31b 100644 --- a/src/app/vo_manager/vo-guard.service.ts +++ b/src/app/vo_manager/vo-guard.service.ts @@ -1,5 +1,6 @@ /* eslint-disable */ /* tslint:disable */ + import { Injectable } from '@angular/core' import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router' import { Observable } from 'rxjs' From 93f851956e804c7ae7b722d54ba8eb242b447c56 Mon Sep 17 00:00:00 2001 From: dweinholz Date: Tue, 9 Jul 2024 15:29:23 +0200 Subject: [PATCH 07/11] Revert "Refactor/templated mail" --- .../application-list.component.ts | 112 ++++---- .../facilityprojectsoverview.component.html | 3 +- .../facilityprojectsoverview.component.ts | 32 ++- .../withdraw/withdraw-modal.component.ts | 2 - .../projectmanagement.module.ts | 2 - ...t-csv-templated-email-modal.component.html | 219 --------------- ...ect-csv-templated-email-modal.component.ts | 94 ------- .../project-csv-templated-email.scss | 25 -- .../project-email-modal.component.html | 265 ++++++++++-------- .../project-email-modal.component.ts | 40 ++- .../modal/notification-modal.component.html | 28 +- src/app/shared/modal/notification-modal.ts | 78 +----- .../shared_modules/shared-module.module.ts | 7 - src/app/vo_manager/VoOverviewComponent.ts | 42 ++- src/app/vo_manager/vo-guard.service.ts | 6 +- src/app/vo_manager/voOverview.component.html | 5 +- 16 files changed, 338 insertions(+), 622 deletions(-) delete mode 100644 src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.html delete mode 100644 src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.ts delete mode 100644 src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email.scss diff --git a/src/app/applications/application-list/application-list.component.ts b/src/app/applications/application-list/application-list.component.ts index 097c8c9081..f761a7873e 100644 --- a/src/app/applications/application-list/application-list.component.ts +++ b/src/app/applications/application-list/application-list.component.ts @@ -15,72 +15,72 @@ import { is_vo } from '../../shared/globalvar'; styleUrl: './application-list.component.scss', }) export class ApplicationListComponent implements OnInit, OnChanges { - @Output() reloadNumbersTrigger: EventEmitter = new EventEmitter(); + @Output() reloadNumbersTrigger: EventEmitter = new EventEmitter(); - @Input() applications: Application[] = []; - @Input() tabState: ApplicationTabStates = ApplicationTabStates.SUBMITTED; - @Input() computeCenters: ComputecenterComponent[] = []; - @Input() facilityView: boolean = false; - @Input() voView: boolean = false; - dataTestId: string = ''; + @Input() applications: Application[] = []; + @Input() tabState: ApplicationTabStates = ApplicationTabStates.SUBMITTED; + @Input() computeCenters: ComputecenterComponent[] = []; + @Input() facilityView: boolean = false; + @Input() voView: boolean = false; + dataTestId: string = ''; - is_vo_admin: boolean = false; + is_vo_admin: boolean = false; - ngOnInit() { - this.is_vo_admin = is_vo; - this.setDataTestId(); - } + ngOnInit() { + this.is_vo_admin = is_vo; + this.setDataTestId(); + } - // eslint-disable-next-line @typescript-eslint/no-unused-vars - ngOnChanges(changes: SimpleChanges) { - this.setDataTestId(); - } + ngOnChanges(changes: SimpleChanges) { + this.setDataTestId(); - setDataTestId(): void { - console.log('set data test id'); - switch (this.tabState) { - case ApplicationTabStates.SUBMITTED: { - this.dataTestId = 'submitted_applications_container'; - break; - } - case ApplicationTabStates.CREDITS_EXTENSION: { - this.dataTestId = 'credits_requests_applications_container'; - break; - } - case ApplicationTabStates.LIFETIME_EXTENSION: { - this.dataTestId = 'lifetime_requests_applications_container'; - break; - } - case ApplicationTabStates.MODIFICATION_EXTENSION: { - this.dataTestId = 'modification_requests_applications_container'; - break; - } - case ApplicationTabStates.TERMINATION_REQUEST: { - this.dataTestId = 'termination_requests_applications_container'; - break; - } - default: { - break; + } + + setDataTestId(): void { + console.log('set data test id'); + switch (this.tabState) { + case ApplicationTabStates.SUBMITTED: { + this.dataTestId = 'submitted_applications_container'; + break; + } + case ApplicationTabStates.CREDITS_EXTENSION: { + this.dataTestId = 'credits_requests_applications_container'; + break; + } + case ApplicationTabStates.LIFETIME_EXTENSION: { + this.dataTestId = 'lifetime_requests_applications_container'; + break; + } + case ApplicationTabStates.MODIFICATION_EXTENSION: { + this.dataTestId = 'modification_requests_applications_container'; + break; + } + case ApplicationTabStates.TERMINATION_REQUEST: { + this.dataTestId = 'termination_requests_applications_container'; + break; + } + default: { + break; + } } + console.log(this.dataTestId); } - console.log(this.dataTestId); - } - triggerReloadNumbers() { - console.log('trigger reload 2'); - this.reloadNumbersTrigger.emit(); - } + triggerReloadNumbers() { + console.log('trigger reload 2'); + this.reloadNumbersTrigger.emit(); + } - removeApplicationFromList(application_id: string | number) { - const idx: number = this.applications.findIndex( - (application: Application) => application.project_application_id === application_id, - ); + removeApplicationFromList(application_id: string | number) { + const idx: number = this.applications.findIndex( + (application: Application) => application.project_application_id === application_id, + ); - if (idx !== -1) { - console.log('remove index'); - this.applications.splice(idx, 1); + if (idx !== -1) { + console.log('remove index'); + this.applications.splice(idx, 1); + } } - } - protected readonly Application_States = Application_States; + protected readonly Application_States = Application_States; } diff --git a/src/app/facility_manager/facilityprojectsoverview.component.html b/src/app/facility_manager/facilityprojectsoverview.component.html index d7feed64bd..cd9cc581dd 100644 --- a/src/app/facility_manager/facilityprojectsoverview.component.html +++ b/src/app/facility_manager/facilityprojectsoverview.component.html @@ -45,7 +45,8 @@
-
diff --git a/src/app/facility_manager/facilityprojectsoverview.component.ts b/src/app/facility_manager/facilityprojectsoverview.component.ts index b722a8d618..4bbf018218 100644 --- a/src/app/facility_manager/facilityprojectsoverview.component.ts +++ b/src/app/facility_manager/facilityprojectsoverview.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit, QueryList, ViewChildren, inject, } from '@angular/core'; -import { Observable, take } from 'rxjs'; +import { Observable, Subject, take } from 'rxjs'; import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal'; import { MatomoTracker } from 'ngx-matomo-client'; import { ProjectMember } from '../projectmanagement/project_member.model'; @@ -19,10 +19,10 @@ import { import { ProjectSortService } from '../shared/shared_modules/services/project-sort.service'; import { AbstractBaseClass } from '../shared/shared_modules/baseClass/abstract-base-class'; import { ProjectEmailModalComponent } from '../shared/modal/email/project-email-modal/project-email-modal.component'; +import { NotificationModalComponent } from '../shared/modal/notification-modal'; import { MembersListModalComponent } from '../shared/modal/members/members-list-modal.component'; import { EmailService } from '../api-connector/email.service'; import { CsvMailTemplateModel } from '../shared/classes/csvMailTemplate.model'; -import { ProjectCsvTemplatedEmailModalComponent } from '../shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component'; /** * Facility Project overview component. @@ -43,7 +43,9 @@ export class FacilityProjectsOverviewComponent extends AbstractBaseClass impleme public memberFilter: string = ''; filteredMembers: object[] = []; selectedMember: object[] = []; + facility_members: object[] = []; + filterChanged: Subject = new Subject(); isLoaded: boolean = false; projects: Application[] = []; projectsCopy: Application[] = []; @@ -181,11 +183,7 @@ export class FacilityProjectsOverviewComponent extends AbstractBaseClass impleme ); } } - openProjectCSVMailModal(): void { - console.log('show'); - this.bsModalRef = this.modalService.show(ProjectCsvTemplatedEmailModalComponent, { class: 'modal-lg' }); - } onSort({ column, direction }: SortEvent) { // resetting other headers this.headers.forEach(header => { @@ -198,6 +196,10 @@ export class FacilityProjectsOverviewComponent extends AbstractBaseClass impleme this.sortProjectService.sortDirection = direction; } + searchForUserInFacility(searchString: string): void { + this.facilityService.getFilteredMembersOfFacility(searchString); + } + filterMembers(bare_searchString: string): void { this.filteredMembers = []; const searchString: string = bare_searchString.toLowerCase(); @@ -514,6 +516,24 @@ export class FacilityProjectsOverviewComponent extends AbstractBaseClass impleme initialState = { selectedProjects: this.selectedEmailProjects }; } this.bsModalRef = this.modalService.show(ProjectEmailModalComponent, { initialState, class: 'modal-lg' }); + this.bsModalRef.content.event.subscribe((sent_successfully: boolean) => { + if (sent_successfully) { + const initialStateNotification = { + notificationModalTitle: 'Success', + notificationModalType: 'success', + notificationModalMessage: 'Mails were successfully sent', + }; + + this.modalService.show(NotificationModalComponent, { initialState: initialStateNotification }); + } else { + const initialStateNotification = { + notificationModalTitle: 'Failed', + notificationModalType: 'danger', + notificationModalMessage: 'Failed to send mails!', + }; + this.modalService.show(NotificationModalComponent, { initialState: initialStateNotification }); + } + }); } setFacilitySupportMails(supportMails: string): void { diff --git a/src/app/projectmanagement/modals/withdraw/withdraw-modal.component.ts b/src/app/projectmanagement/modals/withdraw/withdraw-modal.component.ts index bd8eef3a06..ff6ca1edcf 100644 --- a/src/app/projectmanagement/modals/withdraw/withdraw-modal.component.ts +++ b/src/app/projectmanagement/modals/withdraw/withdraw-modal.component.ts @@ -39,8 +39,6 @@ export class WithdrawModalComponent { this.event.emit(true); }); break; - default: - this.event.emit(false); } } diff --git a/src/app/projectmanagement/projectmanagement.module.ts b/src/app/projectmanagement/projectmanagement.module.ts index 96bd65b697..2b53063b0a 100644 --- a/src/app/projectmanagement/projectmanagement.module.ts +++ b/src/app/projectmanagement/projectmanagement.module.ts @@ -25,7 +25,6 @@ import { ResultComponent } from './modals/result/result.component'; import { SharedModuleModule } from '../shared/shared_modules/shared-module.module'; import { AdjustLifetimeRequestComponent } from './modals/adjust-lifetime/adjust-lifetime-request.component'; import { AdjustApplicationComponent } from './modals/adjust-application/adjust-application.component'; -import { WithdrawModalComponent } from './modals/withdraw/withdraw-modal.component'; /** * Projectmanagment module. @@ -60,7 +59,6 @@ import { WithdrawModalComponent } from './modals/withdraw/withdraw-modal.compone ExtensionEntryComponent, AdjustLifetimeRequestComponent, AdjustApplicationComponent, - WithdrawModalComponent, ], exports: [ProjectOsDetailsComponent, ExtensionEntryComponent], }) diff --git a/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.html b/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.html deleted file mode 100644 index 50e8fc8a12..0000000000 --- a/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.html +++ /dev/null @@ -1,219 +0,0 @@ -
-

Sent Mail to specific projects

- -
- -
- @if (!csvFile || csvMailTemplate?.errors?.length > 0) { -
-

- Valid Example: -

- 
{{ validCSVExample }}
-
-

- The following template keys would be provided by this CSV file: -

-
- {VM}
- {LOCATION} - -
-
- -
- } -
- - -
- @if (csvMailTemplate?.errors?.length > 0) { - -
-

Error! Unable to use the CSV file "{{ csvFile.name }}". The following errors - occurred:

- -
    -
  • {{ err }}
    • -
-
- } - @if (csvMailTemplate?.warnings?.length > 0) { - -
-

- Warning! The following issues were found in the CSV file, but sending emails is still - possible: -

- -
    -
  • {{ war }}
    • -
-
- } - - @if (csvMailTemplate?.valid_projects?.length > 0) { -
- -
    -
  • {{ pr.project_application_shortname }}
    • -
-
- } - - -
- @if (csvMailTemplate) { - -
-
-
- - -
-
-
-
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- } -
- @if (csvFile) { -
-

- The following keys were provided by the CSV file: {{ csvFile.name }} -

-
- {{ '{' + template + '}' }} -
-
- -
-

You can use the following keys as variables:

-
- {{ '{' + template + '}' }} -
-
- -
- Please consider: In case any dates are part of the sent E-Mails, they will be formatted in the german - TT.MM.YYYY-format. -
- } - - -
- - - @if (csvMailTemplate && csvFile) { - - } - -
- -
\ No newline at end of file diff --git a/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.ts b/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.ts deleted file mode 100644 index aa5c04b137..0000000000 --- a/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.ts +++ /dev/null @@ -1,94 +0,0 @@ -import { - Component, EventEmitter, OnDestroy, OnInit, -} from '@angular/core'; -import { BsModalRef } from 'ngx-bootstrap/modal'; -import { Application } from '../../../../applications/application.model/application.model'; -import { EmailService } from '../../../../api-connector/email.service'; -import { STATUS_LINK } from '../../../../../links/links'; -import { CsvMailTemplateModel } from '../../../classes/csvMailTemplate.model'; -import { NotificationModalComponent } from '../../notification-modal'; - -@Component({ - selector: 'app-project-csv-templated-email-modal', - templateUrl: './project-csv-templated-email-modal.component.html', - styleUrls: ['./project-csv-templated-email.scss'], - providers: [EmailService], -}) -export class ProjectCsvTemplatedEmailModalComponent implements OnInit, OnDestroy { - csvMailTemplate: CsvMailTemplateModel; - csvFile: File; - - emailAdminsOnly: boolean; - emailSubject: string; - emailReply: string; - emailText: string; - templates: string[]; - validCSVExample = `Project, VM, LOCATION -Proj1, VM_1, Bielefeld -Proj2, VM_2, Giessen`; - - public event: EventEmitter = new EventEmitter(); - - constructor( - public bsModalRef: BsModalRef, - private emailService: EmailService, - private notificationModal: NotificationModalComponent, - ) { - // eslint-disable-next-line no-empty-function - } - - ngOnInit() { - this.getMailTemplates(); - } - - onCsvFileSelected(event): void { - const inputElement = event.target as HTMLInputElement; - this.csvFile = inputElement.files[0]; - if (this.csvFile) { - this.emailService.sendCsvTemplate(this.csvFile).subscribe( - (csvTemplate: CsvMailTemplateModel) => { - this.csvMailTemplate = csvTemplate; - }, - (error: CsvMailTemplateModel) => { - this.csvMailTemplate = error; - console.log(error['error']); - }, - ); - } - } - - getMailTemplates(): void { - this.emailService.getMailTemplates().subscribe((res: string[]) => { - this.templates = res; - }); - } - - sentProjectsTemplatedMail(): void { - const project_ids = this.csvMailTemplate.valid_projects.map((pr: Application) => pr.project_application_perun_id); - this.notificationModal.showInfoNotificationModal('Info', 'Sending Mails...'); - - this.emailService - .sendCsvTemplatedMail( - this.csvFile, - project_ids, - this.emailSubject, - this.emailText, - this.emailAdminsOnly, - this.emailReply, - ) - .subscribe( - () => { - this.notificationModal.showSuccessFullNotificationModal('Success', 'Mails were successfully sent!'); - }, - () => { - this.notificationModal.showDangerNotificationModal('Failed', 'Failed to send mails!'); - }, - ); - } - - ngOnDestroy(): void { - this.bsModalRef.hide(); - } - - protected readonly STATUS_LINK = STATUS_LINK; -} diff --git a/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email.scss b/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email.scss deleted file mode 100644 index a86e9ffc41..0000000000 --- a/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email.scss +++ /dev/null @@ -1,25 +0,0 @@ -.templates-container { - border: 1px solid #ccc; - padding: 10px; - background-color: #f9f9f9; -} - -.templates-list { - margin: 10px 0; - font-family: monospace; -} - -.valid-example { - border: 1px solid #ccc; - padding: 10px; - background-color: #f9f9f9; - margin-top: 10px; -} - -.valid-example-heading { - margin-bottom: 5px; -} - -.valid-example-content { - font-family: monospace; -} \ No newline at end of file diff --git a/src/app/shared/modal/email/project-email-modal/project-email-modal.component.html b/src/app/shared/modal/email/project-email-modal/project-email-modal.component.html index ef8fc3e5db..5584431736 100644 --- a/src/app/shared/modal/email/project-email-modal/project-email-modal.component.html +++ b/src/app/shared/modal/email/project-email-modal/project-email-modal.component.html @@ -1,136 +1,179 @@
-

Sent Mail to specific projects

- +

Sent Mail to specific projects

+
-
- Send Mail to: -
    -
  • {{ pr.project_application_shortname }}
    • -
-
+
+ Send Mail to: +
    +
  • {{ pr.project_application_shortname }}
    • +
+
+
+
+

Error! Unable to use the CSV file "{{ csvFile.name }}". The following errors occurred:

+
    +
  • {{ err }}
    • +
+
+
+

+ Valid Example: +

+ 
{{ validCSVExample }}
+
+
-
-
-
-
- - -
-
-
-
+

+ Warning! The following issues were found in the CSV file, but sending emails is still possible: +

+ +
    +
  • {{ war }}
    • +
+
+ + +
+
+
+ + +
+
+
+
- -
- Email subject* +
+ -
-
+ /> +
+
-
- -
- + +
+ -
-
- -
- -
+ /> +
+
+ +
+ +
-
-
- - + > +
+ + +
+

+ The following keys were provided by the CSV file: {{ csvFile.name }} +

+
+ {{ '{' + template + '}' }} +
+
-
-

You can use the following keys as variables:

-
- {{ '{' + template + '}' }} -
-
- -
- Please consider: In case any dates are part of the sent E-Mails, they will be formatted in the german - TT.MM.YYYY-format. -
+
+

You can use the following keys as variables:

+
+ {{ '{' + template + '}' }} +
+
+
+ Please consider: In case any dates are part of the sent E-Mails, they will be formatted in the german + TT.MM.YYYY-format. +
- - - + + +
diff --git a/src/app/shared/modal/email/project-email-modal/project-email-modal.component.ts b/src/app/shared/modal/email/project-email-modal/project-email-modal.component.ts index aa9e6ce5d6..40c9dce8ef 100644 --- a/src/app/shared/modal/email/project-email-modal/project-email-modal.component.ts +++ b/src/app/shared/modal/email/project-email-modal/project-email-modal.component.ts @@ -3,9 +3,11 @@ import { } from '@angular/core'; import { BsModalRef } from 'ngx-bootstrap/modal'; import { Application } from '../../../../applications/application.model/application.model'; +import { VoService } from '../../../../api-connector/vo.service'; +import { IResponseTemplate } from '../../../../api-connector/response-template'; import { EmailService } from '../../../../api-connector/email.service'; import { STATUS_LINK } from '../../../../../links/links'; -import { NotificationModalComponent } from '../../notification-modal'; +import { CsvMailTemplateModel } from '../../../classes/csvMailTemplate.model'; @Component({ selector: 'app-project-email-modal', @@ -15,19 +17,24 @@ import { NotificationModalComponent } from '../../notification-modal'; }) export class ProjectEmailModalComponent implements OnInit, OnDestroy { @Input() selectedProjects: Application[]; + @Input() csvMailTemplate: CsvMailTemplateModel; + @Input() csvFile: File; emailAdminsOnly: boolean; emailSubject: string; emailReply: string; emailText: string; templates: string[]; + validCSVExample = `Project, Key1, Key2 +Proj1, ValK1, ValK2 +Proj2, ValK1, ValK2`; public event: EventEmitter = new EventEmitter(); constructor( public bsModalRef: BsModalRef, + private voService: VoService, private emailService: EmailService, - private notificationModal: NotificationModalComponent, ) { // eslint-disable-next-line no-empty-function } @@ -42,18 +49,39 @@ export class ProjectEmailModalComponent implements OnInit, OnDestroy { }); } + sentProjectsTemplatedMail(): void { + const project_ids = this.selectedProjects.map((pr: Application) => pr.project_application_perun_id); + + this.emailService + .sendCsvTemplatedMail( + this.csvFile, + project_ids, + this.emailSubject, + this.emailText, + this.emailAdminsOnly, + this.emailReply, + ) + .subscribe( + (res: IResponseTemplate) => { + this.event.emit(res.value as boolean); + }, + () => { + this.event.emit(false); + }, + ); + } + sentProjectsMail(): void { const project_ids = this.selectedProjects.map((pr: Application) => pr.project_application_perun_id); - this.notificationModal.showInfoNotificationModal('Info', 'Sending Mails...'); this.emailService .sendMailToProjects(project_ids, this.emailSubject, this.emailText, this.emailAdminsOnly, this.emailReply) .subscribe( - () => { - this.notificationModal.showSuccessFullNotificationModal('Success', 'Mails were successfully sent'); + (res: IResponseTemplate) => { + this.event.emit(res.value as boolean); }, () => { - this.notificationModal.showSuccessFullNotificationModal('Failed', 'Failed to send mails!'); + this.event.emit(false); }, ); } diff --git a/src/app/shared/modal/notification-modal.component.html b/src/app/shared/modal/notification-modal.component.html index da03ceaa33..d1ed6e7157 100644 --- a/src/app/shared/modal/notification-modal.component.html +++ b/src/app/shared/modal/notification-modal.component.html @@ -1,21 +1,25 @@

{{ notificationModalTitle }}

- +
-
- - Close -
diff --git a/src/app/shared/modal/notification-modal.ts b/src/app/shared/modal/notification-modal.ts index a9932f23fe..36e1f79258 100644 --- a/src/app/shared/modal/notification-modal.ts +++ b/src/app/shared/modal/notification-modal.ts @@ -1,82 +1,18 @@ -import { Component, Injectable, OnDestroy } from '@angular/core'; -import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal'; -import { Router } from '@angular/router'; +import { Component } from '@angular/core'; +import { BsModalRef } from 'ngx-bootstrap/modal'; -@Injectable({ providedIn: 'root' }) @Component({ - selector: 'app-notification-modal', - templateUrl: './notification-modal.component.html', + selector: 'app-notification-modal', + templateUrl: './notification-modal.component.html', }) -export class NotificationModalComponent implements OnDestroy { +export class NotificationModalComponent { + notificationModalTitle: string; notificationModalType: string; notificationModalMessage: string; - routerRedirectString: string; - modalId: number | string | undefined; - - hide(): void { - this.modalService.hide(this.modalId); - } - constructor( - private router: Router, - private modalService: BsModalService, - ) { + constructor(public bsModalRef: BsModalRef) { // eslint-disable-next-line no-empty-function } - showNotificationModal( - notificationModalTitle: string, - notificationModalMessage: string, - notificationModalType: string, - routerRedirectString?: string, - ): void { - const initialState = { - notificationModalTitle, - notificationModalType, - notificationModalMessage, - routerRedirectString, - }; - const bsModalRef: BsModalRef = this.modalService.show(NotificationModalComponent, { initialState }); - bsModalRef.setClass('modal-lg'); - this.modalId = bsModalRef.id; - } - - showSuccessFullNotificationModal( - notificationModalTitle: string, - notificationModalMessage: string, - routerRedirectString?: string, - ): void { - this.showNotificationModal(notificationModalTitle, notificationModalMessage, 'success', routerRedirectString); - } - - showDangerNotificationModal( - notificationModalTitle: string, - notificationModalMessage: string, - routerRedirectString?: string, - ): void { - this.showNotificationModal(notificationModalTitle, notificationModalMessage, 'danger', routerRedirectString); - } - - showWarningNotificationModal( - notificationModalTitle: string, - notificationModalMessage: string, - routerRedirectString?: string, - ): void { - this.showNotificationModal(notificationModalTitle, notificationModalMessage, 'warning', routerRedirectString); - } - - showInfoNotificationModal( - notificationModalTitle: string, - notificationModalMessage: string, - routerRedirectString?: string, - ): void { - this.showNotificationModal(notificationModalTitle, notificationModalMessage, 'info', routerRedirectString); - } - - ngOnDestroy(): void { - if (this.routerRedirectString) { - void this.router.navigateByUrl(this.routerRedirectString); - } - } } diff --git a/src/app/shared/shared_modules/shared-module.module.ts b/src/app/shared/shared_modules/shared-module.module.ts index 225d62803e..eab670b22f 100644 --- a/src/app/shared/shared_modules/shared-module.module.ts +++ b/src/app/shared/shared_modules/shared-module.module.ts @@ -4,7 +4,6 @@ import { ModalModule } from 'ngx-bootstrap/modal'; import { ProgressModule, ToastModule } from '@coreui/angular'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { NgSelectModule } from '@ng-select/ng-select'; -import { RouterLink } from '@angular/router'; import { ApplicationBaseClassComponent } from './baseClass/application-base-class.component'; import { NotificationModalComponent } from '../modal/notification-modal'; import { InformationToastComponent } from '../toaster/information-toast.component'; @@ -17,9 +16,6 @@ import { SharedDirectivesModule } from './shared_directives.module'; import { MaintenanceNotificationComponent } from './components/maintenance-notification/maintenance-notification.component'; import { PipeModuleModule } from '../../pipe-module/pipe-module.module'; import { MembersListModalComponent } from '../modal/members/members-list-modal.component'; -import { - ProjectCsvTemplatedEmailModalComponent, -} from '../modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component'; /** * Shared module. @@ -34,7 +30,6 @@ import { MigrationInformationComponent, ApplicationBadgesComponent, ProjectEmailModalComponent, - ProjectCsvTemplatedEmailModalComponent, TestimonialFormComponent, MaintenanceNotificationComponent, ], @@ -48,7 +43,6 @@ import { NgSelectModule, SharedDirectivesModule, ReactiveFormsModule, - RouterLink, ], declarations: [ ApplicationBaseClassComponent, @@ -59,7 +53,6 @@ import { MigrationInformationComponent, ApplicationBadgesComponent, ProjectEmailModalComponent, - ProjectCsvTemplatedEmailModalComponent, TestimonialFormComponent, MaintenanceNotificationComponent, ], diff --git a/src/app/vo_manager/VoOverviewComponent.ts b/src/app/vo_manager/VoOverviewComponent.ts index b5dcdf9f2c..9a207966b7 100644 --- a/src/app/vo_manager/VoOverviewComponent.ts +++ b/src/app/vo_manager/VoOverviewComponent.ts @@ -20,13 +20,12 @@ import { SortEvent, } from '../shared/shared_modules/directives/nbd-sortable-header.directive'; import { ProjectSortService } from '../shared/shared_modules/services/project-sort.service'; +import { ProjectEmailModalComponent } from '../shared/modal/email/project-email-modal/project-email-modal.component'; import { ConfirmationModalComponent } from '../shared/modal/confirmation-modal.component'; import { ConfirmationActions } from '../shared/modal/confirmation_actions'; import { MembersListModalComponent } from '../shared/modal/members/members-list-modal.component'; import { EmailService } from '../api-connector/email.service'; -import { - ProjectCsvTemplatedEmailModalComponent, -} from '../shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component'; +import { CsvMailTemplateModel } from '../shared/classes/csvMailTemplate.model'; /** * Vo Overview component. @@ -123,6 +122,21 @@ export class VoOverviewComponent extends AbstractBaseClass implements OnInit, On this.subscription.unsubscribe(); } + onCsvFileSelected(event): void { + const inputElement = event.target as HTMLInputElement; + if (inputElement.files && inputElement.files.length > 0) { + this.emailService.sendCsvTemplate(inputElement.files[0]).subscribe( + (csvTemplate: CsvMailTemplateModel) => { + this.openProjectMailsModal(inputElement.files[0], csvTemplate); + }, + (error: CsvMailTemplateModel) => { + console.log(error['error']); + this.openProjectMailsModal(inputElement.files[0], error['error']); + }, + ); + } + } + getTSVInformation(timeout: number = this.checkTSVTimeout): void { this.stopCheckTSVTimer(); this.subscription.add( @@ -238,10 +252,28 @@ export class VoOverviewComponent extends AbstractBaseClass implements OnInit, On } } - openProjectCSVMailModal(): void { + openProjectMailsModal(csvFile: File = null, csvTemplate: CsvMailTemplateModel = null): void { + let initialState = {}; - this.bsModalRef = this.modalService.show(ProjectCsvTemplatedEmailModalComponent, { class: 'modal-lg' }); + if (csvFile) { + initialState = { + selectedProjects: csvTemplate.valid_projects, + csvFile, + csvMailTemplate: csvTemplate, + }; + } else { + initialState = { selectedProjects: this.selectedEmailProjects }; + } + this.bsModalRef = this.modalService.show(ProjectEmailModalComponent, { initialState, class: 'modal-lg' }); + this.bsModalRef.content.event.subscribe((sent_successfully: boolean) => { + if (sent_successfully) { + this.updateNotificationModal('Success', 'Mails were successfully sent', true, 'success'); + } else { + this.updateNotificationModal('Failed', 'Failed to send mails!', true, 'danger'); + } + this.notificationModal.show(); + }); } disableProject(project: Application): void { diff --git a/src/app/vo_manager/vo-guard.service.ts b/src/app/vo_manager/vo-guard.service.ts index 9a5c65f31b..51dac09551 100644 --- a/src/app/vo_manager/vo-guard.service.ts +++ b/src/app/vo_manager/vo-guard.service.ts @@ -1,6 +1,4 @@ /* eslint-disable */ -/* tslint:disable */ - import { Injectable } from '@angular/core' import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router' import { Observable } from 'rxjs' @@ -11,7 +9,9 @@ import { is_vo } from '../shared/globalvar' */ @Injectable() export class VoGuardService { - constructor(private router: Router) {} + constructor(private router: Router) { + this.router = router + } // eslint-disable-next-line @typescript-eslint/no-unused-vars canActivate( diff --git a/src/app/vo_manager/voOverview.component.html b/src/app/vo_manager/voOverview.component.html index d9c4f15667..439ddfcc7d 100644 --- a/src/app/vo_manager/voOverview.component.html +++ b/src/app/vo_manager/voOverview.component.html @@ -22,7 +22,7 @@ -
- -
diff --git a/src/app/facility_manager/facilityprojectsoverview.component.ts b/src/app/facility_manager/facilityprojectsoverview.component.ts index 4bbf018218..b722a8d618 100644 --- a/src/app/facility_manager/facilityprojectsoverview.component.ts +++ b/src/app/facility_manager/facilityprojectsoverview.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit, QueryList, ViewChildren, inject, } from '@angular/core'; -import { Observable, Subject, take } from 'rxjs'; +import { Observable, take } from 'rxjs'; import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal'; import { MatomoTracker } from 'ngx-matomo-client'; import { ProjectMember } from '../projectmanagement/project_member.model'; @@ -19,10 +19,10 @@ import { import { ProjectSortService } from '../shared/shared_modules/services/project-sort.service'; import { AbstractBaseClass } from '../shared/shared_modules/baseClass/abstract-base-class'; import { ProjectEmailModalComponent } from '../shared/modal/email/project-email-modal/project-email-modal.component'; -import { NotificationModalComponent } from '../shared/modal/notification-modal'; import { MembersListModalComponent } from '../shared/modal/members/members-list-modal.component'; import { EmailService } from '../api-connector/email.service'; import { CsvMailTemplateModel } from '../shared/classes/csvMailTemplate.model'; +import { ProjectCsvTemplatedEmailModalComponent } from '../shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component'; /** * Facility Project overview component. @@ -43,9 +43,7 @@ export class FacilityProjectsOverviewComponent extends AbstractBaseClass impleme public memberFilter: string = ''; filteredMembers: object[] = []; selectedMember: object[] = []; - facility_members: object[] = []; - filterChanged: Subject = new Subject(); isLoaded: boolean = false; projects: Application[] = []; projectsCopy: Application[] = []; @@ -183,7 +181,11 @@ export class FacilityProjectsOverviewComponent extends AbstractBaseClass impleme ); } } + openProjectCSVMailModal(): void { + console.log('show'); + this.bsModalRef = this.modalService.show(ProjectCsvTemplatedEmailModalComponent, { class: 'modal-lg' }); + } onSort({ column, direction }: SortEvent) { // resetting other headers this.headers.forEach(header => { @@ -196,10 +198,6 @@ export class FacilityProjectsOverviewComponent extends AbstractBaseClass impleme this.sortProjectService.sortDirection = direction; } - searchForUserInFacility(searchString: string): void { - this.facilityService.getFilteredMembersOfFacility(searchString); - } - filterMembers(bare_searchString: string): void { this.filteredMembers = []; const searchString: string = bare_searchString.toLowerCase(); @@ -516,24 +514,6 @@ export class FacilityProjectsOverviewComponent extends AbstractBaseClass impleme initialState = { selectedProjects: this.selectedEmailProjects }; } this.bsModalRef = this.modalService.show(ProjectEmailModalComponent, { initialState, class: 'modal-lg' }); - this.bsModalRef.content.event.subscribe((sent_successfully: boolean) => { - if (sent_successfully) { - const initialStateNotification = { - notificationModalTitle: 'Success', - notificationModalType: 'success', - notificationModalMessage: 'Mails were successfully sent', - }; - - this.modalService.show(NotificationModalComponent, { initialState: initialStateNotification }); - } else { - const initialStateNotification = { - notificationModalTitle: 'Failed', - notificationModalType: 'danger', - notificationModalMessage: 'Failed to send mails!', - }; - this.modalService.show(NotificationModalComponent, { initialState: initialStateNotification }); - } - }); } setFacilitySupportMails(supportMails: string): void { diff --git a/src/app/projectmanagement/modals/withdraw/withdraw-modal.component.ts b/src/app/projectmanagement/modals/withdraw/withdraw-modal.component.ts index ff6ca1edcf..bd8eef3a06 100644 --- a/src/app/projectmanagement/modals/withdraw/withdraw-modal.component.ts +++ b/src/app/projectmanagement/modals/withdraw/withdraw-modal.component.ts @@ -39,6 +39,8 @@ export class WithdrawModalComponent { this.event.emit(true); }); break; + default: + this.event.emit(false); } } diff --git a/src/app/projectmanagement/projectmanagement.module.ts b/src/app/projectmanagement/projectmanagement.module.ts index 2b53063b0a..96bd65b697 100644 --- a/src/app/projectmanagement/projectmanagement.module.ts +++ b/src/app/projectmanagement/projectmanagement.module.ts @@ -25,6 +25,7 @@ import { ResultComponent } from './modals/result/result.component'; import { SharedModuleModule } from '../shared/shared_modules/shared-module.module'; import { AdjustLifetimeRequestComponent } from './modals/adjust-lifetime/adjust-lifetime-request.component'; import { AdjustApplicationComponent } from './modals/adjust-application/adjust-application.component'; +import { WithdrawModalComponent } from './modals/withdraw/withdraw-modal.component'; /** * Projectmanagment module. @@ -59,6 +60,7 @@ import { AdjustApplicationComponent } from './modals/adjust-application/adjust-a ExtensionEntryComponent, AdjustLifetimeRequestComponent, AdjustApplicationComponent, + WithdrawModalComponent, ], exports: [ProjectOsDetailsComponent, ExtensionEntryComponent], }) diff --git a/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.html b/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.html new file mode 100644 index 0000000000..adb3016ba2 --- /dev/null +++ b/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.html @@ -0,0 +1,194 @@ +
+

Sent Mail to specific projects

+ +
+ +
+ @if (!csvFile || csvMailTemplate?.errors?.length > 0) { +
+

+ Valid Example: +

+ 
{{ validCSVExample }}
+
+

The following template keys would be provided by this CSV file:

+
+ {VM}
+ {LOCATION} +
+
+
+ } +
+ +
+ @if (csvMailTemplate?.errors?.length > 0) { +
+

Error! Unable to use the CSV file "{{ csvFile.name }}". The following errors occurred:

+ +
    +
  • {{ err }}
    • +
+
+ } + @if (csvMailTemplate?.warnings?.length > 0) { +
+

+ Warning! The following issues were found in the CSV file, but sending emails is still possible: +

+ +
    +
  • {{ war }}
    • +
+
+ } + + @if (csvMailTemplate?.valid_projects?.length > 0) { +
+ +
    +
  • {{ pr.project_application_shortname }}
    • +
+
+ } + +
+ @if (csvMailTemplate) { +
+
+
+ + +
+
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ } +
+ @if (csvFile) { +
+

+ The following keys were provided by the CSV file: {{ csvFile.name }} +

+
+ {{ '{' + template + '}' }} +
+
+ +
+

You can use the following keys as variables:

+
+ {{ '{' + template + '}' }} +
+
+ +
+ Please consider: In case any dates are part of the sent E-Mails, they will be formatted in the german + TT.MM.YYYY-format. +
+ } + +
+ + + @if (csvMailTemplate && csvFile) { + + } + +
+
diff --git a/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.ts b/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.ts new file mode 100644 index 0000000000..aa5c04b137 --- /dev/null +++ b/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component.ts @@ -0,0 +1,94 @@ +import { + Component, EventEmitter, OnDestroy, OnInit, +} from '@angular/core'; +import { BsModalRef } from 'ngx-bootstrap/modal'; +import { Application } from '../../../../applications/application.model/application.model'; +import { EmailService } from '../../../../api-connector/email.service'; +import { STATUS_LINK } from '../../../../../links/links'; +import { CsvMailTemplateModel } from '../../../classes/csvMailTemplate.model'; +import { NotificationModalComponent } from '../../notification-modal'; + +@Component({ + selector: 'app-project-csv-templated-email-modal', + templateUrl: './project-csv-templated-email-modal.component.html', + styleUrls: ['./project-csv-templated-email.scss'], + providers: [EmailService], +}) +export class ProjectCsvTemplatedEmailModalComponent implements OnInit, OnDestroy { + csvMailTemplate: CsvMailTemplateModel; + csvFile: File; + + emailAdminsOnly: boolean; + emailSubject: string; + emailReply: string; + emailText: string; + templates: string[]; + validCSVExample = `Project, VM, LOCATION +Proj1, VM_1, Bielefeld +Proj2, VM_2, Giessen`; + + public event: EventEmitter = new EventEmitter(); + + constructor( + public bsModalRef: BsModalRef, + private emailService: EmailService, + private notificationModal: NotificationModalComponent, + ) { + // eslint-disable-next-line no-empty-function + } + + ngOnInit() { + this.getMailTemplates(); + } + + onCsvFileSelected(event): void { + const inputElement = event.target as HTMLInputElement; + this.csvFile = inputElement.files[0]; + if (this.csvFile) { + this.emailService.sendCsvTemplate(this.csvFile).subscribe( + (csvTemplate: CsvMailTemplateModel) => { + this.csvMailTemplate = csvTemplate; + }, + (error: CsvMailTemplateModel) => { + this.csvMailTemplate = error; + console.log(error['error']); + }, + ); + } + } + + getMailTemplates(): void { + this.emailService.getMailTemplates().subscribe((res: string[]) => { + this.templates = res; + }); + } + + sentProjectsTemplatedMail(): void { + const project_ids = this.csvMailTemplate.valid_projects.map((pr: Application) => pr.project_application_perun_id); + this.notificationModal.showInfoNotificationModal('Info', 'Sending Mails...'); + + this.emailService + .sendCsvTemplatedMail( + this.csvFile, + project_ids, + this.emailSubject, + this.emailText, + this.emailAdminsOnly, + this.emailReply, + ) + .subscribe( + () => { + this.notificationModal.showSuccessFullNotificationModal('Success', 'Mails were successfully sent!'); + }, + () => { + this.notificationModal.showDangerNotificationModal('Failed', 'Failed to send mails!'); + }, + ); + } + + ngOnDestroy(): void { + this.bsModalRef.hide(); + } + + protected readonly STATUS_LINK = STATUS_LINK; +} diff --git a/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email.scss b/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email.scss new file mode 100644 index 0000000000..a86e9ffc41 --- /dev/null +++ b/src/app/shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email.scss @@ -0,0 +1,25 @@ +.templates-container { + border: 1px solid #ccc; + padding: 10px; + background-color: #f9f9f9; +} + +.templates-list { + margin: 10px 0; + font-family: monospace; +} + +.valid-example { + border: 1px solid #ccc; + padding: 10px; + background-color: #f9f9f9; + margin-top: 10px; +} + +.valid-example-heading { + margin-bottom: 5px; +} + +.valid-example-content { + font-family: monospace; +} \ No newline at end of file diff --git a/src/app/shared/modal/email/project-email-modal/project-email-modal.component.html b/src/app/shared/modal/email/project-email-modal/project-email-modal.component.html index 5584431736..1b9623c3e8 100644 --- a/src/app/shared/modal/email/project-email-modal/project-email-modal.component.html +++ b/src/app/shared/modal/email/project-email-modal/project-email-modal.component.html @@ -16,31 +16,6 @@

Sent Mail to spe
  • {{ pr.project_application_shortname }}
    • -
    -
    -

    Error! Unable to use the CSV file "{{ csvFile.name }}". The following errors occurred:

    - -
      -
    • {{ err }}
      • -
    -
    -
    -

    - Valid Example: -

    - 
    {{ validCSVExample }}
    -
    -
    - -
    -

    - Warning! The following issues were found in the CSV file, but sending emails is still possible: -

    - -
      -
    • {{ war }}
      • -
    -
    @@ -52,7 +27,6 @@

    Sent Mail to spe name="emailAdminsOnly" [(ngModel)]="emailAdminsOnly" id="adminOnlyCheckbox" - [disabled]="csvMailTemplate?.errors?.length > 0" />

    @@ -75,7 +49,6 @@

    Sent Mail to spe class="form-control" type="text" [(ngModel)]="emailSubject" - [disabled]="csvMailTemplate?.errors?.length > 0" minlength="1" #emailSub="ngModel" [ngClass]="{ @@ -96,7 +69,6 @@

    Sent Mail to spe class="form-control" type="text" [(ngModel)]="emailReply" - [disabled]="csvMailTemplate?.errors.length > 0" #emailRep="ngModel" pattern="([ ]*)(?!(^[.-].*|[^@]*[.-]@|.*\.{2,}.*)|^.{254}.)([a-zA-Z0-9!#$%&'*+\/=?^_`{|}~.-]+@)(?!-.*|.*-\.)([a-zA-Z0-9-]{1,63}\.)+[a-zA-Z]{2,15}([ ]*)" [ngClass]="{ @@ -117,7 +89,6 @@

    Sent Mail to spe id="emailText" name="emailText" [(ngModel)]="emailText" - [disabled]="csvMailTemplate?.errors?.length > 0" type="text" #emailT="ngModel" [ngClass]="{ @@ -128,14 +99,6 @@

    Sent Mail to spe -
    -

    - The following keys were provided by the CSV file: {{ csvFile.name }} -

    -
    - {{ '{' + template + '}' }} -
    -

    You can use the following keys as variables:

    @@ -159,21 +122,11 @@

    Sent Mail to spe Abort & Close -

    diff --git a/src/app/shared/modal/email/project-email-modal/project-email-modal.component.ts b/src/app/shared/modal/email/project-email-modal/project-email-modal.component.ts index 40c9dce8ef..aa9e6ce5d6 100644 --- a/src/app/shared/modal/email/project-email-modal/project-email-modal.component.ts +++ b/src/app/shared/modal/email/project-email-modal/project-email-modal.component.ts @@ -3,11 +3,9 @@ import { } from '@angular/core'; import { BsModalRef } from 'ngx-bootstrap/modal'; import { Application } from '../../../../applications/application.model/application.model'; -import { VoService } from '../../../../api-connector/vo.service'; -import { IResponseTemplate } from '../../../../api-connector/response-template'; import { EmailService } from '../../../../api-connector/email.service'; import { STATUS_LINK } from '../../../../../links/links'; -import { CsvMailTemplateModel } from '../../../classes/csvMailTemplate.model'; +import { NotificationModalComponent } from '../../notification-modal'; @Component({ selector: 'app-project-email-modal', @@ -17,24 +15,19 @@ import { CsvMailTemplateModel } from '../../../classes/csvMailTemplate.model'; }) export class ProjectEmailModalComponent implements OnInit, OnDestroy { @Input() selectedProjects: Application[]; - @Input() csvMailTemplate: CsvMailTemplateModel; - @Input() csvFile: File; emailAdminsOnly: boolean; emailSubject: string; emailReply: string; emailText: string; templates: string[]; - validCSVExample = `Project, Key1, Key2 -Proj1, ValK1, ValK2 -Proj2, ValK1, ValK2`; public event: EventEmitter = new EventEmitter(); constructor( public bsModalRef: BsModalRef, - private voService: VoService, private emailService: EmailService, + private notificationModal: NotificationModalComponent, ) { // eslint-disable-next-line no-empty-function } @@ -49,39 +42,18 @@ Proj2, ValK1, ValK2`; }); } - sentProjectsTemplatedMail(): void { - const project_ids = this.selectedProjects.map((pr: Application) => pr.project_application_perun_id); - - this.emailService - .sendCsvTemplatedMail( - this.csvFile, - project_ids, - this.emailSubject, - this.emailText, - this.emailAdminsOnly, - this.emailReply, - ) - .subscribe( - (res: IResponseTemplate) => { - this.event.emit(res.value as boolean); - }, - () => { - this.event.emit(false); - }, - ); - } - sentProjectsMail(): void { const project_ids = this.selectedProjects.map((pr: Application) => pr.project_application_perun_id); + this.notificationModal.showInfoNotificationModal('Info', 'Sending Mails...'); this.emailService .sendMailToProjects(project_ids, this.emailSubject, this.emailText, this.emailAdminsOnly, this.emailReply) .subscribe( - (res: IResponseTemplate) => { - this.event.emit(res.value as boolean); + () => { + this.notificationModal.showSuccessFullNotificationModal('Success', 'Mails were successfully sent'); }, () => { - this.event.emit(false); + this.notificationModal.showSuccessFullNotificationModal('Failed', 'Failed to send mails!'); }, ); } diff --git a/src/app/shared/modal/notification-modal.component.html b/src/app/shared/modal/notification-modal.component.html index d1ed6e7157..bc5949a3dc 100644 --- a/src/app/shared/modal/notification-modal.component.html +++ b/src/app/shared/modal/notification-modal.component.html @@ -1,25 +1,29 @@

    {{ notificationModalTitle }}

    - +
    + Close +
    diff --git a/src/app/shared/modal/notification-modal.ts b/src/app/shared/modal/notification-modal.ts index 36e1f79258..a9932f23fe 100644 --- a/src/app/shared/modal/notification-modal.ts +++ b/src/app/shared/modal/notification-modal.ts @@ -1,18 +1,82 @@ -import { Component } from '@angular/core'; -import { BsModalRef } from 'ngx-bootstrap/modal'; +import { Component, Injectable, OnDestroy } from '@angular/core'; +import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal'; +import { Router } from '@angular/router'; +@Injectable({ providedIn: 'root' }) @Component({ - selector: 'app-notification-modal', - templateUrl: './notification-modal.component.html', + selector: 'app-notification-modal', + templateUrl: './notification-modal.component.html', }) -export class NotificationModalComponent { - +export class NotificationModalComponent implements OnDestroy { notificationModalTitle: string; notificationModalType: string; notificationModalMessage: string; + routerRedirectString: string; + modalId: number | string | undefined; + + hide(): void { + this.modalService.hide(this.modalId); + } - constructor(public bsModalRef: BsModalRef) { + constructor( + private router: Router, + private modalService: BsModalService, + ) { // eslint-disable-next-line no-empty-function } + showNotificationModal( + notificationModalTitle: string, + notificationModalMessage: string, + notificationModalType: string, + routerRedirectString?: string, + ): void { + const initialState = { + notificationModalTitle, + notificationModalType, + notificationModalMessage, + routerRedirectString, + }; + const bsModalRef: BsModalRef = this.modalService.show(NotificationModalComponent, { initialState }); + bsModalRef.setClass('modal-lg'); + this.modalId = bsModalRef.id; + } + + showSuccessFullNotificationModal( + notificationModalTitle: string, + notificationModalMessage: string, + routerRedirectString?: string, + ): void { + this.showNotificationModal(notificationModalTitle, notificationModalMessage, 'success', routerRedirectString); + } + + showDangerNotificationModal( + notificationModalTitle: string, + notificationModalMessage: string, + routerRedirectString?: string, + ): void { + this.showNotificationModal(notificationModalTitle, notificationModalMessage, 'danger', routerRedirectString); + } + + showWarningNotificationModal( + notificationModalTitle: string, + notificationModalMessage: string, + routerRedirectString?: string, + ): void { + this.showNotificationModal(notificationModalTitle, notificationModalMessage, 'warning', routerRedirectString); + } + + showInfoNotificationModal( + notificationModalTitle: string, + notificationModalMessage: string, + routerRedirectString?: string, + ): void { + this.showNotificationModal(notificationModalTitle, notificationModalMessage, 'info', routerRedirectString); + } + + ngOnDestroy(): void { + if (this.routerRedirectString) { + void this.router.navigateByUrl(this.routerRedirectString); + } + } } diff --git a/src/app/shared/shared_modules/shared-module.module.ts b/src/app/shared/shared_modules/shared-module.module.ts index eab670b22f..f55f91f92f 100644 --- a/src/app/shared/shared_modules/shared-module.module.ts +++ b/src/app/shared/shared_modules/shared-module.module.ts @@ -4,6 +4,7 @@ import { ModalModule } from 'ngx-bootstrap/modal'; import { ProgressModule, ToastModule } from '@coreui/angular'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { NgSelectModule } from '@ng-select/ng-select'; +import { RouterLink } from '@angular/router'; import { ApplicationBaseClassComponent } from './baseClass/application-base-class.component'; import { NotificationModalComponent } from '../modal/notification-modal'; import { InformationToastComponent } from '../toaster/information-toast.component'; @@ -16,6 +17,7 @@ import { SharedDirectivesModule } from './shared_directives.module'; import { MaintenanceNotificationComponent } from './components/maintenance-notification/maintenance-notification.component'; import { PipeModuleModule } from '../../pipe-module/pipe-module.module'; import { MembersListModalComponent } from '../modal/members/members-list-modal.component'; +import { ProjectCsvTemplatedEmailModalComponent } from '../modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component'; /** * Shared module. @@ -30,6 +32,7 @@ import { MembersListModalComponent } from '../modal/members/members-list-modal.c MigrationInformationComponent, ApplicationBadgesComponent, ProjectEmailModalComponent, + ProjectCsvTemplatedEmailModalComponent, TestimonialFormComponent, MaintenanceNotificationComponent, ], @@ -43,6 +46,7 @@ import { MembersListModalComponent } from '../modal/members/members-list-modal.c NgSelectModule, SharedDirectivesModule, ReactiveFormsModule, + RouterLink, ], declarations: [ ApplicationBaseClassComponent, @@ -53,6 +57,7 @@ import { MembersListModalComponent } from '../modal/members/members-list-modal.c MigrationInformationComponent, ApplicationBadgesComponent, ProjectEmailModalComponent, + ProjectCsvTemplatedEmailModalComponent, TestimonialFormComponent, MaintenanceNotificationComponent, ], diff --git a/src/app/vo_manager/VoOverviewComponent.ts b/src/app/vo_manager/VoOverviewComponent.ts index 9a207966b7..af1c573d5e 100644 --- a/src/app/vo_manager/VoOverviewComponent.ts +++ b/src/app/vo_manager/VoOverviewComponent.ts @@ -20,12 +20,11 @@ import { SortEvent, } from '../shared/shared_modules/directives/nbd-sortable-header.directive'; import { ProjectSortService } from '../shared/shared_modules/services/project-sort.service'; -import { ProjectEmailModalComponent } from '../shared/modal/email/project-email-modal/project-email-modal.component'; import { ConfirmationModalComponent } from '../shared/modal/confirmation-modal.component'; import { ConfirmationActions } from '../shared/modal/confirmation_actions'; import { MembersListModalComponent } from '../shared/modal/members/members-list-modal.component'; import { EmailService } from '../api-connector/email.service'; -import { CsvMailTemplateModel } from '../shared/classes/csvMailTemplate.model'; +import { ProjectCsvTemplatedEmailModalComponent } from '../shared/modal/email/project-csv-templated-email-modal/project-csv-templated-email-modal.component'; /** * Vo Overview component. @@ -122,21 +121,6 @@ export class VoOverviewComponent extends AbstractBaseClass implements OnInit, On this.subscription.unsubscribe(); } - onCsvFileSelected(event): void { - const inputElement = event.target as HTMLInputElement; - if (inputElement.files && inputElement.files.length > 0) { - this.emailService.sendCsvTemplate(inputElement.files[0]).subscribe( - (csvTemplate: CsvMailTemplateModel) => { - this.openProjectMailsModal(inputElement.files[0], csvTemplate); - }, - (error: CsvMailTemplateModel) => { - console.log(error['error']); - this.openProjectMailsModal(inputElement.files[0], error['error']); - }, - ); - } - } - getTSVInformation(timeout: number = this.checkTSVTimeout): void { this.stopCheckTSVTimer(); this.subscription.add( @@ -252,28 +236,8 @@ export class VoOverviewComponent extends AbstractBaseClass implements OnInit, On } } - openProjectMailsModal(csvFile: File = null, csvTemplate: CsvMailTemplateModel = null): void { - let initialState = {}; - - if (csvFile) { - initialState = { - selectedProjects: csvTemplate.valid_projects, - csvFile, - csvMailTemplate: csvTemplate, - }; - } else { - initialState = { selectedProjects: this.selectedEmailProjects }; - } - - this.bsModalRef = this.modalService.show(ProjectEmailModalComponent, { initialState, class: 'modal-lg' }); - this.bsModalRef.content.event.subscribe((sent_successfully: boolean) => { - if (sent_successfully) { - this.updateNotificationModal('Success', 'Mails were successfully sent', true, 'success'); - } else { - this.updateNotificationModal('Failed', 'Failed to send mails!', true, 'danger'); - } - this.notificationModal.show(); - }); + openProjectCSVMailModal(): void { + this.bsModalRef = this.modalService.show(ProjectCsvTemplatedEmailModalComponent, { class: 'modal-lg' }); } disableProject(project: Application): void { diff --git a/src/app/vo_manager/vo-guard.service.ts b/src/app/vo_manager/vo-guard.service.ts index 32eef8f904..cad5b4abc9 100644 --- a/src/app/vo_manager/vo-guard.service.ts +++ b/src/app/vo_manager/vo-guard.service.ts @@ -11,9 +11,7 @@ import { is_vo } from '../shared/globalvar' */ @Injectable() export class VoGuardService { - constructor(private router: Router) { - this.router = router - } + constructor(private router: Router) {} // eslint-disable-next-line @typescript-eslint/no-unused-vars canActivate( diff --git a/src/app/vo_manager/voOverview.component.html b/src/app/vo_manager/voOverview.component.html index 439ddfcc7d..d9c4f15667 100644 --- a/src/app/vo_manager/voOverview.component.html +++ b/src/app/vo_manager/voOverview.component.html @@ -22,7 +22,7 @@ - -