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/14 10:10:48 UTC
[incubator-dlab] branch develop updated: [DLAB-2045]: Fixed issue
with filtering by name on all filters (#903)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new 29cac26 [DLAB-2045]: Fixed issue with filtering by name on all filters (#903)
29cac26 is described below
commit 29cac262597f45ec8a2e8951eb1481c7784c6a57
Author: Dmytro Gnatyshyn <42...@users.noreply.github.com>
AuthorDate: Mon Sep 14 13:10:36 2020 +0300
[DLAB-2045]: Fixed issue with filtering by name on all filters (#903)
[DLAB-2045]: Fixed issue with filtering by name on all filters
---
.../management/management-grid/management-grid.component.html | 8 ++++----
.../management/management-grid/management-grid.component.scss | 5 +++++
.../reporting/reporting-grid/reporting-grid.component.html | 2 +-
.../install-libraries/install-libraries.component.html | 1 +
.../app/resources/resources-grid/resources-grid.component.html | 2 +-
5 files changed, 12 insertions(+), 6 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 1235be3..fcb6901 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
@@ -232,7 +232,7 @@
<ng-container matColumnDef="type-filter" sticky>
<th mat-header-cell *matHeaderCellDef class="filter-row-item">
<input placeholder="Filter by environment name" type="text" class="form-control filter-field"
- [value]="filterForm.type" (input)="filterForm.type = $event.target['value']"/>
+ [value]="filterForm.type" (input)="filterForm.type = $event.target['value']" (keyup)="checkFilters()"/>
</th>
</ng-container>
<ng-container matColumnDef="project-filter" sticky>
@@ -277,11 +277,11 @@
<ng-container matColumnDef="placeholder">
- <td mat-footer-cell *matFooterCellDef colspan="8" class="info">
- <div
+ <td mat-footer-cell *matFooterCellDef colspan="8">
+ <div class="info"
*ngIf="(!allFilteredEnvironmentData) && !filtering || (allFilteredEnvironmentData?.length == 0) && !filtering">
To start working, please, create new environment</div>
- <div *ngIf="(allFilteredEnvironmentData?.length == 0) && filtering">No matches found</div>
+ <div *ngIf="(allFilteredEnvironmentData?.length == 0) && filtering" class="info">No matches found</div>
</td>
</ng-container>
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss
index 9d9f4b5..40b7bf1 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss
@@ -184,6 +184,11 @@ table.management {
padding-left: 15px;
}
}
+
+ .info{
+ padding: 40px;
+ text-align: center;
+ }
}
.computation{
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 1d6ffaf..081c711 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
@@ -199,7 +199,7 @@
<th mat-header-cell *matHeaderCellDef class="filter-row-item">
<div class="input-wrapper">
<input #nameFilter type="text" placeholder="Filter by environment name" class="form-control filter-field"
- [value]="filtered?.dlab_id" (input)="filteredReportData.dlab_id = $event.target['value']" />
+ [value]="filtered?.dlab_id" (input)="filteredReportData.dlab_id = $event.target['value']" (keyup)="checkFilters()"/>
</div>
</th>
</ng-container>
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 8caee40..a1b8e7e 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
@@ -251,6 +251,7 @@
placeholder="Filter by library name"
[value]="filterModel.name"
(input)="filterModel.name = $event.target['value']"
+ (keyup)="checkFilters()"
type="text"
class="form-control filter-field"
/>
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 0e14343..c29bf51 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']" />
+ [value]="filterForm.name" (input)="filterForm.name = $event.target['value']" (keyup)="checkFilters()"/>
</div>
</th>
</ng-container>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org