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/11/22 11:26:39 UTC
[incubator-dlab] branch DLAB-1279 created (now 3983a7c)
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a change to branch DLAB-1279
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 3983a7c [fixed actions prevention on notebooks for resources in progress
This branch includes the following new commits:
new 3983a7c [fixed actions prevention on notebooks for resources in progress
The 1 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/01: [fixed actions prevention on notebooks for
resources in progress
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1279
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 3983a7cd9b45cb8c12ba8de596eff195baa5b937
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Fri Nov 22 13:24:35 2019 +0200
[fixed actions prevention on notebooks for resources in progress
---
.../src/app/resources/resources-grid/resources-grid.component.ts | 8 +++++++-
.../webapp/src/app/resources/scheduler/scheduler.component.html | 2 +-
.../notification-dialog/notification-dialog.component.ts | 2 +-
3 files changed, 9 insertions(+), 3 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 14014e7..303dc3e 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
@@ -131,7 +131,7 @@ export class ResourcesGridComponent implements OnInit {
}
public isResourcesInProgress(notebook) {
- const env = this.getEnvironmentsListCopy().map(env => env.exploratory.find(el => el.name === notebook.name))[0];
+ let env = this.getResourceByName(notebook.name);
if (env && env.resources.length) {
return env.resources.filter(item => (item.status !== 'failed' && item.status !== 'terminated'
@@ -142,6 +142,12 @@ export class ResourcesGridComponent implements OnInit {
// PRIVATE
+ private getResourceByName(notebook_name: string) {
+ return this.getEnvironmentsListCopy()
+ .map(env => env.exploratory.find(({ name }) => name === notebook_name))
+ .filter(notebook_name => !!notebook_name)[0];
+ }
+
private getEnvironmentsListCopy() {
return this.environments.map(env => JSON.parse(JSON.stringify(env)));
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html
index e3cd8e6..a13ffa1 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html
@@ -88,7 +88,7 @@
<ng-template #timezone>
<div class="col-3">
<mat-form-field class="timezone-offset">
- <mat-select placeholder="Select offset" [(value)]="tzOffset"
+ <mat-select placeholder="Select timezone" [(value)]="tzOffset"
[disabled]="destination.type === 'СOMPUTATIONAL' && inherit || !enableSchedule">
<mat-option *ngFor="let zone of zones | keys" [value]="zone.key" matTooltip="{{ zone.value }}"
matTooltipShowDelay="1000" matTooltipPosition="above"> GMT {{zone.key}} {{ zone.value }}
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 10dfc55..6e3278a 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
@@ -56,7 +56,7 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
<mat-list class="endpoints-list" *ngIf="data.item.endpoints.length">
<mat-list-item class="list-header">
<div class="endpoint">Endpoint</div>
- <div class="status">Status</div>
+ <div class="status">Further status</div>
</mat-list-item>
<div class="scrolling-content">
<mat-list-item *ngFor="let endpoint of data.item.endpoints">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org