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/09/04 11:03:09 UTC
[incubator-dlab] branch DLAB-1052 created (now 16bc773)
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a change to branch DLAB-1052
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 16bc773 [DLAB-1052]: is Resources In Progress check fixes
This branch includes the following new commits:
new b33094b [DLAB-1052]: is Resources In Progress check fixes
new 16bc773 [DLAB-1052]: is Resources In Progress check fixes
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] 01/02: [DLAB-1052]: is Resources In Progress check
fixes
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1052
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit b33094b52baaad1588856408476f4751032db557
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed Sep 4 11:41:25 2019 +0300
[DLAB-1052]: is Resources In Progress check fixes
---
.../app/resources/resources-grid/resources-grid.component.ts | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
index 57df495..d9c229f 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
@@ -198,14 +198,10 @@ export class ResourcesGridComponent implements OnInit {
isResourcesInProgress(notebook) {
- const env = this.getEnvironmentsListCopy().filter(env => env.exploratory.find(el => el.name === notebook.name))[0];
- let resource = [];
+ const env = this.getEnvironmentsListCopy().map(env => env.exploratory.find(el => el.name === notebook.name))[0];
- if (env) resource = env.exploratory[0].resources;
-
- if (resource.length) {
- return resource.filter(item => (
- item.status !== 'failed' && item.status !== 'terminated'
+ if (env.resources.length) {
+ return env.resources.filter(item => (item.status !== 'failed' && item.status !== 'terminated'
&& item.status !== 'running' && item.status !== 'stopped')).length > 0;
}
return false;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/02: [DLAB-1052]: is Resources In Progress check
fixes
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1052
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 16bc773ae6128e37ffab64373914346c0183c65a
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed Sep 4 14:02:57 2019 +0300
[DLAB-1052]: is Resources In Progress check fixes
---
.../project/project-form/project-form.component.html | 4 ++--
.../project/project-form/project-form.component.scss | 12 ++++++++++++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html
index 81c23f8..77f747c 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html
@@ -24,7 +24,7 @@
<section class="inner-step mat-reset upload-key">
<div class="form-block split">
<div class="row-wrap">
- <div class="col">
+ <div class="col label">
<label class="control-label">
<span>Upload public key to start project creation</span>
</label>
@@ -35,7 +35,7 @@
</a>
</div>
</div>
- <div class="col txt-r">
+ <div class="col txt-r action">
<span mat-raised-button class="butt butt-file" [ngClass]="{ 'not-allowed' : item }">
<span class="upload-icon"></span> Upload
<input (change)="onFileChange($event)" type="file" name="file" accept=".pub" />
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss
index 2284ad2..1208874 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss
@@ -20,6 +20,18 @@
.form-block {
width: 600px;
+ .row-wrap {
+ .col {
+ &.label {
+ width: 60%;
+ }
+
+ &.action {
+ width: 40%;
+ }
+ }
+ }
+
&.split {
flex-direction: column;
display: flex;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org