Skip to content

Add support for the SearchBuilder extension #137

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@
import javax.validation.constraints.Min;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

Expand Down Expand Up @@ -69,6 +75,11 @@ public class DataTablesInput {
*/
private Map<String, Set<String>> searchPanes;

/**
* Input for the <a href="https://datatables.net/extensions/searchbuilder/">SearchBuilder extension</a>
*/
private SearchBuilder searchBuilder;

/**
*
* @return a {@link Map} of {@link Column} indexed by name
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@ public class DataTablesOutput<T> {
@JsonView(View.class)
private SearchPanes searchPanes;

/**
* Output for the <a href="https://datatables.net/extensions/searchbuilder/">SearchBuilder extension</a>
*/
@JsonView(View.class)
private SearchBuilder searchBuilder;

/**
* Optional: If an error occurs during the running of the server-side processing script, you can
* inform the user of this error by passing back the error message to be displayed using this
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package org.springframework.data.jpa.datatables.mapping;

import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.util.List;
import java.util.Map;

/**
* <a href="https://datatables.net/extensions/searchbuilder/predefined">Predefined Searches</a>
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
public class SearchBuilder {
private List<Criteria> criteria;
private String logic;

@Data
@NoArgsConstructor
@AllArgsConstructor
public static class Criteria {
private String condition;
private String data;
private String origData;
private String type;
private List<String> value;
private String logic;
private List<Criteria> criteria;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.springframework.data.jpa.datatables.PredicateBuilder;
import org.springframework.data.jpa.datatables.mapping.DataTablesInput;
import org.springframework.data.jpa.datatables.mapping.DataTablesOutput;
import org.springframework.data.jpa.datatables.mapping.SearchBuilder;
import org.springframework.data.jpa.datatables.mapping.SearchPanes;
import org.springframework.data.jpa.repository.support.JpaEntityInformation;
import org.springframework.data.jpa.repository.support.QuerydslJpaRepository;
Expand Down Expand Up @@ -101,6 +102,10 @@ public <R> DataTablesOutput<R> findAll(DataTablesInput input, Predicate addition
if (input.getSearchPanes() != null) {
output.setSearchPanes(computeSearchPanes(input, predicate));
}

if (input.getSearchBuilder() != null) {
output.setSearchBuilder(input.getSearchBuilder());
}
} catch (Exception e) {
output.setError(e.toString());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ public <R> DataTablesOutput<R> findAll(DataTablesInput input,
if (input.getSearchPanes() != null) {
output.setSearchPanes(computeSearchPanes(input, specification));
}

if (input.getSearchBuilder() != null) {
output.setSearchBuilder(input.getSearchBuilder());
}
} catch (Exception e) {
output.setError(e.toString());
}
Expand Down