You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by dg...@apache.org on 2020/11/20 15:32:02 UTC
[incubator-datalab] branch DATALAB-2160 created (now 3f5e036)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a change to branch DATALAB-2160
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
at 3f5e036 [DATALAB-2160]: Fixed disabled gear icon if Notebook contains Data Engine
This branch includes the following new commits:
new 66a0f79 Merge remote-tracking branch 'origin/develop' into develop
new c39f85a [DATALAB-2159]: Fixed disabled gear icon if Notebook contains Data Engine
new 0d850da [DATALAB-2160]: Fixed disabled gear icon if Notebook contains Data Engine
new b052ba9 [DATALAB-2160]: Fixed disabled gear icon if Notebook contains Data Engine
new 3f5e036 [DATALAB-2160]: Fixed disabled gear icon if Notebook contains Data Engine
The 5 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@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 02/05: [DATALAB-2159]: Fixed disabled gear icon
if Notebook contains Data Engine
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DATALAB-2160
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit c39f85a4f3e7b967e96b4b84ab6a43db72e75b45
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Fri Nov 20 15:14:01 2020 +0200
[DATALAB-2159]: Fixed disabled gear icon if Notebook contains Data Engine
---
.../management/management-grid/management-grid.component.html | 2 +-
.../management/management-grid/management-grid.component.ts | 9 ++-------
2 files changed, 3 insertions(+), 8 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 d14d7f3..649713d 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
@@ -191,7 +191,7 @@
<span #settings class="actions" (click)="actions.toggle($event, settings)" *ngIf="element.type !== 'edge node'"
[ngClass]="{
'disabled' : (element.status !== 'running' && element.status !== 'stopped' && element.status !== 'stopping' && element.status !== 'failed')
- || selected?.length || isActiveResources(element)}">
+ || selected?.length || inProgress(element.resources)}">
</span>
</span>
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 cf7bf0c..679c9e9 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
@@ -217,18 +217,13 @@ export class ManagementGridComponent implements OnInit {
}
public inProgress(resources) {
- return resources.filter(resource => (
+ return resources.some(resource => (
resource.status !== 'failed'
&& resource.status !== 'terminated'
&& resource.status !== 'running'
- && resource.status !== 'stopped')).length > 0;
+ && resource.status !== 'stopped'));
}
- public isActiveResources(item) {
- if (item.resources.length) return item.resources.some(e => e.status !== 'terminated');
- }
-
-
private getDefaultFilterConfiguration(data): void {
const users = [], projects = [], shapes = [], statuses = [], resources = [], endpoints = [];
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 05/05: [DATALAB-2160]: Fixed disabled gear icon
if Notebook contains Data Engine
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DATALAB-2160
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 3f5e03668e305ee49b86e3cc3ed87aec7e75c182
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Fri Nov 20 17:31:02 2020 +0200
[DATALAB-2160]: Fixed disabled gear icon if Notebook contains Data Engine
---
.../management/management-grid/management-grid.component.ts | 3 ---
1 file changed, 3 deletions(-)
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 938b7d6..b97ddf8 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
@@ -84,7 +84,6 @@ export class ManagementGridComponent implements OnInit, AfterViewInit, AfterView
@HostListener('window:resize', ['$event'])
onResize(event) {
- this.isScrollButtonsVisible = this.tableWrapper.nativeElement.offsetWidth - this.table._elementRef.nativeElement.offsetWidth < -5;
this.checkMaxRight();
}
@@ -100,7 +99,6 @@ export class ManagementGridComponent implements OnInit, AfterViewInit, AfterView
private cashedFilterForm: ManagementConfigModel = new ManagementConfigModel([], '', [], [], [], [], []);
public isFilterSelected: boolean;
public isFilterChanged: boolean;
- private isScrollButtonsVisible: boolean;
constructor(
private healthStatusService: HealthStatusService,
@@ -119,7 +117,6 @@ export class ManagementGridComponent implements OnInit, AfterViewInit, AfterView
ngAfterViewInit() {
this.tableEl = this.table._elementRef.nativeElement;
- this.isScrollButtonsVisible = this.tableWrapper.nativeElement.offsetWidth - this.table._elementRef.nativeElement.offsetWidth < -5;
this.checkMaxRight();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/05: Merge remote-tracking branch
'origin/develop' 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 DATALAB-2160
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 66a0f79ef96f0f17b17436454e1343703bcfd3c8
Merge: 9a47cdf d7fb015
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Fri Nov 20 14:30:40 2020 +0200
Merge remote-tracking branch 'origin/develop' into develop
.../schedulers/CheckInfrastructureStatusScheduler.java | 4 +++-
.../resources/resources-grid/resources-grid.component.ts | 9 ++++-----
.../confirmation-dialog/confirmation-dialog.component.html | 2 +-
.../confirmation-dialog/confirmation-dialog.component.ts | 14 +++++---------
4 files changed, 13 insertions(+), 16 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 04/05: [DATALAB-2160]: Fixed disabled gear icon
if Notebook contains Data Engine
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DATALAB-2160
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit b052ba974af3027d86d94ef1c9d364b2869b2d4b
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Fri Nov 20 17:29:30 2020 +0200
[DATALAB-2160]: Fixed disabled gear icon if Notebook contains Data Engine
---
.../management/management-grid/management-grid.component.ts | 1 -
1 file changed, 1 deletion(-)
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 55dbd96..938b7d6 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
@@ -120,7 +120,6 @@ export class ManagementGridComponent implements OnInit, AfterViewInit, AfterView
ngAfterViewInit() {
this.tableEl = this.table._elementRef.nativeElement;
this.isScrollButtonsVisible = this.tableWrapper.nativeElement.offsetWidth - this.table._elementRef.nativeElement.offsetWidth < -5;
- console.log(this.tableWrapper.nativeElement.offsetWidth, this.table._elementRef.nativeElement.offsetWidth);
this.checkMaxRight();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 03/05: [DATALAB-2160]: Fixed disabled gear icon
if Notebook contains Data Engine
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DATALAB-2160
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 0d850dac898941364c1e19362c9e1386fdf6024d
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Fri Nov 20 17:29:08 2020 +0200
[DATALAB-2160]: Fixed disabled gear icon if Notebook contains Data Engine
---
.../management-grid/management-grid.component.html | 4 +-
.../management-grid/management-grid.component.ts | 50 ++++++++++++++++------
2 files changed, 40 insertions(+), 14 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 649713d..523cd59 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
@@ -306,7 +306,7 @@
<ng-container matColumnDef="scrollButtons">
<td mat-footer-cell *matFooterCellDef colspan="9" class="buttons-wrap">
- <div class="buttons" [ngStyle]="{'width.px': wrapper.offsetWidth}" [hidden]="!tableEl['offsetWidth']">
+ <div class="buttons" [ngStyle]="{'width.px': tableWrapperWidth }" [hidden]="!tableWrapperWidth">
<div class="button-container">
<button mat-mini-fab aria-label="Scroll left"
(click)="sctollTo('left')"
@@ -335,7 +335,7 @@
<tr [hidden]="allFilteredEnvironmentData?.length" mat-footer-row *matFooterRowDef="['placeholder']" class="info"></tr>
- <tr [hidden]="!tableEl['offsetWidth'] || tableWrapper.offsetWidth - tableEl['offsetWidth'] > -1 || !allFilteredEnvironmentData?.length" mat-footer-row *matFooterRowDef="['scrollButtons']; sticky: true" class="info"></tr>
+ <tr [hidden]="!tableEl || !tableEl['offsetWidth'] || tableWrapper.offsetWidth - tableEl['offsetWidth'] > -16 || !allFilteredEnvironmentData?.length" mat-footer-row *matFooterRowDef="['scrollButtons']; sticky: true" class="info"></tr>
</table>
</div>
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 679c9e9..55dbd96 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
@@ -17,19 +17,30 @@
* under the License.
*/
-import {Component, OnInit, ViewChild, Input, Output, EventEmitter, Inject, HostListener} from '@angular/core';
+import {
+ Component,
+ OnInit,
+ ViewChild,
+ Input,
+ Output,
+ EventEmitter,
+ Inject,
+ HostListener,
+ AfterViewInit,
+ AfterViewChecked,
+ ApplicationRef
+} from '@angular/core';
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { ToastrService } from 'ngx-toastr';
import { HealthStatusService } from '../../../core/services';
import { SortUtils } from '../../../core/util';
-import { ConfirmationDialogType } from '../../../shared';
-import { ConfirmationDialogComponent } from '../../../shared/modal-dialog/confirmation-dialog';
import { EnvironmentsDataService } from '../management-data.service';
import { EnvironmentModel, ManagementConfigModel } from '../management.model';
import {ProgressBarService} from '../../../core/services/progress-bar.service';
import {DetailDialogComponent} from '../../../resources/exploratory/detail-dialog';
import {BehaviorSubject, Subject, timer} from 'rxjs';
+import { ChangeDetectorRef } from '@angular/core';
export interface ManageAction {
action: string;
@@ -46,7 +57,7 @@ export interface ManageAction {
'../../../resources/computational/computational-resources-list/computational-resources-list.component.scss'
]
})
-export class ManagementGridComponent implements OnInit {
+export class ManagementGridComponent implements OnInit, AfterViewInit, AfterViewChecked {
allEnvironmentData: Array<any>;
allFilteredEnvironmentData: Array<any>;
loading: boolean = false;
@@ -69,10 +80,11 @@ export class ManagementGridComponent implements OnInit {
@ViewChild('wrapper') wrapper;
@ViewChild('pageWrapper') pageWrapper;
@ViewChild('table') table;
+ private tableWrapperWidth: number;
@HostListener('window:resize', ['$event'])
onResize(event) {
- this.isScrollButtonsVisible = this.tableWrapper.nativeElement.offsetWidth - this.table._elementRef.nativeElement.offsetWidth < 0;
+ this.isScrollButtonsVisible = this.tableWrapper.nativeElement.offsetWidth - this.table._elementRef.nativeElement.offsetWidth < -5;
this.checkMaxRight();
}
@@ -96,16 +108,30 @@ export class ManagementGridComponent implements OnInit {
public toastr: ToastrService,
public dialog: MatDialog,
private progressBarService: ProgressBarService,
+ private cdRef: ChangeDetectorRef,
+ private applicationRef: ApplicationRef,
) { }
ngOnInit() {
- this.getEnvironmentData();
- timer(1000)
- .subscribe(() => {
- this.isScrollButtonsVisible = this.tableWrapper.nativeElement.offsetWidth - this.table._elementRef.nativeElement.offsetWidth < 0;
- this.checkMaxRight();
- this.tableEl = this.table._elementRef.nativeElement;
- });
+ this.getEnvironmentData();
+ }
+
+
+ ngAfterViewInit() {
+ this.tableEl = this.table._elementRef.nativeElement;
+ this.isScrollButtonsVisible = this.tableWrapper.nativeElement.offsetWidth - this.table._elementRef.nativeElement.offsetWidth < -5;
+ console.log(this.tableWrapper.nativeElement.offsetWidth, this.table._elementRef.nativeElement.offsetWidth);
+ this.checkMaxRight();
+ }
+
+ ngAfterViewChecked() {
+ if (this.tableWrapperWidth !== this.wrapper.nativeElement.offsetWidth) {
+ this.tableWrapperWidth = this.wrapper.nativeElement.offsetWidth;
+ timer(100).subscribe(_ => {
+ this.applicationRef.tick();
+ });
+ }
+ this.cdRef.detectChanges();
}
getEnvironmentData() {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org