This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch project_grid in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 62c401c6a603d2d9c5bf8d2b08a76c3c9e761340 Author: Andriana Kovalyshyn <andriana_kovalys...@epam.com> AuthorDate: Thu May 23 16:55:47 2019 +0300 added project-data.service --- .../webapp/src/app/administration/project/index.ts | 2 + .../project/{index.ts => project-data.service.ts} | 55 ++++++++++++---------- .../cluster-details/cluster-details.component.html | 2 +- 3 files changed, 34 insertions(+), 25 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts index f04584c..4dfc82f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts @@ -28,6 +28,7 @@ import { ProjectFormComponent } from './project-form/project-form.component'; import { ProjectListComponent } from './project-list/project-list.component'; import { ProjectComponent } from './project.component'; +import { ProjectDataService } from './project-data.service'; @NgModule({ imports: [ @@ -38,6 +39,7 @@ import { ProjectComponent } from './project.component'; FormControlsModule ], declarations: [ProjectComponent, ProjectFormComponent, ProjectListComponent], + providers: [ProjectDataService], exports: [ProjectComponent] }) export class ProjectModule { } \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts similarity index 51% copy from services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts copy to services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts index f04584c..1bba48a 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts @@ -17,27 +17,34 @@ * under the License. */ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; - -import { MaterialModule } from '../../shared/material.module'; -import { FormControlsModule } from '../../shared/form-controls'; - -import { ProjectFormComponent } from './project-form/project-form.component'; -import { ProjectListComponent } from './project-list/project-list.component'; - -import { ProjectComponent } from './project.component'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - ReactiveFormsModule, - MaterialModule, - FormControlsModule - ], - declarations: [ProjectComponent, ProjectFormComponent, ProjectListComponent], - exports: [ProjectComponent] -}) -export class ProjectModule { } \ No newline at end of file +import { Injectable } from '@angular/core'; + +import { ProjectService } from '../../core/services'; +import { Project } from './project.component'; + +import { data } from './project-list/data'; +@Injectable() +export class ProjectDataService { + dataSource: any; + // Project[]; + + constructor(private projectService: ProjectService) { + this.getProjectsList(); + } + + get getProjects() { + return this.dataSource; + } + + public updateProjects() { + this.getProjectsList(); + } + + private getProjectsList() { + this.dataSource = data.projects; + + + this.projectService.getProjectsList().subscribe( + (response: any) => this.dataSource = data.projects); + } +} \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html index ef38a47..d341eb7 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html @@ -21,7 +21,7 @@ <header class="dialog-header header-white"> <button type="button" class="close" (click)="dialogRef.close()">×</button> </header> - <div class="modal-content"> + <div class="dialog-content"> <div *ngIf="resource"> <table class="detail-header"> <tr> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org