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:09:07 UTC
[incubator-dlab] branch DLAB-2045 created (now f3611b7)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a change to branch DLAB-2045
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at f3611b7 [DLAB-2045]: Fixed issue with filtering by name on all filters
This branch includes the following new commits:
new d5a5713 Merge remote-tracking branch 'origin/develop' into develop
new f3611b7 [DLAB-2045]: Fixed issue with filtering by name on all filters
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-2045]: Fixed issue with filtering by
name on all filters
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2045
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit f3611b748a684801bf5e5155a8dc041abd8b1f8f
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Mon Sep 14 13:07:26 2020 +0300
[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
[incubator-dlab] 01/02: 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 DLAB-2045
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit d5a5713af1f1c4391ccbc0871202687719e8c7c1
Merge: f2fb35e 443bdff
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Mon Sep 14 12:39:00 2020 +0300
Merge remote-tracking branch 'origin/develop' into develop
.../src/general/lib/azure/actions_lib.py | 25 +++--
.../src/general/lib/os/debian/common_lib.py | 10 +-
.../java/com/epam/dlab/backendapi/dao/BaseDAO.java | 49 +++++----
.../com/epam/dlab/backendapi/dao/IndexCreator.java | 1 -
.../backendapi/resources/EndpointResource.java | 69 +++++--------
.../dlab/backendapi/resources/ProjectResource.java | 115 +++++++++------------
.../webapp/src/app/administration/project/index.ts | 20 ++--
.../project-list/project-list.component.html | 2 +-
.../project/project-list/project-list.component.ts | 3 +-
.../administration/project/project.component.html | 6 +-
.../administration/project/project.component.ts | 1 +
.../webapp/src/app/administration/roles/index.ts | 18 ++--
.../app/administration/roles/roles.component.html | 3 +-
.../app/administration/roles/roles.component.ts | 3 +-
...utational-resource-create-dialog.component.html | 2 +-
.../create-environment.component.html | 49 +++++----
.../create-environment.component.scss | 4 +
.../create-environment.component.ts | 3 +
.../install-libraries.component.ts | 2 +-
.../main/resources/webapp/src/app/shared/index.ts | 1 +
.../src/app/shared/{ => inform-message}/index.ts | 13 ++-
.../inform-message.component.css} | 16 ++-
.../inform-message/inform-message.component.html | 21 ++++
.../inform-message.component.ts} | 24 ++++-
24 files changed, 261 insertions(+), 199 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org