X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Fapp%2Froles%2Froles-details%2FRolesDetailsComponent.ts;h=473a0c6e151fce79c405e74111e862aacd8b137b;hb=c84f1123f8ba69f9e2211b2d816bb415e595efaa;hp=2568f5ab9ea7e026c8cc20627ed2e10b6e24e0e1;hpb=3b4814aa2d3dec621dadb52f058ba95a3dc3a86a;p=osm%2FNG-UI.git diff --git a/src/app/roles/roles-details/RolesDetailsComponent.ts b/src/app/roles/roles-details/RolesDetailsComponent.ts index 2568f5a..473a0c6 100644 --- a/src/app/roles/roles-details/RolesDetailsComponent.ts +++ b/src/app/roles/roles-details/RolesDetailsComponent.ts @@ -29,7 +29,7 @@ import { RestService } from 'RestService'; import { RolesActionComponent } from 'RolesAction'; import { RoleData, RoleDetails } from 'RolesModel'; import { Subscription } from 'rxjs'; -import { SharedService } from 'SharedService'; +import { SharedService, isNullOrUndefined } from 'SharedService'; /** * Creating component @@ -158,7 +158,9 @@ export class RolesDetailsComponent implements OnInit { }); this.dataSource.load(this.roleData).then((data: boolean) => { this.isLoadingResults = false; - }).catch(); + }).catch((): void => { + // Catch Navigation Error + }); }, (error: ERRORDATA) => { this.restService.handleError(error, 'get'); this.isLoadingResults = false; @@ -170,8 +172,8 @@ export class RolesDetailsComponent implements OnInit { return { name: roleData.name, identifier: roleData._id, - modified: this.sharedService.convertEpochTime(Number(roleData._admin.modified)), - created: this.sharedService.convertEpochTime(Number(roleData._admin.created)), + modified: this.sharedService.convertEpochTime(!isNullOrUndefined(roleData._admin) ? Number(roleData._admin.modified) : null), + created: this.sharedService.convertEpochTime(!isNullOrUndefined(roleData._admin) ? Number(roleData._admin.created) : null), permissions: roleData.permissions }; } @@ -187,5 +189,4 @@ export class RolesDetailsComponent implements OnInit { public ngOnDestroy(): void { this.generateDataSub.unsubscribe(); } - }