Skip to content

Bug Fix: Base Url in Url Parameter #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 18, 2024
Merged

Bug Fix: Base Url in Url Parameter #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions vaadin-simple-grid-filter/src/main/java/software/xdev/vaadin/FilterComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
import com.vaadin.flow.data.value.ValueChangeMode;
import com.vaadin.flow.router.BeforeEnterEvent;
import com.vaadin.flow.router.BeforeEnterObserver;
import com.vaadin.flow.router.Location;
import com.vaadin.flow.router.QueryParameters;

import software.xdev.vaadin.builder.CustomizableFilterBuilder;
Expand Down Expand Up @@ -1303,26 +1304,35 @@ private void addQueryParameter(final ChipBadgeExtension<FilterCondition<T, ?>> c

this.ui.getPage().fetchCurrentURL(currentUrl ->
{
String separator = "?";
final String questionMarkCharacter = "?";
String querySeperator = "";
String currentQuery = currentUrl.getQuery();

if(currentUrl.getQuery() != null)
if(currentQuery != null)
{
querySeperator = "&";
}
else
{
separator = "&";
currentQuery = "";
}

this.ui
.getPage()
.getHistory()
.replaceState(
null,
currentUrl
+ separator
+ QueryParameterUtil.createQueryParameterString(
this.identifier,
filterCondition,
chipBadge.getBadgeId(),
chipBadge.isBtnDeleteEnabled(),
chipBadge.isBtnEditEnabled()));
new Location(
currentUrl.getPath()
+ questionMarkCharacter
+ currentQuery
+ querySeperator
+ QueryParameterUtil.createQueryParameterString(
this.identifier,
filterCondition,
chipBadge.getBadgeId(),
chipBadge.isBtnDeleteEnabled(),
chipBadge.isBtnEditEnabled())));
});
}

Expand Down