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/09/13 11:30:31 UTC
[incubator-dlab] 01/04: [DLAB-1103]: cleanup project status checks
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-927
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 29b0f12373dbaf03dc1a9683742c8a0c1a2d7594
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Fri Sep 13 11:53:02 2019 +0300
[DLAB-1103]: cleanup project status checks
---
.../project-list/project-list.component.html | 41 +++++++++++-----------
.../project/project-list/project-list.component.ts | 2 +-
2 files changed, 22 insertions(+), 21 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 9ae3c82..05bd70c 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
@@ -23,6 +23,15 @@
<td mat-cell *matCellDef="let element"> {{element.name}} </td>
</ng-container>
+ <ng-container matColumnDef="groups">
+ <th mat-header-cell *matHeaderCellDef class="groups"> Groups </th>
+ <td mat-cell *matCellDef="let element">
+ <mat-chip-list>
+ <mat-chip *ngFor="let group of element.groups">{{ group }}</mat-chip>
+ </mat-chip-list>
+ </td>
+ </ng-container>
+
<ng-container matColumnDef="endpoints">
<th mat-header-cell *matHeaderCellDef class="endpoints"> Endpoints </th>
<td mat-cell *matCellDef="let element">
@@ -32,26 +41,17 @@
</td>
</ng-container>
- <ng-container matColumnDef="status">
+ <!-- <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() | underscoreless }}
</td>
- </ng-container>
-
- <ng-container matColumnDef="groups">
- <th mat-header-cell *matHeaderCellDef class="groups"> Groups </th>
- <td mat-cell *matCellDef="let element">
- <mat-chip-list>
- <mat-chip *ngFor="let group of element.groups">{{ group }}</mat-chip>
- </mat-chip-list>
- </td>
- </ng-container>
+ </ng-container> -->
<ng-container matColumnDef="actions">
<th mat-header-cell *matHeaderCellDef class="project-actions"></th>
<td mat-cell *matCellDef="let element" class="project-actions">
- <span>
+ <!-- <span>
<a class="start-stop-action">
<mat-icon *ngIf="element.status === 'ACTIVE'" (click)="toggleProjectStatus(element, 'stop')">
pause_circle_outline
@@ -60,17 +60,18 @@
play_circle_outline
</mat-icon>
</a>
- </span>
- <span [ngClass]="{'not-active' : element.status !== 'ACTIVE' && element.status !== 'NOT_ACTIVE' }">
- <a [ngClass]="{'not-allowed' : element.status !== 'ACTIVE' && element.status !== 'NOT_ACTIVE' }"
- (click)="editProject(element)">
+ </span> -->
+ <span>
+ <!-- [ngClass]="{'not-active' : element.status !== 'ACTIVE' && element.status !== 'NOT_ACTIVE' }" -->
+ <!-- [ngClass]="{'not-allowed' : element.status !== 'ACTIVE' && element.status !== 'NOT_ACTIVE' }" -->
+ <a (click)="editProject(element)">
<mat-icon>mode_edit</mat-icon>
</a>
</span>
- <span
- [ngClass]="{'not-active' : element.status !== 'ACTIVE' && element.status !== 'NOT_ACTIVE' && element.status !== 'FAILED' }">
- <a [ngClass]="{'not-allowed' : element.status !== 'ACTIVE' && element.status !== 'NOT_ACTIVE' && element.status !== 'FAILED' }"
- (click)="deleteProject(element)">
+ <span>
+ <!-- [ngClass]="{'not-active' : element.status !== 'ACTIVE' && element.status !== 'NOT_ACTIVE' && element.status !== 'FAILED' }" -->
+ <!-- [ngClass]="{'not-allowed' : element.status !== 'ACTIVE' && element.status !== 'NOT_ACTIVE' && element.status !== 'FAILED' }" -->
+ <a (click)="deleteProject(element)">
<mat-icon>delete_forever</mat-icon>
</a>
</span>
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 1dd8210..ff6f766 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
@@ -33,7 +33,7 @@ import { Project } from '../project.component';
})
export class ProjectListComponent implements OnInit, OnDestroy {
- displayedColumns: string[] = ['name', 'status', 'endpoints', 'groups', 'actions'];
+ displayedColumns: string[] = ['name', 'groups', 'endpoints', 'actions'];
dataSource: Project[] | any = [];
@Output() editItem: EventEmitter<{}> = new EventEmitter();
@Output() deleteItem: EventEmitter<{}> = new EventEmitter();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org