X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Fapp%2Fprojects%2FProjectsComponent.ts;h=982421eef2e51ad495d3ab12208d586657a9743d;hb=HEAD;hp=fe5527196a211ab59b2a4e1418c6ad1aa6c4ab90;hpb=09cd4ecd880a8c04282cc3388d37d559f07327a9;p=osm%2FNG-UI.git diff --git a/src/app/projects/ProjectsComponent.ts b/src/app/projects/ProjectsComponent.ts index fe55271..2c0e105 100644 --- a/src/app/projects/ProjectsComponent.ts +++ b/src/app/projects/ProjectsComponent.ts @@ -31,8 +31,7 @@ import { ProjectData, ProjectDetails } from 'ProjectModel'; import { ProjectsActionComponent } from 'ProjectsAction'; import { RestService } from 'RestService'; import { Subscription } from 'rxjs'; -import { SharedService } from 'SharedService'; -import { isNullOrUndefined } from 'util'; +import { SharedService, isNullOrUndefined } from 'SharedService'; /** * Creating component @@ -146,13 +145,16 @@ export class ProjectsComponent implements OnInit, OnDestroy { /** Modal service to initiate the project add @private */ public projectAdd(): void { - const modalRef: NgbModalRef = this.modalService.open(ProjectCreateUpdateComponent, { backdrop: 'static' }); + // eslint-disable-next-line security/detect-non-literal-fs-filename + const modalRef: NgbModalRef = this.modalService.open(ProjectCreateUpdateComponent, { size: 'lg', backdrop: 'static' }); modalRef.componentInstance.projectType = 'Add'; modalRef.result.then((result: MODALCLOSERESPONSEDATA) => { if (result) { this.generateData(); } - }).catch(); + }).catch((): void => { + // Catch Navigation Error + }); } /** smart table listing manipulation @private */ @@ -175,7 +177,7 @@ export class ProjectsComponent implements OnInit, OnDestroy { creationDate: this.sharedService.convertEpochTime(!isNullOrUndefined(projectData._admin) ? projectData._admin.created : null), id: projectData._id, project: projectData._id, - quotas: !isNullOrUndefined(projectData.quotas) ? projectData.quotas : null + quotas: !isNullOrUndefined(projectData.quotas) && Object.keys(projectData.quotas).length !== 0 ? projectData.quotas : null }; } @@ -197,7 +199,9 @@ export class ProjectsComponent implements OnInit, OnDestroy { }); this.dataSource.load(this.projectData).then((data: boolean) => { this.isLoadingResults = false; - }).catch(); + }).catch((): void => { + // Catch Navigation Error + }); }, (error: ERRORDATA) => { this.restService.handleError(error, 'get'); this.isLoadingResults = false;