You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dg...@apache.org on 2020/06/18 06:31:37 UTC
[incubator-dlab] 01/02: [DLAB-1877]: Fixed some of set of tasks
Environment management
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1877
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit f42f01bc7f758a26da10b6f298dad9335e1d7475
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Thu Jun 18 09:16:37 2020 +0300
[DLAB-1877]: Fixed some of set of tasks Environment management
---
.../management/management-grid/management-grid.component.html | 2 +-
.../management/management-grid/management-grid.component.ts | 7 ++++++-
2 files changed, 7 insertions(+), 2 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 02d9012..eb3581e 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
@@ -37,7 +37,7 @@
</th>
<td mat-cell *matCellDef="let element">
<div
- *ngIf="element.type !== 'edge node' && (element.status==='running' || element.status==='stopped')"
+ *ngIf="element.type !== 'edge node' && (element.status==='running' || element.status==='stopped') && !clustersInProgress(element.resources)"
class="empty-checkbox"
[ngClass]="{'checked': element.isSelected}"
(click)="toggleActionForAll(element);$event.stopPropagation()"
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 cb1c283..adfee55 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
@@ -228,6 +228,11 @@ export class ManagementGridComponent implements OnInit {
this.selected = this.allFilteredEnvironmentData.filter(item => !!item.isSelected);
this.emitSelectedList.emit(this.selected);
}
+
+ public clustersInProgress(resources: any) {
+ const statuses = ['terminating', 'stopping', 'starting', 'creating', 'configuring', 'reconfiguring'];
+ return resources.filter(resource => statuses.includes(resource.status)).length;
+ }
}
@@ -332,7 +337,7 @@ export class ReconfirmationDialogComponent {
if (data.notebooks && data.notebooks.length) {
this.notebooks = JSON.parse(JSON.stringify(data.notebooks));
this.notebooks = this.notebooks.map(notebook => {
- notebook.resources = notebook.resources.filter(res => res.status !== 'terminated' && res.status.slice(0, 4) !== data.action);
+ notebook.resources = notebook.resources.filter(res => res.status !== 'failed' && res.status !== 'terminated' && res.status.slice(0, 4) !== data.action);
if (notebook.resources.length) {
this.isClusterLength = true;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org