From 6cd6a615fdbc6462bfe46a06a9d1017470fad059 Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Wed, 22 Nov 2023 17:32:05 +0100 Subject: [PATCH] (search) Add data-filter to body as a data attribute For future shenanigans ;D --- .../java/nu/marginalia/search/model/SearchFilters.java | 9 ++++++++- .../main/resources/templates/search/search-results.hdb | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/model/SearchFilters.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/model/SearchFilters.java index b2fc210b..b9b73261 100644 --- a/code/services-application/search-service/src/main/java/nu/marginalia/search/model/SearchFilters.java +++ b/code/services-application/search-service/src/main/java/nu/marginalia/search/model/SearchFilters.java @@ -5,24 +5,30 @@ import nu.marginalia.WebsiteUrl; import nu.marginalia.search.command.SearchJsParameter; import nu.marginalia.search.command.SearchParameters; -import javax.annotation.Nullable; import java.util.List; /** Models the search filters displayed next to the search results */ public class SearchFilters { private final WebsiteUrl url; + @Getter + public final String currentFilter; + // These are necessary for the renderer to access the data @Getter public final RemoveJsOption removeJsOption; @Getter public final List> filterGroups; + + public SearchFilters(WebsiteUrl url, SearchParameters parameters) { this.url = url; removeJsOption = new RemoveJsOption(parameters); + currentFilter = parameters.profile().filterId; + filterGroups = List.of( List.of( new Filter("No Filter", SearchProfile.NO_FILTER, parameters), @@ -44,6 +50,7 @@ public class SearchFilters { ) ); + } public class RemoveJsOption { diff --git a/code/services-application/search-service/src/main/resources/templates/search/search-results.hdb b/code/services-application/search-service/src/main/resources/templates/search/search-results.hdb index 5c51cd69..d37231cb 100644 --- a/code/services-application/search-service/src/main/resources/templates/search/search-results.hdb +++ b/code/services-application/search-service/src/main/resources/templates/search/search-results.hdb @@ -10,7 +10,7 @@ - +