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/10/20 10:07:20 UTC
[incubator-datalab] branch DATALAB-2105 created (now 67b3b5f)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a change to branch DATALAB-2105
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
at 67b3b5f [DATALAB-2105]: Fixed confirm filter action is disabled if paste value
This branch includes the following new commits:
new 67b3b5f [DATALAB-2105]: Fixed confirm filter action is disabled if paste value
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@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/01: [DATALAB-2105]: Fixed confirm filter
action is disabled if paste value
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DATALAB-2105
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 67b3b5ff49e3784e8022f40191862665e0cf4025
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Tue Oct 20 13:06:52 2020 +0300
[DATALAB-2105]: Fixed confirm filter action is disabled if paste value
---
.../management/management-grid/management-grid.component.html | 2 +-
.../management/management-grid/management-grid.component.ts | 6 +++++-
.../reports/reporting/reporting-grid/reporting-grid.component.html | 4 ++--
.../reports/reporting/reporting-grid/reporting-grid.component.ts | 4 ++++
.../exploratory/install-libraries/install-libraries.component.html | 3 +--
.../exploratory/install-libraries/install-libraries.component.ts | 5 +++++
.../src/app/resources/resources-grid/resources-grid.component.html | 2 +-
.../src/app/resources/resources-grid/resources-grid.component.ts | 4 ++++
8 files changed, 23 insertions(+), 7 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 6293c8d..43fcfd7 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
@@ -244,7 +244,7 @@
<ng-container matColumnDef="type-filter" sticky>
<th mat-header-cell *matHeaderCellDef class="filter-row-item">
<input placeholder="Filter by name" type="text" class="form-control filter-field"
- [value]="filterForm.type" (input)="filterForm.type = $event.target['value']" (keyup)="checkFilters()"/>
+ [value]="filterForm.type" (input)="onFilterNameUpdate($event.target['value'])"/>
</th>
</ng-container>
<ng-container matColumnDef="project-filter" sticky>
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 47a3eca..7a59bd1 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
@@ -254,8 +254,12 @@ export class ManagementGridComponent implements OnInit {
const statuses = ['terminating', 'stopping', 'starting', 'creating', 'configuring', 'reconfiguring'];
return resources.filter(resource => statuses.includes(resource.status)).length;
}
-}
+ public onFilterNameUpdate(targetElement: any) {
+ this.filterForm.type = targetElement;
+ this.checkFilters();
+ }
+}
@Component({
selector: 'confirm-dialog',
diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html
index 77fd72a..a84fc57 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html
@@ -186,8 +186,8 @@
<div class="input-wrapper">
<input #nameFilter type="text" placeholder="Filter by environment name"
class="form-control filter-field"
- [value]="filtered?.datalabId" (input)="filteredReportData.datalabId = $event.target['value']"
- (keyup)="checkFilters()"/>
+ [value]="filtered?.datalabId" (input)="onFilterNameUpdate($event.target['value'])"
+ />
</div>
</th>
</ng-container>
diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
index 00175c1..4782f71 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
@@ -203,6 +203,10 @@ export class ReportingGridComponent implements OnInit, AfterViewInit {
this.tableWrapper.nativeElement.scrollLeft + 2 <= this.table._elementRef.nativeElement.offsetWidth;
return this.isMaxRight.next(arg);
}
+ }
+ public onFilterNameUpdate(targetElement: any) {
+ this.filteredReportData.datalabId = targetElement;
+ this.checkFilters();
}
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
index e237687..c3da0d0 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
@@ -250,8 +250,7 @@
<input
placeholder="Filter by library name"
[value]="filterModel.name"
- (input)="filterModel.name = $event.target['value']"
- (keyup)="checkFilters()"
+ (input)="onFilterNameUpdate($event.target['value'])"
type="text"
class="form-control filter-field"
/>
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
index f47a6c3..c8dc1ca 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
@@ -526,6 +526,11 @@ export class InstallLibrariesComponent implements OnInit, OnDestroy {
this.isVersionInvalid = false;
}
}
+
+ public onFilterNameUpdate(targetElement: any) {
+ this.filterModel.name = targetElement;
+ this.checkFilters();
+ }
}
@Component({
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
index 6fd6cab..dde1cdd 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
@@ -259,7 +259,7 @@
<th mat-header-cell *matHeaderCellDef class="name-col filter-row-item">
<div class="input-wrapper">
<input placeholder="Filter by environment name" type="text" class="form-control filter-field"
- [value]="filterForm.name" (input)="filterForm.name = $event.target['value']" (keyup)="checkFilters()"/>
+ [value]="filterForm.name" (input)="onFilterNameUpdate($event.target['value'])"/>
</div>
</th>
</ng-container>
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 b6a48af..5530850 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
@@ -453,4 +453,8 @@ export class ResourcesGridComponent implements OnInit {
return null;
}
+ public onFilterNameUpdate(targetElement: any) {
+ this.filterForm.name = targetElement;
+ this.checkFilters();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org