lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Clearing the search field should keep the focus

Browse Source 
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
This commit is contained in:
venu1278
2016-02-16 15:52:04 +05:30
parent ce05ef93c0
commit 600a16def8
5 changed files with 40 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java
View File

@@ -79,7 +79,7 @@ public class SoftwareModuleTable extends AbstractTable {
@Autowired @Autowired
private UploadViewAcceptCriteria uploadViewAcceptCriteria; private UploadViewAcceptCriteria uploadViewAcceptCriteria;
private Boolean isFilterEvent = false; private Boolean isFilterApplied = false;
/** /**
* Initialize the filter layout. * Initialize the filter layout.
@@ -107,19 +107,18 @@ public class SoftwareModuleTable extends AbstractTable {
if (filterEvent == SMFilterEvent.FILTER_BY_TYPE || filterEvent == SMFilterEvent.FILTER_BY_TEXT if (filterEvent == SMFilterEvent.FILTER_BY_TYPE || filterEvent == SMFilterEvent.FILTER_BY_TEXT
|| filterEvent == SMFilterEvent.REMOVER_FILTER_BY_TYPE || filterEvent == SMFilterEvent.REMOVER_FILTER_BY_TYPE
|| filterEvent == SMFilterEvent.REMOVER_FILTER_BY_TEXT) { || filterEvent == SMFilterEvent.REMOVER_FILTER_BY_TEXT) {
final Map<String, Object> queryConfig = prepareQueryConfigFilters();
if(prepareQueryConfigFilters().size()<1 && isFilterEvent==false){ if(queryConfig.size()<1 && isFilterApplied==false){
UI.getCurrent().access(() -> ((LazyQueryContainer) getContainerDataSource()).refresh()); UI.getCurrent().access(() -> ((LazyQueryContainer) getContainerDataSource()).refresh());
}else { }else {
refreshFilter(); refreshFilter();
if(prepareQueryConfigFilters().size()<1){ if(queryConfig.size()<1){
isFilterEvent = false; isFilterApplied = false;
}else{ }else{
isFilterEvent = true; isFilterApplied = true;
} }
} }
//refreshFilter();
} }
}); });
} }

13
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java
View File

@@ -115,7 +115,7 @@ public class DistributionSetTable extends AbstractTable {
@Autowired @Autowired
private transient TargetManagement targetManagement; private transient TargetManagement targetManagement;
private Boolean isFilterEvent = false; private Boolean isFilterApplied = false;
/** /**
* Initialize the component. * Initialize the component.
@@ -616,19 +616,18 @@ public class DistributionSetTable extends AbstractTable {
if (event == DistributionTableFilterEvent.FILTER_BY_TEXT if (event == DistributionTableFilterEvent.FILTER_BY_TEXT
|| event == DistributionTableFilterEvent.REMOVE_FILTER_BY_TEXT || event == DistributionTableFilterEvent.REMOVE_FILTER_BY_TEXT
|| event == DistributionTableFilterEvent.FILTER_BY_TAG) { || event == DistributionTableFilterEvent.FILTER_BY_TAG) {
if(prepareQueryConfigFilters().size()<1 && isFilterEvent==false){ final Map<String, Object> queryConfig = prepareQueryConfigFilters();
if(queryConfig.size()<1 && isFilterApplied==false){
UI.getCurrent().access(() -> ((LazyQueryContainer) getContainerDataSource()).refresh()); UI.getCurrent().access(() -> ((LazyQueryContainer) getContainerDataSource()).refresh());
}else { }else {
UI.getCurrent().access(() -> refreshFilter()); UI.getCurrent().access(() -> refreshFilter());
if(prepareQueryConfigFilters().size()<1){ if(queryConfig.size()<1){
isFilterEvent = false; isFilterApplied = false;
}else{ }else{
isFilterEvent = true; isFilterApplied = true;
} }
} }
// UI.getCurrent().access(() -> refreshFilter());
} }
} }

18
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java
View File

@@ -95,7 +95,7 @@ public class SwModuleTable extends AbstractTable {
@Autowired @Autowired
private ArtifactDetailsLayout artifactDetailsLayout; private ArtifactDetailsLayout artifactDetailsLayout;
private Boolean isFilterEvent = false; private Boolean isFilterApplied = false;
/** /**
* Initialize the filter layout. * Initialize the filter layout.
@@ -126,23 +126,21 @@ public class SwModuleTable extends AbstractTable {
if (filterEvent == SMFilterEvent.FILTER_BY_TYPE || filterEvent == SMFilterEvent.FILTER_BY_TEXT if (filterEvent == SMFilterEvent.FILTER_BY_TYPE || filterEvent == SMFilterEvent.FILTER_BY_TEXT
|| filterEvent == SMFilterEvent.REMOVER_FILTER_BY_TYPE || filterEvent == SMFilterEvent.REMOVER_FILTER_BY_TYPE
|| filterEvent == SMFilterEvent.REMOVER_FILTER_BY_TEXT) { || filterEvent == SMFilterEvent.REMOVER_FILTER_BY_TEXT) {
if(prepareQueryConfigFilters().size()<2 && isFilterEvent==false){ final Map<String, Object> queryConfig = prepareQueryConfigFilters();
if(queryConfig.size()<2 && isFilterApplied==false){
UI.getCurrent().access(() -> ((LazyQueryContainer) getContainerDataSource()).refresh()); UI.getCurrent().access(() -> ((LazyQueryContainer) getContainerDataSource()).refresh());
}else { }else {
UI.getCurrent().access(() ->{ refreshFilter(); UI.getCurrent().access(() ->{ refreshFilter();
styleTableOnDistSelection(); styleTableOnDistSelection();
}); });
if(prepareQueryConfigFilters().size()<2){ if(queryConfig.size()<2){
isFilterEvent = false; isFilterApplied = false;
}else{ }else{
isFilterEvent = true; isFilterApplied = true;
} }
} }
}
/* refreshFilter();
styleTableOnDistSelection();*/
}
}); });
} }

23
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java
View File

@@ -113,7 +113,7 @@ public class DistributionTable extends AbstractTable {
private Button distributinPinnedBtn; private Button distributinPinnedBtn;
private Boolean isFilterEvent = false; private Boolean isFilterApplied = false;
/** /**
* Initialize the distribution table. * Initialize the distribution table.
@@ -142,24 +142,23 @@ public class DistributionTable extends AbstractTable {
if (event == DistributionTableFilterEvent.FILTER_BY_TEXT if (event == DistributionTableFilterEvent.FILTER_BY_TEXT
|| event == DistributionTableFilterEvent.REMOVE_FILTER_BY_TEXT || event == DistributionTableFilterEvent.REMOVE_FILTER_BY_TEXT
|| event == DistributionTableFilterEvent.FILTER_BY_TAG) { || event == DistributionTableFilterEvent.FILTER_BY_TAG) {
if(((boolean)prepareQueryConfigFilters().get(SPUIDefinitions.FILTER_BY_NO_TAG)==false) final Map<String, Object> queryConfig = prepareQueryConfigFilters();
&& ((List)prepareQueryConfigFilters().get(SPUIDefinitions.FILTER_BY_TAG)).isEmpty() if(((boolean)queryConfig.get(SPUIDefinitions.FILTER_BY_NO_TAG)==false)
&& prepareQueryConfigFilters().size()<3 && ((List)queryConfig.get(SPUIDefinitions.FILTER_BY_TAG)).isEmpty()
&& isFilterEvent==false){ && queryConfig.size()<3
&& isFilterApplied==false){
UI.getCurrent().access(() -> ((LazyQueryContainer) getContainerDataSource()).refresh()); UI.getCurrent().access(() -> ((LazyQueryContainer) getContainerDataSource()).refresh());
}else { }else {
UI.getCurrent().access(() -> refreshFilter()); UI.getCurrent().access(() -> refreshFilter());
if(((boolean)prepareQueryConfigFilters().get(SPUIDefinitions.FILTER_BY_NO_TAG)==false) if(((boolean)queryConfig.get(SPUIDefinitions.FILTER_BY_NO_TAG)==false)
&& ((List)prepareQueryConfigFilters().get(SPUIDefinitions.FILTER_BY_TAG)).isEmpty() && ((List)queryConfig.get(SPUIDefinitions.FILTER_BY_TAG)).isEmpty()
&& prepareQueryConfigFilters().size()<3){ && queryConfig.size()<3){
isFilterEvent = false; isFilterApplied = false;
}else{ }else{
isFilterEvent = true; isFilterApplied = true;
} }
} }
// UI.getCurrent().access(() -> refreshFilter());
} }
} }

17
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java
View File

@@ -140,7 +140,7 @@ public class TargetTable extends AbstractTable implements Handler {
private ShortcutAction actionSelectAll; private ShortcutAction actionSelectAll;
private ShortcutAction actionUnSelectAll; private ShortcutAction actionUnSelectAll;
private Boolean isFilterEvent = Boolean.FALSE;; private Boolean isFilterApplied = Boolean.FALSE;;
@Override @Override
@@ -211,17 +211,18 @@ public class TargetTable extends AbstractTable implements Handler {
void onEvent(final TargetFilterEvent filterEvent) { void onEvent(final TargetFilterEvent filterEvent) {
UI.getCurrent().access(() -> { UI.getCurrent().access(() -> {
if (checkFilterEvent(filterEvent)) { if (checkFilterEvent(filterEvent)) {
if(((boolean)prepareQueryConfigFilters().get(SPUIDefinitions.FILTER_BY_NO_TAG)==false) final Map<String, Object> queryConfiguration = prepareQueryConfigFilters();
&& prepareQueryConfigFilters().size()<2 if(((boolean)queryConfiguration.get(SPUIDefinitions.FILTER_BY_NO_TAG)==false)
&& isFilterEvent==Boolean.FALSE){ && queryConfiguration.size()<2
&& isFilterApplied==Boolean.FALSE){
((LazyQueryContainer) getContainerDataSource()).refresh(); ((LazyQueryContainer) getContainerDataSource()).refresh();
}else { }else {
refreshFilter(); refreshFilter();
if(prepareQueryConfigFilters().size()<2){ if(queryConfiguration.size()<2){
isFilterEvent = Boolean.FALSE; isFilterApplied = Boolean.FALSE;
}else{ }else{
isFilterEvent = Boolean.TRUE; isFilterApplied = Boolean.TRUE;
} }
} }