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/09/17 08:25:01 UTC
[incubator-dlab] branch DLAB-2043 created (now 43ff2ea)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a change to branch DLAB-2043
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 43ff2ea [DLAB-2043]: Changed message for scheduler reminder
This branch includes the following new commits:
new 605050e Merge branch 'develop' of github.com:apache/incubator-dlab into develop
new 43ff2ea [DLAB-2043]: Changed message for scheduler reminder
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-2043]: Changed message for scheduler
reminder
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2043
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 43ff2eae0da850fb665ab3647714603430ebc72f
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Thu Sep 17 11:23:31 2020 +0300
[DLAB-2043]: Changed message for scheduler reminder
---
.../notification-dialog.component.ts | 27 +++++++++++-----------
.../src/app/shared/navbar/navbar.component.ts | 9 ++++++++
.../webapp/src/assets/styles/_general.scss | 1 +
3 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
index f7c81ac..f46360e 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
@@ -36,25 +36,25 @@ import {Endpoint} from '../../../administration/project/project.component';
<span class="strong">{{ data.item.action.project_name }}</span> will be terminated.
</div>
</div>
- <div *ngIf="data.type === 'list'" class="info">
- <div *ngIf="data.template.notebook.length > 0">
- Following notebook server<span *ngIf="data.template.notebook.length>1">s</span> <span *ngFor="let item of data.template.notebook">
- <span class="strong blue">{{ item.exploratory_name}}</span> in project <span
+ <div *ngIf="data.type === 'list'" class="info pb-10">
+ <div class="quota-message" *ngIf="data.template.notebook?.length > 0">
+ Following notebook server<span *ngIf="data.template.notebook.length>1 || data.template.notebook[0].notebook.length>1">s</span><span *ngFor="let item of data.template.notebook">
+ <span class="strong blue" *ngFor="let notebook of item.notebook; let i = index">{{i === 0 ? '' : ', '}} {{ notebook }}</span> in project <span
class="strong blue">{{ item.project }}</span>
<span *ngIf="data.template.notebook.length > 1">, </span>
</span> will be stopped and all computational resources will be stopped/terminated
</div>
- <div *ngIf="data.template.cluster.length > 0">
- <p *ngFor="let item of data.template.cluster">
- Computational resource<span *ngIf="data.template.cluster.length > 1">s</span>
- <span class="strong blue">{{ item.computational_name }}</span> for <span
- class="strong blue">{{ item.exploratory_name }}</span> in project <span
- class="strong blue">{{ item.project }}</span>
+ <div class="quota-message" *ngIf="data.template.cluster?.length > 0">
+ <p>
+ Computational resource<span *ngIf="data.template.cluster.length > 1">s</span> <span *ngFor="let item of data.template.cluster; let i = index">{{i === 0 ? '' : ', '}}<span class="strong blue">{{ item.computational_name }}</span> for <span
+ class="strong blue">{{ item.exploratory_name }}</span> in project <span
+ class="strong blue">{{ item.project }}</span>
+ </span>
will be stopped
</p>
</div>
- <span class="strong blue">by a schedule in less than 15 minutes.</span>
+ <span class="strong blue pb-10">by a schedule in less than 15 minutes.</span>
</div>
<div class="alert" *ngIf="data.type === 'message'">
<span class='highlight'[innerHTML]="data.template"></span>
@@ -79,7 +79,7 @@ import {Endpoint} from '../../../administration/project/project.component';
<div class="resource-name">Resource</div>
<div class="project">Project</div>
</div>
- <div class="scrolling-content resource-heigth">
+ <div class="scrolling-content resource-heigth scrolling">
<div class="resource-list-row sans node" *ngFor="let project of data.list">
<div class="resource-name ellipsis">
<div>Edge node</div>
@@ -104,7 +104,7 @@ import {Endpoint} from '../../../administration/project/project.component';
<div class="endpoint">Edge node in endpoint</div>
<div class="status">Further status</div>
</mat-list-item>
- <div class="scrolling-content">
+ <div class="scrolling-content scrolling">
<mat-list-item *ngFor="let endpoint of filterEndpoints()" class="sans node">
<div class="endpoint ellipsis">{{endpoint.name}}</div>
<div class="status terminated">Terminated</div>
@@ -172,6 +172,7 @@ import {Endpoint} from '../../../administration/project/project.component';
.bottom-message{padding-top: 15px;}
.table-header{padding-bottom: 10px;}
.alert{text-align: left; line-height: 22px; padding-bottom: 25px;padding-top: 15px;}
+ .quota-message{padding-top: 10px}
`]
})
export class NotificationDialogComponent {
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
index dc1a05d..55df3a2 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
@@ -230,6 +230,15 @@ export class NavbarComponent implements OnInit, OnDestroy {
const memo = { notebook: [], cluster: [] };
sheduler_data.map(item => !item.computational_name ? memo.notebook.push(item) : memo.cluster.push(item));
memo.cluster = memo.cluster.filter(el => !memo.notebook.some(elm => el.exploratory_name === elm.exploratory_name));
+ memo.notebook = memo.notebook.reduce((acc, v) => {
+ const existedProject = acc.find(el => el.project === v.project);
+ if (existedProject) {
+ existedProject.notebook.push(v.exploratory_name);
+ } else {
+ acc.push({project: v.project, notebook: [v.exploratory_name]});
+ }
+ return acc;
+ }, []);
return memo;
}
diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_general.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_general.scss
index 875b874..3e32ae6 100644
--- a/services/self-service/src/main/resources/webapp/src/assets/styles/_general.scss
+++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_general.scss
@@ -39,6 +39,7 @@ body.modal-open {
.pr-3{padding-right: 3px}
.pb-50 {padding-bottom: 50px;}
+.pb-10 {padding-bottom: 10px;}
.txt-r {text-align: right }
.txt-l {text-align: left }
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/02: Merge branch 'develop' of
github.com:apache/incubator-dlab into develop
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2043
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 605050e37274b575f8bfaa4540d09899ef761c35
Merge: 85c3c59 23c9230
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Wed Sep 16 14:54:36 2020 +0300
Merge branch 'develop' of github.com:apache/incubator-dlab into develop
.../install-libraries.component.html | 9 +--
.../install-libraries.component.scss | 74 +++++++++++++++-------
.../install-libraries.component.ts | 3 +
3 files changed, 59 insertions(+), 27 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org