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

Unify search behaviour in Mgmt UI (#1319)

Browse Source 
Signed-off-by: Stanislav Trailov <stanislav.trailov@bosch.io>
This commit is contained in:
Stanislav Trailov
2023-02-09 08:45:24 +02:00
committed by GitHub
parent 64bc0417b1
commit 06dca2d5d2
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsFilterParams.java
View File

@@ -14,6 +14,7 @@ import java.util.Objects;
import org.eclipse.hawkbit.ui.common.data.providers.DistributionSetManagementStateDataProvider; import org.eclipse.hawkbit.ui.common.data.providers.DistributionSetManagementStateDataProvider;
import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects;
import org.springframework.util.StringUtils;
/** /**
* Filter params for {@link DistributionSetManagementStateDataProvider}. * Filter params for {@link DistributionSetManagementStateDataProvider}.
@@ -37,7 +38,7 @@ public class DsFilterParams implements Serializable {
* String as search text * String as search text
*/ */
public DsFilterParams(final String searchText) { public DsFilterParams(final String searchText) {
this.searchText = searchText; this.searchText = !StringUtils.isEmpty(searchText) ? String.format("%%%s%%", searchText) : null;
} }
/** /**
@@ -64,7 +65,7 @@ public class DsFilterParams implements Serializable {
* String * String
*/ */
public void setSearchText(final String searchText) { public void setSearchText(final String searchText) {
this.searchText = searchText; this.searchText = !StringUtils.isEmpty(searchText) ? String.format("%%%s%%", searchText) : null;
} }
@Override @Override

5
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/SwFilterParams.java
View File

@@ -14,6 +14,7 @@ import java.util.Objects;
import org.eclipse.hawkbit.ui.common.data.providers.SoftwareModuleDataProvider; import org.eclipse.hawkbit.ui.common.data.providers.SoftwareModuleDataProvider;
import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects;
import org.springframework.util.StringUtils;
/** /**
* Filter params for {@link SoftwareModuleDataProvider}. * Filter params for {@link SoftwareModuleDataProvider}.
@@ -44,7 +45,7 @@ public class SwFilterParams implements Serializable {
*/ */
public SwFilterParams(final String searchText, final Long softwareModuleTypeId, public SwFilterParams(final String searchText, final Long softwareModuleTypeId,
final Long lastSelectedDistributionId) { final Long lastSelectedDistributionId) {
this.searchText = searchText; this.searchText = !StringUtils.isEmpty(searchText) ? String.format("%%%s%%", searchText) : null;
this.softwareModuleTypeId = softwareModuleTypeId; this.softwareModuleTypeId = softwareModuleTypeId;
this.lastSelectedDistributionId = lastSelectedDistributionId; this.lastSelectedDistributionId = lastSelectedDistributionId;
} }
@@ -77,7 +78,7 @@ public class SwFilterParams implements Serializable {
* String * String
*/ */
public void setSearchText(final String searchText) { public void setSearchText(final String searchText) {
this.searchText = searchText; this.searchText = !StringUtils.isEmpty(searchText) ? String.format("%%%s%%", searchText) : null;
} }
/** /**