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/04/17 10:55:47 UTC
[incubator-dlab] 01/01: [DLAB-603]: added Edge IP on management grid
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-603
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit f2b2fab158354cf934e0005bfe27167de3ae7010
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed Apr 17 13:55:35 2019 +0300
[DLAB-603]: added Edge IP on management grid
---
.../src/app/management/management-grid/management-grid.component.html | 4 ++--
.../main/resources/webapp/src/app/management/management.component.ts | 1 +
.../src/main/resources/webapp/src/app/management/management.model.ts | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.html
index 42bae6b..61f37d3 100644
--- a/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.html
@@ -22,7 +22,7 @@
<th class="th_user">User</th>
<th class="th_name">Name</th>
<th class="th_status">Status</th>
- <th class="th_shape">Shape</th>
+ <th class="th_shape">Shape / Resource id</th>
<th class="th_resources">Computational resources</th>
<th class="th_actions">Action</th>
</tr>
@@ -31,7 +31,7 @@
<td>{{ env.user }}</td>
<td [ngClass]="{'capitalize': env.name === 'edge node'}">{{ env.name }}</td>
<td class="status" ngClass="{{env.status || ''}}">{{env.status}}</td>
- <td>{{ env.shape }}</td>
+ <td>{{ env.shape || env.ip }}</td>
<td>
<div class="source" *ngIf="env.resources">
<div *ngIf="!env.resources?.length">
diff --git a/services/self-service/src/main/resources/webapp/src/app/management/management.component.ts b/services/self-service/src/main/resources/webapp/src/app/management/management.component.ts
index 8d21583..ac819a3 100644
--- a/services/self-service/src/main/resources/webapp/src/app/management/management.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/management/management.component.ts
@@ -253,6 +253,7 @@ export class ManagementComponent implements OnInit, OnDestroy {
value.shape,
value.computational_resources,
value.user,
+ value.public_ip,
value.resource_type
));
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/management/management.model.ts b/services/self-service/src/main/resources/webapp/src/app/management/management.model.ts
index 79d55c8..51ab721 100644
--- a/services/self-service/src/main/resources/webapp/src/app/management/management.model.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/management/management.model.ts
@@ -24,6 +24,7 @@ export class EnvironmentModel {
public shape: string,
public resources: Array<any>,
public user: string,
+ public ip: string,
public type?: string
) { }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org