From 7fe23aa8a002603712b388adb71fa615937c3f3a Mon Sep 17 00:00:00 2001 From: venu1278 Date: Fri, 12 Feb 2016 14:34:17 +0530 Subject: [PATCH 1/3] clearing the search field should keep the focus. Signed-off-by: venu1278 --- .../smtable/SoftwareModuleTable.java | 36 ++++++++++--- .../dstable/DistributionSetTable.java | 41 +++++++++++---- .../distributions/smtable/SwModuleTable.java | 46 ++++++++++++----- .../management/dstable/DistributionTable.java | 51 ++++++++++++++----- .../management/targettable/TargetTable.java | 19 ++++++- 5 files changed, 150 insertions(+), 43 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java index a4f8a8f70..bd9291473 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java @@ -78,6 +78,8 @@ public class SoftwareModuleTable extends AbstractTable { @Autowired private UploadViewAcceptCriteria uploadViewAcceptCriteria; + + private Boolean isFilterEvent = false; /** * Initialize the filter layout. @@ -105,7 +107,19 @@ public class SoftwareModuleTable extends AbstractTable { if (filterEvent == SMFilterEvent.FILTER_BY_TYPE || filterEvent == SMFilterEvent.FILTER_BY_TEXT || filterEvent == SMFilterEvent.REMOVER_FILTER_BY_TYPE || filterEvent == SMFilterEvent.REMOVER_FILTER_BY_TEXT) { - refreshFilter(); + + if(prepareQueryConfigFilters().size()<1 && isFilterEvent==false){ + UI.getCurrent().access(() -> ((LazyQueryContainer) getContainerDataSource()).refresh()); + + }else { + refreshFilter(); + if(prepareQueryConfigFilters().size()<1){ + isFilterEvent = false; + }else{ + isFilterEvent = true; + } + } + //refreshFilter(); } }); } @@ -127,12 +141,7 @@ public class SoftwareModuleTable extends AbstractTable { */ @Override protected Container createContainer() { - final Map queryConfiguration = new HashMap(); - artifactUploadState.getSoftwareModuleFilters().getSearchText() - .ifPresent(value -> queryConfiguration.put(SPUIDefinitions.FILTER_BY_TEXT, value)); - - artifactUploadState.getSoftwareModuleFilters().getSoftwareModuleType() - .ifPresent(type -> queryConfiguration.put(SPUIDefinitions.BY_SOFTWARE_MODULE_TYPE, type)); + final Map queryConfiguration = prepareQueryConfigFilters(); final BeanQueryFactory swQF = new BeanQueryFactory( BaseSwModuleBeanQuery.class); @@ -142,6 +151,19 @@ public class SoftwareModuleTable extends AbstractTable { new LazyQueryDefinition(true, SPUIDefinitions.PAGE_SIZE, "swId"), swQF); return container; } + + private Map prepareQueryConfigFilters() { + final Map queryConfig = new HashMap(); + artifactUploadState.getSoftwareModuleFilters().getSearchText() + .ifPresent(value -> queryConfig.put(SPUIDefinitions.FILTER_BY_TEXT, value)); + + artifactUploadState.getSoftwareModuleFilters().getSoftwareModuleType() + .ifPresent(type -> queryConfig.put(SPUIDefinitions.BY_SOFTWARE_MODULE_TYPE, type)); + + return queryConfig; + } + + @Override protected void addContainerProperties(final Container container) { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java index 107ed0299..a6f55cbc2 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java @@ -114,6 +114,8 @@ public class DistributionSetTable extends AbstractTable { @Autowired private transient TargetManagement targetManagement; + + private Boolean isFilterEvent = false; /** * Initialize the component. @@ -157,15 +159,8 @@ public class DistributionSetTable extends AbstractTable { @Override protected Container createContainer() { - final Map queryConfiguration = new HashMap(); - manageDistUIState.getManageDistFilters().getSearchText() - .ifPresent(value -> queryConfiguration.put(SPUIDefinitions.FILTER_BY_TEXT, value)); - - if (null != manageDistUIState.getManageDistFilters().getClickedDistSetType()) { - queryConfiguration.put(SPUIDefinitions.FILTER_BY_DISTRIBUTION_SET_TYPE, - manageDistUIState.getManageDistFilters().getClickedDistSetType()); - } - + final Map queryConfiguration = prepareQueryConfigFilters(); + final BeanQueryFactory distributionQF = new BeanQueryFactory( ManageDistBeanQuery.class); distributionQF.setQueryConfiguration(queryConfiguration); @@ -175,6 +170,20 @@ public class DistributionSetTable extends AbstractTable { return distContainer; } + + private Map prepareQueryConfigFilters() { + final Map queryConfig = new HashMap(); + manageDistUIState.getManageDistFilters().getSearchText() + .ifPresent(value -> queryConfig.put(SPUIDefinitions.FILTER_BY_TEXT, value)); + + if (null != manageDistUIState.getManageDistFilters().getClickedDistSetType()) { + queryConfig.put(SPUIDefinitions.FILTER_BY_DISTRIBUTION_SET_TYPE, + manageDistUIState.getManageDistFilters().getClickedDistSetType()); + } + + return queryConfig; + } + /* * (non-Javadoc) @@ -612,7 +621,19 @@ public class DistributionSetTable extends AbstractTable { if (event == DistributionTableFilterEvent.FILTER_BY_TEXT || event == DistributionTableFilterEvent.REMOVE_FILTER_BY_TEXT || event == DistributionTableFilterEvent.FILTER_BY_TAG) { - UI.getCurrent().access(() -> refreshFilter()); + if(prepareQueryConfigFilters().size()<1 && isFilterEvent==false){ + UI.getCurrent().access(() -> ((LazyQueryContainer) getContainerDataSource()).refresh()); + + }else { + UI.getCurrent().access(() -> refreshFilter()); + if(prepareQueryConfigFilters().size()<1){ + isFilterEvent = false; + }else{ + isFilterEvent = true; + } + } + + // UI.getCurrent().access(() -> refreshFilter()); } } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java index 17ee9b8af..6d5b7dcd5 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java @@ -94,6 +94,8 @@ public class SwModuleTable extends AbstractTable { @Autowired private ArtifactDetailsLayout artifactDetailsLayout; + + private Boolean isFilterEvent = false; /** * Initialize the filter layout. @@ -124,9 +126,23 @@ public class SwModuleTable extends AbstractTable { if (filterEvent == SMFilterEvent.FILTER_BY_TYPE || filterEvent == SMFilterEvent.FILTER_BY_TEXT || filterEvent == SMFilterEvent.REMOVER_FILTER_BY_TYPE || filterEvent == SMFilterEvent.REMOVER_FILTER_BY_TEXT) { - refreshFilter(); - styleTableOnDistSelection(); - } + if(prepareQueryConfigFilters().size()<2 && isFilterEvent==false){ + UI.getCurrent().access(() -> ((LazyQueryContainer) getContainerDataSource()).refresh()); + + }else { + UI.getCurrent().access(() ->{ refreshFilter(); + styleTableOnDistSelection(); + }); + if(prepareQueryConfigFilters().size()<2){ + isFilterEvent = false; + }else{ + isFilterEvent = true; + } + } + + /* refreshFilter(); + styleTableOnDistSelection();*/ + } }); } @@ -177,15 +193,7 @@ public class SwModuleTable extends AbstractTable { */ @Override protected Container createContainer() { - final Map queryConfiguration = new HashMap(); - manageDistUIState.getSoftwareModuleFilters().getSearchText() - .ifPresent(value -> queryConfiguration.put(SPUIDefinitions.FILTER_BY_TEXT, value)); - - manageDistUIState.getSoftwareModuleFilters().getSoftwareModuleType() - .ifPresent(type -> queryConfiguration.put(SPUIDefinitions.BY_SOFTWARE_MODULE_TYPE, type)); - - manageDistUIState.getLastSelectedDistribution().ifPresent( - distIdName -> queryConfiguration.put(SPUIDefinitions.ORDER_BY_DISTRIBUTION, distIdName.getId())); + final Map queryConfiguration = prepareQueryConfigFilters(); final BeanQueryFactory swQF = new BeanQueryFactory( SwModuleBeanQuery.class); @@ -195,6 +203,20 @@ public class SwModuleTable extends AbstractTable { new LazyQueryDefinition(true, SPUIDefinitions.PAGE_SIZE, "swId"), swQF); return container; } + + private Map prepareQueryConfigFilters() { + final Map queryConfig = new HashMap(); + manageDistUIState.getSoftwareModuleFilters().getSearchText() + .ifPresent(value -> queryConfig.put(SPUIDefinitions.FILTER_BY_TEXT, value)); + + manageDistUIState.getSoftwareModuleFilters().getSoftwareModuleType() + .ifPresent(type -> queryConfig.put(SPUIDefinitions.BY_SOFTWARE_MODULE_TYPE, type)); + + manageDistUIState.getLastSelectedDistribution().ifPresent( + distIdName -> queryConfig.put(SPUIDefinitions.ORDER_BY_DISTRIBUTION, distIdName.getId())); + + return queryConfig; + } /* * (non-Javadoc) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java index 225407b84..e8f9e57ac 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java @@ -112,6 +112,8 @@ public class DistributionTable extends AbstractTable { private Boolean isDistPinned = false; private Button distributinPinnedBtn; + + private Boolean isFilterEvent = false; /** * Initialize the distribution table. @@ -140,7 +142,24 @@ public class DistributionTable extends AbstractTable { if (event == DistributionTableFilterEvent.FILTER_BY_TEXT || event == DistributionTableFilterEvent.REMOVE_FILTER_BY_TEXT || event == DistributionTableFilterEvent.FILTER_BY_TAG) { - UI.getCurrent().access(() -> refreshFilter()); + if(((boolean)prepareQueryConfigFilters().get(SPUIDefinitions.FILTER_BY_NO_TAG)==false) + && ((List)prepareQueryConfigFilters().get(SPUIDefinitions.FILTER_BY_TAG)).isEmpty() + && prepareQueryConfigFilters().size()<3 + && isFilterEvent==false){ + UI.getCurrent().access(() -> ((LazyQueryContainer) getContainerDataSource()).refresh()); + + }else { + UI.getCurrent().access(() -> refreshFilter()); + if(((boolean)prepareQueryConfigFilters().get(SPUIDefinitions.FILTER_BY_NO_TAG)==false) + && ((List)prepareQueryConfigFilters().get(SPUIDefinitions.FILTER_BY_TAG)).isEmpty() + && prepareQueryConfigFilters().size()<3){ + isFilterEvent = false; + }else{ + isFilterEvent = true; + } + } + + // UI.getCurrent().access(() -> refreshFilter()); } } @@ -219,18 +238,8 @@ public class DistributionTable extends AbstractTable { */ @Override protected Container createContainer() { - final Map queryConfiguration = new HashMap(); - managementUIState.getDistributionTableFilters().getSearchText() - .ifPresent(value -> queryConfiguration.put(SPUIDefinitions.FILTER_BY_TEXT, value)); - managementUIState.getDistributionTableFilters().getPinnedTargetId() - .ifPresent(value -> queryConfiguration.put(SPUIDefinitions.ORDER_BY_PINNED_TARGET, value)); - final List list = new ArrayList(); - queryConfiguration.put(SPUIDefinitions.FILTER_BY_NO_TAG, - managementUIState.getDistributionTableFilters().isNoTagSelected()); - if (!managementUIState.getDistributionTableFilters().getDistSetTags().isEmpty()) { - list.addAll(managementUIState.getDistributionTableFilters().getDistSetTags()); - } - queryConfiguration.put(SPUIDefinitions.FILTER_BY_TAG, list); + final Map queryConfiguration = prepareQueryConfigFilters(); + final BeanQueryFactory distributionQF = new BeanQueryFactory( DistributionBeanQuery.class); distributionQF.setQueryConfiguration(queryConfiguration); @@ -239,6 +248,22 @@ public class DistributionTable extends AbstractTable { distributionQF); return distributionContainer; } + + private Map prepareQueryConfigFilters() { + final Map queryConfig = new HashMap(); + managementUIState.getDistributionTableFilters().getSearchText() + .ifPresent(value -> queryConfig.put(SPUIDefinitions.FILTER_BY_TEXT, value)); + managementUIState.getDistributionTableFilters().getPinnedTargetId() + .ifPresent(value -> queryConfig.put(SPUIDefinitions.ORDER_BY_PINNED_TARGET, value)); + final List list = new ArrayList(); + queryConfig.put(SPUIDefinitions.FILTER_BY_NO_TAG, + managementUIState.getDistributionTableFilters().isNoTagSelected()); + if (!managementUIState.getDistributionTableFilters().getDistSetTags().isEmpty()) { + list.addAll(managementUIState.getDistributionTableFilters().getDistSetTags()); + } + queryConfig.put(SPUIDefinitions.FILTER_BY_TAG, list); + return queryConfig; + } /* * (non-Javadoc) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java index 62276346e..186207c50 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java @@ -15,6 +15,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; @@ -138,6 +139,9 @@ public class TargetTable extends AbstractTable implements Handler { private Boolean isTargetPinned = Boolean.FALSE; private ShortcutAction actionSelectAll; private ShortcutAction actionUnSelectAll; + + private Boolean isFilterEvent = Boolean.FALSE;; + @Override @PostConstruct @@ -207,7 +211,20 @@ public class TargetTable extends AbstractTable implements Handler { void onEvent(final TargetFilterEvent filterEvent) { UI.getCurrent().access(() -> { if (checkFilterEvent(filterEvent)) { - refreshFilter(); + if(((boolean)prepareQueryConfigFilters().get(SPUIDefinitions.FILTER_BY_NO_TAG)==false) + && prepareQueryConfigFilters().size()<2 + && isFilterEvent==Boolean.FALSE){ + ((LazyQueryContainer) getContainerDataSource()).refresh(); + + }else { + refreshFilter(); + if(prepareQueryConfigFilters().size()<2){ + isFilterEvent = Boolean.FALSE; + }else{ + isFilterEvent = Boolean.TRUE; + } + } + eventBus.publish(this, ManagementUIEvent.TARGET_TABLE_FILTER); } }); From 600a16def8d1dde564a40c8da81c4691a4ffd742 Mon Sep 17 00:00:00 2001 From: venu1278 Date: Tue, 16 Feb 2016 15:52:04 +0530 Subject: [PATCH 2/3] Clearing the search field should keep the focus Signed-off-by: venu1278 --- .../smtable/SoftwareModuleTable.java | 13 +++++------ .../dstable/DistributionSetTable.java | 13 +++++------ .../distributions/smtable/SwModuleTable.java | 18 +++++++-------- .../management/dstable/DistributionTable.java | 23 +++++++++---------- .../management/targettable/TargetTable.java | 17 +++++++------- 5 files changed, 40 insertions(+), 44 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java index bd9291473..940e3b27a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java @@ -79,7 +79,7 @@ public class SoftwareModuleTable extends AbstractTable { @Autowired private UploadViewAcceptCriteria uploadViewAcceptCriteria; - private Boolean isFilterEvent = false; + private Boolean isFilterApplied = false; /** * Initialize the filter layout. @@ -107,19 +107,18 @@ public class SoftwareModuleTable extends AbstractTable { if (filterEvent == SMFilterEvent.FILTER_BY_TYPE || filterEvent == SMFilterEvent.FILTER_BY_TEXT || filterEvent == SMFilterEvent.REMOVER_FILTER_BY_TYPE || filterEvent == SMFilterEvent.REMOVER_FILTER_BY_TEXT) { - - if(prepareQueryConfigFilters().size()<1 && isFilterEvent==false){ + final Map queryConfig = prepareQueryConfigFilters(); + if(queryConfig.size()<1 && isFilterApplied==false){ UI.getCurrent().access(() -> ((LazyQueryContainer) getContainerDataSource()).refresh()); }else { refreshFilter(); - if(prepareQueryConfigFilters().size()<1){ - isFilterEvent = false; + if(queryConfig.size()<1){ + isFilterApplied = false; }else{ - isFilterEvent = true; + isFilterApplied = true; } } - //refreshFilter(); } }); } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java index 575f0a367..f62504911 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java @@ -115,7 +115,7 @@ public class DistributionSetTable extends AbstractTable { @Autowired private transient TargetManagement targetManagement; - private Boolean isFilterEvent = false; + private Boolean isFilterApplied = false; /** * Initialize the component. @@ -616,19 +616,18 @@ public class DistributionSetTable extends AbstractTable { if (event == DistributionTableFilterEvent.FILTER_BY_TEXT || event == DistributionTableFilterEvent.REMOVE_FILTER_BY_TEXT || event == DistributionTableFilterEvent.FILTER_BY_TAG) { - if(prepareQueryConfigFilters().size()<1 && isFilterEvent==false){ + final Map queryConfig = prepareQueryConfigFilters(); + if(queryConfig.size()<1 && isFilterApplied==false){ UI.getCurrent().access(() -> ((LazyQueryContainer) getContainerDataSource()).refresh()); }else { UI.getCurrent().access(() -> refreshFilter()); - if(prepareQueryConfigFilters().size()<1){ - isFilterEvent = false; + if(queryConfig.size()<1){ + isFilterApplied = false; }else{ - isFilterEvent = true; + isFilterApplied = true; } } - - // UI.getCurrent().access(() -> refreshFilter()); } } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java index 6d5b7dcd5..dd8216dfd 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java @@ -95,7 +95,7 @@ public class SwModuleTable extends AbstractTable { @Autowired private ArtifactDetailsLayout artifactDetailsLayout; - private Boolean isFilterEvent = false; + private Boolean isFilterApplied = false; /** * Initialize the filter layout. @@ -126,23 +126,21 @@ public class SwModuleTable extends AbstractTable { if (filterEvent == SMFilterEvent.FILTER_BY_TYPE || filterEvent == SMFilterEvent.FILTER_BY_TEXT || filterEvent == SMFilterEvent.REMOVER_FILTER_BY_TYPE || filterEvent == SMFilterEvent.REMOVER_FILTER_BY_TEXT) { - if(prepareQueryConfigFilters().size()<2 && isFilterEvent==false){ + final Map queryConfig = prepareQueryConfigFilters(); + if(queryConfig.size()<2 && isFilterApplied==false){ UI.getCurrent().access(() -> ((LazyQueryContainer) getContainerDataSource()).refresh()); }else { UI.getCurrent().access(() ->{ refreshFilter(); - styleTableOnDistSelection(); + styleTableOnDistSelection(); }); - if(prepareQueryConfigFilters().size()<2){ - isFilterEvent = false; + if(queryConfig.size()<2){ + isFilterApplied = false; }else{ - isFilterEvent = true; + isFilterApplied = true; } } - - /* refreshFilter(); - styleTableOnDistSelection();*/ - } + } }); } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java index e8f9e57ac..ab1ccdeac 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java @@ -113,7 +113,7 @@ public class DistributionTable extends AbstractTable { private Button distributinPinnedBtn; - private Boolean isFilterEvent = false; + private Boolean isFilterApplied = false; /** * Initialize the distribution table. @@ -142,24 +142,23 @@ public class DistributionTable extends AbstractTable { if (event == DistributionTableFilterEvent.FILTER_BY_TEXT || event == DistributionTableFilterEvent.REMOVE_FILTER_BY_TEXT || event == DistributionTableFilterEvent.FILTER_BY_TAG) { - if(((boolean)prepareQueryConfigFilters().get(SPUIDefinitions.FILTER_BY_NO_TAG)==false) - && ((List)prepareQueryConfigFilters().get(SPUIDefinitions.FILTER_BY_TAG)).isEmpty() - && prepareQueryConfigFilters().size()<3 - && isFilterEvent==false){ + final Map queryConfig = prepareQueryConfigFilters(); + if(((boolean)queryConfig.get(SPUIDefinitions.FILTER_BY_NO_TAG)==false) + && ((List)queryConfig.get(SPUIDefinitions.FILTER_BY_TAG)).isEmpty() + && queryConfig.size()<3 + && isFilterApplied==false){ UI.getCurrent().access(() -> ((LazyQueryContainer) getContainerDataSource()).refresh()); }else { UI.getCurrent().access(() -> refreshFilter()); - if(((boolean)prepareQueryConfigFilters().get(SPUIDefinitions.FILTER_BY_NO_TAG)==false) - && ((List)prepareQueryConfigFilters().get(SPUIDefinitions.FILTER_BY_TAG)).isEmpty() - && prepareQueryConfigFilters().size()<3){ - isFilterEvent = false; + if(((boolean)queryConfig.get(SPUIDefinitions.FILTER_BY_NO_TAG)==false) + && ((List)queryConfig.get(SPUIDefinitions.FILTER_BY_TAG)).isEmpty() + && queryConfig.size()<3){ + isFilterApplied = false; }else{ - isFilterEvent = true; + isFilterApplied = true; } } - - // UI.getCurrent().access(() -> refreshFilter()); } } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java index 186207c50..17256cca8 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java @@ -140,7 +140,7 @@ public class TargetTable extends AbstractTable implements Handler { private ShortcutAction actionSelectAll; private ShortcutAction actionUnSelectAll; - private Boolean isFilterEvent = Boolean.FALSE;; + private Boolean isFilterApplied = Boolean.FALSE;; @Override @@ -211,17 +211,18 @@ public class TargetTable extends AbstractTable implements Handler { void onEvent(final TargetFilterEvent filterEvent) { UI.getCurrent().access(() -> { if (checkFilterEvent(filterEvent)) { - if(((boolean)prepareQueryConfigFilters().get(SPUIDefinitions.FILTER_BY_NO_TAG)==false) - && prepareQueryConfigFilters().size()<2 - && isFilterEvent==Boolean.FALSE){ + final Map queryConfiguration = prepareQueryConfigFilters(); + if(((boolean)queryConfiguration.get(SPUIDefinitions.FILTER_BY_NO_TAG)==false) + && queryConfiguration.size()<2 + && isFilterApplied==Boolean.FALSE){ ((LazyQueryContainer) getContainerDataSource()).refresh(); - + }else { refreshFilter(); - if(prepareQueryConfigFilters().size()<2){ - isFilterEvent = Boolean.FALSE; + if(queryConfiguration.size()<2){ + isFilterApplied = Boolean.FALSE; }else{ - isFilterEvent = Boolean.TRUE; + isFilterApplied = Boolean.TRUE; } } From 52fee2b2dfe7b969b5a44f7010838343aad298e0 Mon Sep 17 00:00:00 2001 From: venu1278 Date: Wed, 17 Feb 2016 13:01:05 +0530 Subject: [PATCH 3/3] Drag and drop handles wrong item Signed-off-by: venu1278 --- .../smtable/SoftwareModuleTable.java | 16 ++----------- .../smtable/SoftwareModuleTableHeader.java | 6 +++-- .../dstable/DistributionSetTable.java | 15 +----------- .../dstable/DistributionSetTableHeader.java | 7 +++--- .../distributions/smtable/SwModuleTable.java | 22 ++++-------------- .../smtable/SwModuleTableHeader.java | 6 +++-- .../management/dstable/DistributionTable.java | 23 +++---------------- .../dstable/DistributionTableHeader.java | 6 +++-- .../management/targettable/TargetTable.java | 19 ++------------- .../targettable/TargetTableHeader.java | 6 +++-- 10 files changed, 32 insertions(+), 94 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java index 940e3b27a..f1e302fdc 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java @@ -79,8 +79,7 @@ public class SoftwareModuleTable extends AbstractTable { @Autowired private UploadViewAcceptCriteria uploadViewAcceptCriteria; - private Boolean isFilterApplied = false; - + /** * Initialize the filter layout. */ @@ -107,18 +106,7 @@ public class SoftwareModuleTable extends AbstractTable { if (filterEvent == SMFilterEvent.FILTER_BY_TYPE || filterEvent == SMFilterEvent.FILTER_BY_TEXT || filterEvent == SMFilterEvent.REMOVER_FILTER_BY_TYPE || filterEvent == SMFilterEvent.REMOVER_FILTER_BY_TEXT) { - final Map queryConfig = prepareQueryConfigFilters(); - if(queryConfig.size()<1 && isFilterApplied==false){ - UI.getCurrent().access(() -> ((LazyQueryContainer) getContainerDataSource()).refresh()); - - }else { - refreshFilter(); - if(queryConfig.size()<1){ - isFilterApplied = false; - }else{ - isFilterApplied = true; - } - } + refreshFilter(); } }); } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableHeader.java index b08c4defb..b7db0096a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableHeader.java @@ -219,8 +219,10 @@ public class SoftwareModuleTableHeader extends AbstractTableHeader { */ @Override protected void resetSearchText() { - artifactUploadState.getSoftwareModuleFilters().setSearchText(null); - eventbus.publish(this, SMFilterEvent.REMOVER_FILTER_BY_TEXT); + if(artifactUploadState.getSoftwareModuleFilters().getSearchText().isPresent()){ + artifactUploadState.getSoftwareModuleFilters().setSearchText(null); + eventbus.publish(this, SMFilterEvent.REMOVER_FILTER_BY_TEXT); + } } /* diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java index f62504911..32223e995 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java @@ -115,8 +115,6 @@ public class DistributionSetTable extends AbstractTable { @Autowired private transient TargetManagement targetManagement; - private Boolean isFilterApplied = false; - /** * Initialize the component. */ @@ -616,18 +614,7 @@ public class DistributionSetTable extends AbstractTable { if (event == DistributionTableFilterEvent.FILTER_BY_TEXT || event == DistributionTableFilterEvent.REMOVE_FILTER_BY_TEXT || event == DistributionTableFilterEvent.FILTER_BY_TAG) { - final Map queryConfig = prepareQueryConfigFilters(); - if(queryConfig.size()<1 && isFilterApplied==false){ - UI.getCurrent().access(() -> ((LazyQueryContainer) getContainerDataSource()).refresh()); - - }else { - UI.getCurrent().access(() -> refreshFilter()); - if(queryConfig.size()<1){ - isFilterApplied = false; - }else{ - isFilterApplied = true; - } - } + UI.getCurrent().access(() -> refreshFilter()); } } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableHeader.java index d64f07ca0..a39f32f6e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableHeader.java @@ -170,9 +170,10 @@ public class DistributionSetTableHeader extends AbstractTableHeader { @Override protected void resetSearchText() { - manageDistUIstate.getManageDistFilters().setSearchText(null); - eventbus.publish(this, DistributionTableFilterEvent.REMOVE_FILTER_BY_TEXT); - + if(manageDistUIstate.getManageDistFilters().getSearchText().isPresent()){ + manageDistUIstate.getManageDistFilters().setSearchText(null); + eventbus.publish(this, DistributionTableFilterEvent.REMOVE_FILTER_BY_TEXT); + } } @Override diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java index dd8216dfd..90d6a74df 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java @@ -95,9 +95,7 @@ public class SwModuleTable extends AbstractTable { @Autowired private ArtifactDetailsLayout artifactDetailsLayout; - private Boolean isFilterApplied = false; - - /** + /** * Initialize the filter layout. */ @PostConstruct @@ -126,21 +124,9 @@ public class SwModuleTable extends AbstractTable { if (filterEvent == SMFilterEvent.FILTER_BY_TYPE || filterEvent == SMFilterEvent.FILTER_BY_TEXT || filterEvent == SMFilterEvent.REMOVER_FILTER_BY_TYPE || filterEvent == SMFilterEvent.REMOVER_FILTER_BY_TEXT) { - final Map queryConfig = prepareQueryConfigFilters(); - if(queryConfig.size()<2 && isFilterApplied==false){ - UI.getCurrent().access(() -> ((LazyQueryContainer) getContainerDataSource()).refresh()); - - }else { - UI.getCurrent().access(() ->{ refreshFilter(); - styleTableOnDistSelection(); - }); - if(queryConfig.size()<2){ - isFilterApplied = false; - }else{ - isFilterApplied = true; - } - } - } + refreshFilter(); + styleTableOnDistSelection(); + } }); } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableHeader.java index 1eae1297b..d8d018e27 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableHeader.java @@ -203,8 +203,10 @@ public class SwModuleTableHeader extends AbstractTableHeader { */ @Override protected void resetSearchText() { - manageDistUIState.getSoftwareModuleFilters().setSearchText(null); - eventbus.publish(this, SMFilterEvent.REMOVER_FILTER_BY_TEXT); + if(manageDistUIState.getSoftwareModuleFilters().getSearchText().isPresent()){ + manageDistUIState.getSoftwareModuleFilters().setSearchText(null); + eventbus.publish(this, SMFilterEvent.REMOVER_FILTER_BY_TEXT); + } } /* diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java index ab1ccdeac..53e723c7d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java @@ -113,8 +113,7 @@ public class DistributionTable extends AbstractTable { private Button distributinPinnedBtn; - private Boolean isFilterApplied = false; - + /** * Initialize the distribution table. */ @@ -142,24 +141,8 @@ public class DistributionTable extends AbstractTable { if (event == DistributionTableFilterEvent.FILTER_BY_TEXT || event == DistributionTableFilterEvent.REMOVE_FILTER_BY_TEXT || event == DistributionTableFilterEvent.FILTER_BY_TAG) { - final Map queryConfig = prepareQueryConfigFilters(); - if(((boolean)queryConfig.get(SPUIDefinitions.FILTER_BY_NO_TAG)==false) - && ((List)queryConfig.get(SPUIDefinitions.FILTER_BY_TAG)).isEmpty() - && queryConfig.size()<3 - && isFilterApplied==false){ - UI.getCurrent().access(() -> ((LazyQueryContainer) getContainerDataSource()).refresh()); - - }else { - UI.getCurrent().access(() -> refreshFilter()); - if(((boolean)queryConfig.get(SPUIDefinitions.FILTER_BY_NO_TAG)==false) - && ((List)queryConfig.get(SPUIDefinitions.FILTER_BY_TAG)).isEmpty() - && queryConfig.size()<3){ - isFilterApplied = false; - }else{ - isFilterApplied = true; - } - } - } + UI.getCurrent().access(() -> refreshFilter()); + } } @EventBusListenerMethod(scope = EventScope.SESSION) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableHeader.java index 1f28293d2..32a3e914d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableHeader.java @@ -210,8 +210,10 @@ public class DistributionTableHeader extends AbstractTableHeader { */ @Override protected void resetSearchText() { - managementUIState.getDistributionTableFilters().setSearchText(null); - eventbus.publish(this, DistributionTableFilterEvent.REMOVE_FILTER_BY_TEXT); + if( managementUIState.getDistributionTableFilters().getSearchText().isPresent()){ + managementUIState.getDistributionTableFilters().setSearchText(null); + eventbus.publish(this, DistributionTableFilterEvent.REMOVE_FILTER_BY_TEXT); + } } /* diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java index 17256cca8..6fc7f103b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java @@ -140,8 +140,7 @@ public class TargetTable extends AbstractTable implements Handler { private ShortcutAction actionSelectAll; private ShortcutAction actionUnSelectAll; - private Boolean isFilterApplied = Boolean.FALSE;; - + @Override @PostConstruct @@ -211,21 +210,7 @@ public class TargetTable extends AbstractTable implements Handler { void onEvent(final TargetFilterEvent filterEvent) { UI.getCurrent().access(() -> { if (checkFilterEvent(filterEvent)) { - final Map queryConfiguration = prepareQueryConfigFilters(); - if(((boolean)queryConfiguration.get(SPUIDefinitions.FILTER_BY_NO_TAG)==false) - && queryConfiguration.size()<2 - && isFilterApplied==Boolean.FALSE){ - ((LazyQueryContainer) getContainerDataSource()).refresh(); - - }else { - refreshFilter(); - if(queryConfiguration.size()<2){ - isFilterApplied = Boolean.FALSE; - }else{ - isFilterApplied = Boolean.TRUE; - } - } - + refreshFilter(); eventBus.publish(this, ManagementUIEvent.TARGET_TABLE_FILTER); } }); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableHeader.java index a1b094f99..159c169d7 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableHeader.java @@ -258,8 +258,10 @@ public class TargetTableHeader extends AbstractTableHeader { @Override protected void resetSearchText() { - managementUIState.getTargetTableFilters().setSearchText(null); - eventBus.publish(this, TargetFilterEvent.REMOVE_FILTER_BY_TEXT); + if(managementUIState.getTargetTableFilters().getSearchText().isPresent()){ + managementUIState.getTargetTableFilters().setSearchText(null); + eventBus.publish(this, TargetFilterEvent.REMOVE_FILTER_BY_TEXT); + } } private String getSearchText() {