Skip to content
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.

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

Support search view #35

Merged
merged 1 commit into from
Jul 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ repositories {
}

dependencies {
implementation platform('run.halo.tools.platform:plugin:2.10.0-SNAPSHOT')
implementation platform('run.halo.tools.platform:plugin:2.17.0-SNAPSHOT')
compileOnly 'run.halo.app:api'

testImplementation 'run.halo.app:api'
Expand Down Expand Up @@ -45,5 +45,5 @@ tasks.named('build').configure {
}

halo {
version = "2.12.0"
version = "2.17.0"
}
47 changes: 47 additions & 0 deletions src/main/java/run/halo/search/widget/SearchView.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package run.halo.search.widget;

import org.springframework.context.annotation.Bean;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
import org.springframework.web.reactive.function.server.*;
import reactor.core.publisher.Mono;
import run.halo.app.search.SearchOption;
import run.halo.app.search.SearchService;

import java.util.Map;

@Component
public class SearchView {

private final SearchService searchService;

public SearchView(SearchService searchService) {
this.searchService = searchService;
}

@Bean
RouterFunction<ServerResponse> searchView() {
return RouterFunctions.route()
.GET("/search", RequestPredicates.accept(MediaType.TEXT_HTML), this::performSearch)
.build();
}

private Mono<ServerResponse> performSearch(ServerRequest serverRequest) {
var keyword = serverRequest.queryParam("keyword").orElse("");
var limit = serverRequest.queryParam("limit")
.map(Integer::parseInt)
.orElse(10);
var includeTypes = serverRequest.queryParams().get("includeTypes");
var option = new SearchOption();
option.setKeyword(keyword);
option.setLimit(limit);
option.setFilterExposed(true);
option.setFilterPublished(true);
option.setFilterRecycled(false);
option.setIncludeTypes(includeTypes);
var result = searchService.search(option);
return ServerResponse.ok().render("search", Map.of(
"searchResult", result
));
}
}
2 changes: 1 addition & 1 deletion src/main/resources/plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
"store.halo.run/app-id": "app-DlacW"
spec:
enabled: true
requires: ">=2.10.0"
requires: ">=2.17.0"
author:
name: Halo
website: https://github.com/halo-dev
Expand Down