This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch feature/projects in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 140a9b967c74ccd68f14e348db637d012fe6c1b4 Author: Andriana Kovalyshyn <[email protected]> AuthorDate: Mon May 27 16:07:06 2019 +0300 [DLAB-631]: added extra check if no project data exist; extend service --- .../administration/project/project-data.service.ts | 5 ++++- .../administration/project/project.component.html | 8 ++++---- .../administration/project/project.component.ts | 22 +++++++++++++++++++--- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts index 1df5a18..dcc44cd 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts @@ -42,6 +42,9 @@ export class ProjectDataService { private getProjectsList() { this.projectService.getProjectsList().subscribe( - (response: Project[]) => this._projects.next(response)); + (response: Project[]) => { + debugger; + this._projects.next(response) + }); } } \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html index 778dc17..cf686e0 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html @@ -27,10 +27,10 @@ <div></div> </div> -<mat-card class="base-retreat project-form" *ngIf="projects?.lenght < 1; else list"> +<mat-card class="base-retreat project-form" *ngIf="projects?.lenght < 1"> <project-form></project-form> </mat-card> -<ng-template #list> - <project-list deleteProject (editItem)="editProject($event)" (deleteItem)="deleteProject($event)"></project-list> -</ng-template> +<div [hidden]="projects?.lenght < 1"> + <project-list (editItem)="editProject($event)" (deleteItem)="deleteProject($event)"></project-list> +</div> diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts index 2158fdf..5b05af3 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts @@ -17,11 +17,12 @@ * under the License. */ -import { Component, OnInit, OnDestroy, Inject } from '@angular/core'; +import { Component, OnInit, OnDestroy, Inject, ChangeDetectorRef } from '@angular/core'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { Subscription } from 'rxjs'; import { ProjectDataService } from './project-data.service'; +import { HealthStatusService, UserAccessKeyService } from '../../core/services'; import { NotificationDialogComponent } from '../../shared/modal-dialog/notification-dialog'; export interface Project { @@ -38,16 +39,26 @@ export interface Project { }) export class ProjectComponent implements OnInit, OnDestroy { projects: Project[] = []; + healthStatus: any; + private subscriptions: Subscription = new Subscription(); constructor( public dialog: MatDialog, - private projectDataService: ProjectDataService + private projectDataService: ProjectDataService, + private healthStatusService: HealthStatusService, + private ref: ChangeDetectorRef, ) { } ngOnInit() { + this.getEnvironmentHealthStatus(); this.subscriptions.add(this.projectDataService._projects.subscribe( - value => this.projects = value)); + (value: Project[]) => { + if (value) { + this.projects = value; + this.ref.detectChanges(); + } + })); } ngOnDestroy() { @@ -78,6 +89,11 @@ export class ProjectComponent implements OnInit, OnDestroy { console.log('Delete project'); }); } + + private getEnvironmentHealthStatus() { + this.healthStatusService.getEnvironmentHealthStatus() + .subscribe((result: any) => this.healthStatus = result); + } } @Component({ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
