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/10/07 12:16:43 UTC
[incubator-dlab] 02/04: [DLAB-1161]: added resource name parameter
on management grid filtering
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1119-2
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 150b3407b70e5d00de9261da0138fc6d69644038
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Mon Oct 7 13:09:38 2019 +0300
[DLAB-1161]: added resource name parameter on management grid filtering
---
.../management/management-grid/management-grid.component.ts | 5 +++--
services/self-service/src/main/resources/webapp/src/styles.scss | 2 +-
2 files changed, 4 insertions(+), 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 b691b6c..fd37096 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
@@ -110,7 +110,8 @@ export class ManagementGridComponent implements OnInit {
filteredData = filteredData.filter(item => {
const isUser = config.users.length > 0 ? (config.users.indexOf(item.user) !== -1) : true;
- const isType = item.type.toLowerCase().indexOf(config.type.toLowerCase()) !== -1;
+ const isTypeName = item.name ?
+ item.name.toLowerCase().indexOf(config.type.toLowerCase()) !== -1 : 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;
@@ -126,7 +127,7 @@ export class ManagementGridComponent implements OnInit {
isResources = true;
}
- return isUser && isType && isStatus && isShape && isProject && isResources;
+ return isUser && isTypeName && isStatus && isShape && isProject && isResources;
});
}
this.allFilteredEnvironmentData = filteredData;
diff --git a/services/self-service/src/main/resources/webapp/src/styles.scss b/services/self-service/src/main/resources/webapp/src/styles.scss
index 7e65cb8..c5462d2 100644
--- a/services/self-service/src/main/resources/webapp/src/styles.scss
+++ b/services/self-service/src/main/resources/webapp/src/styles.scss
@@ -319,7 +319,7 @@ input[type='number'] {
}
.mr-10 {
- margin-right: 10px;
+ margin-right: 10px !important;
}
.full-height {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org