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:36 UTC
[incubator-dlab] branch DLAB-1877 created (now 6ce68ed)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a change to branch DLAB-1877
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 6ce68ed [DLAB-1877]: Fixed set of tasks Environment management
This branch includes the following new commits:
new f42f01b [DLAB-1877]: Fixed some of set of tasks Environment management
new 6ce68ed [DLAB-1877]: Fixed set of tasks Environment management
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/02: [DLAB-1877]: Fixed set of tasks Environment
management
Posted by dg...@apache.org.
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 6ce68edfe565bc84f37995cc5dafb33e81f1648f
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Thu Jun 18 09:29:57 2020 +0300
[DLAB-1877]: Fixed set of tasks Environment management
---
.../management-grid/management-grid.component.html | 23 ++++++++++++----------
1 file changed, 13 insertions(+), 10 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 eb3581e..64b6e91 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
@@ -144,21 +144,24 @@
<div *ngIf="element.resources?.length">
<div *ngFor="let resource of element.resources" class="resource-wrap">
<div class="resource-name">
- <a class="detailed-link">
+ <a>
{{ resource.computational_name }}
</a>
</div>
<span ngClass="{{resource.status || ''}}" class="resource-status">{{ resource.status }}</span>
<div class="resource-actions">
- <a class="start-stop-action" *ngIf="resource.image === 'docker.dlab-dataengine'">
- <i class="material-icons" (click)="toggleResourceAction(element, 'stop', resource)"
- [ngClass]="{'not-allowed' : resource.status !== 'running' }">pause_circle_outline</i>
- </a>
-
- <a class="remove_butt" (click)="toggleResourceAction(element, 'terminate', resource)"
- [ngClass]="{ 'disabled' : element.status !== 'running' || resource.status !== 'running' && resource.status !== 'stopped' }">
- <i class="material-icons">highlight_off</i>
- </a>
+ <span class="not-allow">
+ <a class="start-stop-action" *ngIf="resource.image === 'docker.dlab-dataengine'">
+ <i class="material-icons" (click)="toggleResourceAction(element, 'stop', resource)"
+ [ngClass]="{'not-allowed' : resource.status !== 'running' || selected?.length }">pause_circle_outline</i>
+ </a>
+ </span>
+ <span class="not-allow">
+ <a class="remove_butt" (click)="toggleResourceAction(element, 'terminate', resource)"
+ [ngClass]="{ 'disabled' : element.status !== 'running' || (resource.status !== 'running' && resource.status !== 'stopped') || selected?.length }">
+ <i class="material-icons">highlight_off</i>
+ </a>
+ </span>
</div>
</div>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/02: [DLAB-1877]: Fixed some of set of tasks
Environment management
Posted by dg...@apache.org.
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