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/09/25 14:48:56 UTC
[incubator-dlab] 05/08: [DLAB-472]: added filtering configuration
to management grid
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit a5798437ad9c231d602e10ff337909e5bff67f19
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed Sep 25 16:02:03 2019 +0300
[DLAB-472]: added filtering configuration to management grid
---
.../management/management-grid/management-grid.component.ts | 12 ++++--------
.../src/main/resources/webapp/src/assets/styles/_theme.scss | 1 -
2 files changed, 4 insertions(+), 9 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 32e960f..ff62f99 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
@@ -89,8 +89,6 @@ export class ManagementGridComponent implements OnInit {
}
public applyFilter(config) {
- debugger;
-
let filteredData = this.allEnvironmentData;
const containsStatus = (list, selectedItems) => {
@@ -101,10 +99,11 @@ export class ManagementGridComponent implements OnInit {
if (config) {
filteredData = filteredData.filter(item => {
- // const isName = item.name.toLowerCase().indexOf(config.name.toLowerCase()) !== -1;
- const isName = 1;
+ const isUser = config.users.length > 0 ? (config.users.indexOf(item.user) !== -1) : true;
+ const isType = item.type.toLowerCase().indexOf(config.type.toLowerCase()) !== -1;
const isStatus = config.statuses.length > 0 ? (config.statuses.indexOf(item.status) !== -1) : (config.type !== 'active');
const isShape = config.shapes.length > 0 ? (config.shapes.indexOf(item.shape) !== -1) : true;
+ const isProject = config.projects.length > 0 ? (config.projects.indexOf(item.project) !== -1) : true;
const modifiedResources = containsStatus(item.resources, config.resources);
let isResources = config.resources.length > 0 ? (modifiedResources.length > 0) : true;
@@ -117,12 +116,9 @@ export class ManagementGridComponent implements OnInit {
isResources = true;
}
- return isName && isStatus && isShape && isResources;
-
+ return isUser && isType && isStatus && isShape && isProject && isResources;
});
-
}
-
this.allEnvironmentData = filteredData;
}
diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
index 956f606..e694771 100644
--- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
+++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
@@ -567,7 +567,6 @@ mat-horizontal-stepper {
.mat-table {
.header-row {
-
th.mat-header-cell {
font-size: 15px;
font-family: 'Open Sans', sans-serif;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org