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 a3af7079d69d473008da7dcde7bdd52a9a86e6fc
Author: Andriana Kovalyshyn <andriana_kovalys...@epam.com>
AuthorDate: Mon Jun 24 13:55:56 2019 +0300
[DLAB-740]: added chips component for lists separation
---
.../management-grid/management-grid.component.html | 8 +++++---
.../project/project-list/project-list.component.html | 16 ++++++++++++----
.../project/project-list/project-list.component.scss | 9 +++++++++
3 files changed, 26 insertions(+), 7 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
index b6e0f09..da87ed3 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
@@ -36,7 +36,8 @@
<ng-container matColumnDef="status">
<th mat-header-cell *matHeaderCellDef class="status"> Status </th>
- <td mat-cell *matCellDef="let element" class="ani status"
ngClass="{{element.status || ''}}">{{ element.status }}</td>
+ <td mat-cell *matCellDef="let element" class="ani status"
ngClass="{{element.status || ''}}">{{ element.status }}
+ </td>
</ng-container>
<ng-container matColumnDef="resources">
@@ -74,7 +75,8 @@
<ng-container matColumnDef="actions">
<th mat-header-cell *matHeaderCellDef class="actions"></th>
<td mat-cell *matCellDef="let element" class="actions settings">
- <span #settings class="actions" (click)="actions.toggle($event,
settings)" [ngClass]="{ 'disabled'
+ <span #settings class="actions" (click)="actions.toggle($event,
settings)"
+ [ngClass]="{ 'disabled'
: (element.status !== 'running' && element.status !== 'stopped' &&
element.status !== 'stopping' && element.status !== 'failed' )
|| (element.type === 'edge node' && element.user.toLowerCase() ===
currentUser && element.status === 'stopping')
|| element.type === 'edge node' && element.user.toLowerCase() !==
currentUser && element.status !== 'running' }"></span>
@@ -115,4 +117,4 @@
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
</table>
-</div>
\ No newline at end of file
+</div>
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 c22c700..dd19942 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,7 +17,7 @@
~ under the License.
-->
-<table mat-table [dataSource]="dataSource" class="projects-table
mat-elevation-z6">
+<table mat-table [dataSource]="dataSource" class="projects-table
mat-elevation-z6 selection">
<ng-container matColumnDef="name">
<th mat-header-cell *matHeaderCellDef class="name"> Project name </th>
<td mat-cell *matCellDef="let element"> {{element.name}} </td>
@@ -25,12 +25,20 @@
<ng-container matColumnDef="endpoints">
<th mat-header-cell *matHeaderCellDef class="endpoints"> Endpoints </th>
- <td mat-cell *matCellDef="let element"> {{element.endpoints}} </td>
+ <td mat-cell *matCellDef="let element">
+ <mat-chip-list>
+ <mat-chip *ngFor="let endpoint of element.endpoints">{{ endpoint
}}</mat-chip>
+ </mat-chip-list>
+ </td>
</ng-container>
<ng-container matColumnDef="groups">
<th mat-header-cell *matHeaderCellDef class="groups"> Groups </th>
- <td mat-cell *matCellDef="let element"> {{element.groups}} </td>
+ <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="actions">
@@ -48,4 +56,4 @@
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
-</table>
\ No newline at end of file
+</table>
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 c63f0df..b78dca4 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
@@ -19,26 +19,35 @@
table {
width: 100%;
+
.name {
width: 25%;
}
+
.endpoints {
width: 30%;
+ padding: 0 10px;
}
+
.groups {
width: 35%;
+ padding: 0 10px;
}
+
.project-actions {
color: #607d8b;
width: 10%;
text-align: center;
+
span {
transition: all .5s ease-in-out;
cursor: pointer;
+
.mat-icon {
font-size: 18px;
padding-top: 5px;
}
+
&:hover {
color: darken(#607d8b, 10%);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
