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/10/09 10:55:53 UTC
[incubator-dlab] branch DLAB-1143 updated: [DLAB-1162]: added extra
check on stopping/termination actions(management page)
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1143
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1143 by this push:
new 8b39163 [DLAB-1162]: added extra check on stopping/termination actions(management page)
8b39163 is described below
commit 8b39163ed248ee0cf818d9226faa6cb1ea814cc7
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed Oct 9 13:53:35 2019 +0300
[DLAB-1162]: added extra check on stopping/termination actions(management page)
---
.../management/management-grid/management-grid.component.html | 5 +++--
.../management/management-grid/management-grid.component.scss | 2 +-
.../management/management-grid/management-grid.component.ts | 7 ++++++-
.../administration/project/project-list/project-list.component.ts | 4 +---
4 files changed, 11 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 3f8beb5..3e04b97 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
@@ -124,8 +124,9 @@
<th mat-header-cell *matHeaderCellDef class=""></th>
<td mat-cell *matCellDef="let element" class=" settings">
<span #settings class="actions" (click)="actions.toggle($event, settings)" *ngIf="element.type !== 'edge node'"
- [ngClass]="{ 'disabled'
- : element.status !== 'running' && element.status !== 'stopped' && element.status !== 'stopping' && element.status !== 'failed' }"></span>
+ [ngClass]="{
+ 'disabled' : isActiveResources(element),
+ 'disabled' : element.status !== 'running' && element.status !== 'stopped' && element.status !== 'stopping' && element.status !== 'failed' }"></span>
<bubble-up #actions class="list-menu" position="bottom-left" alternative="top-left">
<ul class="list-unstyled">
<li
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss
index f0e5229..30515a5 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss
@@ -43,7 +43,7 @@
}
.resources {
- width: 20%;
+ width: 25%;
padding: 5px;
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
index fd37096..c94ed59 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
@@ -185,7 +185,7 @@ export class ManagementGridComponent implements OnInit {
return false;
}
- inProgress(resources) {
+ public inProgress(resources) {
return resources.filter(resource => (
resource.status !== 'failed'
&& resource.status !== 'terminated'
@@ -193,6 +193,11 @@ export class ManagementGridComponent implements OnInit {
&& resource.status !== 'stopped')).length > 0;
}
+ public isActiveResources(item) {
+ if (item.resources.length) return item.resources.some(e => e.status !== 'terminated');
+ }
+
+
private getDefaultFilterConfiguration(data): void {
const users = [], projects = [], shapes = [], statuses = [], resources = [];
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 b3ba969..b5b25b5 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
@@ -90,10 +90,8 @@ export class ProjectListComponent implements OnInit, OnDestroy {
}
public isActiveEndpoint(project) {
- if (project) {
+ if (project)
return project.endpoints.some(e => e.status !== 'TERMINATED')
- console.log('all dead');
- }
}
public toEndpointStatus(status) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org