From 52fee2b2dfe7b969b5a44f7010838343aad298e0 Mon Sep 17 00:00:00 2001 From: venu1278 Date: Wed, 17 Feb 2016 13:01:05 +0530 Subject: [PATCH] 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() {