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 ea1ce9d21907af45e97896e089257070ecb3ee00 Author: Andriana Kovalyshyn <andriana_kovalys...@epam.com> AuthorDate: Wed May 22 13:40:29 2019 +0300 added project data table --- .../project-list/project-list.component.html | 32 ++++++++++++++++++++-- .../project-list/project-list.component.scss | 6 +++- .../project/project-list/project-list.component.ts | 13 +++++++-- 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html index 3e890d6..3c9ba79 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html @@ -17,6 +17,32 @@ ~ under the License. --> -<p> - project-list works! -</p> \ No newline at end of file +<div class="base-retreat"> + + <table mat-table [dataSource]="dataSource" class="mat-elevation-z8"> + <ng-container matColumnDef="project_name"> + <th mat-header-cell *matHeaderCellDef> Project name </th> + <td mat-cell *matCellDef="let element"> {{element.project_name}} </td> + </ng-container> + + <ng-container matColumnDef="endpoint_name"> + <th mat-header-cell *matHeaderCellDef> Endpoint name </th> + <td mat-cell *matCellDef="let element"> {{element.endpoint_name}} </td> + </ng-container> + + <ng-container matColumnDef="project_tag"> + <th mat-header-cell *matHeaderCellDef> Project tag </th> + <td mat-cell *matCellDef="let element"> {{element.project_tag}} </td> + </ng-container> + + <ng-container matColumnDef="star"> + <th mat-header-cell *matHeaderCellDef>Action</th> + <td mat-cell *matCellDef="let element"> + <mat-icon>more_vert</mat-icon> + </td> + </ng-container> + + <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> + <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr> + </table> +</div> \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss index 7220975..fb706f5 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss @@ -15,4 +15,8 @@ * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - */ \ No newline at end of file + */ + + table { + width: 100%; + } \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts index f974ab6..df67b76 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts @@ -19,12 +19,13 @@ import { Component, OnInit } from '@angular/core'; import { ToastrService } from 'ngx-toastr'; + import {MatTableDataSource} from '@angular/material'; import { ProjectService } from '../../../core/services'; import { Project } from '../project.component'; import { data } from './data'; - + @Component({ selector: 'project-list', templateUrl: './project-list.component.html', @@ -32,18 +33,24 @@ }) export class ProjectListComponent implements OnInit { - projectsList: Project[]; + displayedColumns: string[] = ['project_name', 'endpoint_name', 'project_tag']; + dataSource: any; + constructor( public toastr: ToastrService, private projectService: ProjectService) { } + ngOnInit() { this.getProjectsList(); } getProjectsList() { + // Project[] type + this.dataSource = new MatTableDataSource(data.projects); + this.projectService.getProjectsList().subscribe( - (response: Project[]) => this.projectsList = response, + (response: any) => this.dataSource = response, error => this.toastr.error(error.message || 'Receiving list failed!', 'Oops!')); } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org