You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/07/03 08:41:54 UTC
[incubator-dlab] branch feature/projects updated: [DLAB-831]: added
project status to dashboard
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
The following commit(s) were added to refs/heads/feature/projects by this push:
new c007b1a [DLAB-831]: added project status to dashboard
new 43faea5 Merge branch 'feature/projects' of github.com:apache/incubator-dlab into feature/projects
c007b1a is described below
commit c007b1a090c0fca126f1799882d76ee50c6efcc9
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed Jul 3 11:40:44 2019 +0300
[DLAB-831]: added project status to dashboard
---
.../project/project-list/project-list.component.html | 7 +++++++
.../project/project-list/project-list.component.scss | 8 ++++++--
.../project/project-list/project-list.component.ts | 2 +-
.../app/reporting/reporting-grid/reporting-grid.component.ts | 10 ----------
4 files changed, 14 insertions(+), 13 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 dd19942..d43d801 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
@@ -32,6 +32,13 @@
</td>
</ng-container>
+ <ng-container matColumnDef="status">
+ <th mat-header-cell *matHeaderCellDef class="status"> Status </th>
+ <td mat-cell *matCellDef="let element" class="status" ngClass="{{ element.status.toLowerCase() || '' }}">
+ {{ element.status.toLowerCase() }}
+ </td>
+ </ng-container>
+
<ng-container matColumnDef="groups">
<th mat-header-cell *matHeaderCellDef class="groups"> Groups </th>
<td mat-cell *matCellDef="let element">
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 b78dca4..bd3ebdd 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
@@ -25,15 +25,19 @@ table {
}
.endpoints {
- width: 30%;
+ width: 25%;
padding: 0 10px;
}
.groups {
- width: 35%;
+ width: 25%;
padding: 0 10px;
}
+ .status {
+ width: 15%;
+ }
+
.project-actions {
color: #607d8b;
width: 10%;
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 1870b59..5cf2d81 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
@@ -32,7 +32,7 @@ import { Project } from '../project.component';
})
export class ProjectListComponent implements OnInit, OnDestroy {
- displayedColumns: string[] = ['name', 'endpoints', 'groups', 'actions'];
+ displayedColumns: string[] = ['name', 'status', 'endpoints', 'groups', 'actions'];
dataSource: Project[] | any = [];
@Output() editItem: EventEmitter<{}> = new EventEmitter();
@Output() deleteItem: EventEmitter<{}> = new EventEmitter();
diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts
index 9310c17..c65e01f 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts
@@ -41,16 +41,6 @@ export class ReportingGridComponent implements OnInit {
displayedColumns: string[] = ['name', 'user', 'type', 'status', 'shape', 'service', 'charge'];
displayedFilterColumns: string[] = ['name-filter', 'user-filter', 'type-filter', 'status-filter', 'shape-filter', 'service-filter', 'actions'];
- // public filteringColumns: Array<any> = [
- // { title: 'User', name: 'user', className: 'th_user', filtering: true, role: 'admin'},
- // { title: 'Environment name', name: 'dlab_id', className: 'env_name', filtering: true },
- // { title: 'Resource Type', name: 'resource_type', className: 'th_type', filtering: true },
- // { title: 'Status', name: 'status', className: 'th_rstatus', filtering: true },
- // { title: DICTIONARY.instance_size, name: DICTIONARY.billing.instance_size, className: 'th_shape', filtering: true },
- // { title: DICTIONARY.service, name: DICTIONARY.billing.service_filter_key, className: 'service', filtering: true },
- // { title: 'Service Charges', name: 'charges', className: 'th_charges', filtering: false }
- // ];
-
ngOnInit() { }
onUpdate($event): void {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org