fix(Application):using shortname instead of perun_name

deNBI · May 3, 2023 · f3d810e · f3d810e
1 parent 610a362
commit f3d810e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/src/app/applications/application.model/application.model.ts b/src/app/applications/application.model/application.model.ts
@@ -18,7 +18,6 @@ export class Application {
 	project_application_report_allowed: boolean = false;
 	project_application_name: string;
 	project_application_shortname: string;
-	perun_name: string;
 	project_application_institute: string;
 	project_application_workgroup: string;
 	project_application_lifetime: number;

diff --git a/src/app/facility_manager/facilityprojectsoverview.component.html b/src/app/facility_manager/facilityprojectsoverview.component.html
@@ -295,7 +295,7 @@
 											class="btn btn-secondary"
 											data-toggle="modal"
 											(click)="
-												showMembersOfTheProject(project.project_application_perun_id, project.perun_name);
+												showMembersOfTheProject(project.project_application_perun_id, project.project_application_shortname);
 												usersModal.show()
 											"
 										>
@@ -403,7 +403,7 @@ <h4 class="modal-title" *ngIf="selectedFacility">
 									<option value="SVP">Simple VM</option>
 									<option value="USER" selected>Specific User</option>
 									<option *ngFor="let project of projects" value="{{ project?.project_application_perun_id }}">
-										{{ project?.perun_name }} ({{ project?.project_application_perun_id }})
+										{{ project?.project_application_shortname }} ({{ project?.project_application_perun_id }})
 									</option>
 								</select>
 							</div>

diff --git a/src/app/facility_manager/facilityprojectsoverview.component.ts b/src/app/facility_manager/facilityprojectsoverview.component.ts
@@ -119,7 +119,7 @@ export class FacilityProjectsOverviewComponent extends AbstractBaseClass impleme
 					(project: Application): boolean => project.project_application_perun_id.toString() === this.selectedProjectType.toString(),
 				);
 				if (pro) {
-					this.emailSubject = `[${this.selectedFacility['Facility']}: ${pro.perun_name}]`;
+					this.emailSubject = `[${this.selectedFacility['Facility']}: ${pro.project_application_shortname}]`;
 				} else {
 					this.emailSubject = `[${this.selectedFacility['Facility']}]`;
 				}
@@ -219,7 +219,7 @@ export class FacilityProjectsOverviewComponent extends AbstractBaseClass impleme
 			(element: Application): boolean => element.project_application_perun_id.toString() === id.toString(),
 		);
 		if (project) {
-			return project.perun_name;
+			return project.project_application_shortname;
 		}
 
 		return 'NOT_FOUND';

diff --git a/src/app/projectmanagement/overview.component.html b/src/app/projectmanagement/overview.component.html
@@ -211,7 +211,7 @@ <h3>
 									<a class="path4"></a>
 									<a class="path5"></a>
 								</a>
-								{{ project_application?.perun_name }}
+								{{ project_application?.project_application_shortname }}
 							</h3>
 						</div>
 						<div

diff --git a/src/app/projectmanagement/overview.component.ts b/src/app/projectmanagement/overview.component.ts
@@ -826,7 +826,7 @@ export class OverviewComponent extends ApplicationBaseClassComponent implements
 	}
 
 	setAddUserInvitationLink(): void {
-		const project_reg: string = `https://signup.aai.lifescience-ri.eu/fed/registrar/?vo=${this.vo_name}&group=${this.project_application.perun_name}`;
+		const project_reg: string = `https://signup.aai.lifescience-ri.eu/fed/registrar/?vo=${this.vo_name}&group=${this.project_application.project_application_shortname}`;
 		const elixir_reg: string = `https://signup.aai.lifescience-ri.eu/fed/registrar/?vo=elixir&targetnew=${encodeURIComponent(
 			project_reg,
 		)}&targetexisting=${encodeURIComponent(project_reg)}&targetextended=${encodeURIComponent(project_reg)}`;

diff --git a/src/app/vo_manager/voOverview.component.html b/src/app/vo_manager/voOverview.component.html
@@ -462,7 +462,7 @@
                                                 type="button"
                                                 class="btn btn-warning"
                                                 [id]="'show_decline_terminate_' + project?.project_application_id"
-                                                [attr.data-test-id]="'show_decline_terminate_' + project?.perun_name"
+                                                [attr.data-test-id]="'show_decline_terminate_' + project?.project_application_shortname"
                                                 (click)="selectedProject = project; declineTerminationModal.show()"
                                                 *ngIf="project | hasstatusinlist : application_states.TERMINATION_REQUESTED"
                                         >
@@ -821,13 +821,13 @@ <h4 class="modal-title">Send email</h4>
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h4 class="modal-title">Suspend Project {{ selectedProject?.perun_name }}</h4>
+                <h4 class="modal-title">Suspend Project {{ selectedProject?.project_application_shortname }}</h4>
                 <button type="button" class="close" style="cursor: pointer" (click)="suspendModal.hide()"
                         aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
-            <div class="modal-body">Are you sure you want to suspend {{ selectedProject?.perun_name }} ?</div>
+            <div class="modal-body">Are you sure you want to suspend {{ selectedProject?.project_application_shortname }} ?</div>
             <div class="modal-footer">
                 <button class="btn btn-success col-md-4" (click)="suspendProject(selectedProject); suspendModal.hide()">
                     Yes
@@ -853,13 +853,13 @@ <h4 class="modal-title">Suspend Project {{ selectedProject?.perun_name }}</h4>
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h4 class="modal-title">Resume Project {{ selectedProject?.perun_name }}</h4>
+                <h4 class="modal-title">Resume Project {{ selectedProject?.project_application_shortname }}</h4>
                 <button type="button" class="close" style="cursor: pointer" (click)="resumeModal.hide()"
                         aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
-            <div class="modal-body">Are you sure you want to resume {{ selectedProject?.perun_name }} ?</div>
+            <div class="modal-body">Are you sure you want to resume {{ selectedProject?.project_application_shortname }} ?</div>
             <div class="modal-footer">
                 <button class="btn btn-success col-md-4" (click)="resumeProject(selectedProject); resumeModal.hide()">
                     Yes