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 13:43:06 UTC
[incubator-dlab] branch develop updated: [DLAB-1884]: Fixed set of
tasks for 'Environment management' page (#794)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new 153a0cf [DLAB-1884]: Fixed set of tasks for 'Environment management' page (#794)
153a0cf is described below
commit 153a0cf02b5123a94c367983d9a4f4e85bec3324
Author: Dmytro Gnatyshyn <42...@users.noreply.github.com>
AuthorDate: Thu Jun 18 16:42:59 2020 +0300
[DLAB-1884]: Fixed set of tasks for 'Environment management' page (#794)
---
.../management/management-grid/management-grid.component.scss | 8 ++++----
.../management/management-grid/management-grid.component.ts | 5 ++++-
.../computational-resources-list.component.scss | 8 ++++----
3 files changed, 12 insertions(+), 9 deletions(-)
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 548451e..4fb54e0 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
@@ -41,19 +41,19 @@
}
.shape {
- width: 19% !important;
+ width: 17% !important;
}
.status {
- width: 13% !important;
+ width: 12% !important;
}
.type {
- width: 14%;
+ width: 13%;
}
.resources {
- width: 21%;
+ width: 24%;
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 adfee55..f7dbaf4 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
@@ -146,7 +146,10 @@ export class ManagementGridComponent implements OnInit {
});
}
this.allFilteredEnvironmentData = filteredData;
- this.allActiveNotebooks = this.allFilteredEnvironmentData.filter(v => v.name && (v.status === 'running' || v.status === 'stopped'));
+ this.allActiveNotebooks = this.allFilteredEnvironmentData
+ .filter(v => v.name &&
+ (v.status === 'running' || v.status === 'stopped') &&
+ !this.clustersInProgress(v.resources));
}
getEnvironmentDataCopy() {
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.scss
index 87126a4..2df7536 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.scss
@@ -30,7 +30,7 @@
align-items: center;
.resource-name {
- width: 55%;
+ width: 50%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
@@ -43,7 +43,7 @@
}
.resource-status {
- width: 30%;
+ width: 35%;
text-transform: capitalize;
}
@@ -115,11 +115,11 @@
.source {
.resource-wrap {
.resource-name {
- width: 45%;
+ width: 42%;
}
.resource-status {
- width: 40%;
+ width: 43%;
}
.resource-actions {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org