diff --git a/autodoc/src/main/java/com/bakdata/conquery/Constants.java b/autodoc/src/main/java/com/bakdata/conquery/Constants.java index d4fe43690f..291680ed0d 100644 --- a/autodoc/src/main/java/com/bakdata/conquery/Constants.java +++ b/autodoc/src/main/java/com/bakdata/conquery/Constants.java @@ -16,10 +16,20 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; +import com.bakdata.conquery.apiv1.ExecutionStatus; import com.bakdata.conquery.apiv1.FilterTemplate; +import com.bakdata.conquery.apiv1.FullExecutionStatus; import com.bakdata.conquery.apiv1.IdLabel; +import com.bakdata.conquery.apiv1.KeyValue; import com.bakdata.conquery.apiv1.MetaDataPatch; +import com.bakdata.conquery.apiv1.OverviewExecutionStatus; +import com.bakdata.conquery.apiv1.frontend.FERoot; +import com.bakdata.conquery.apiv1.frontend.FEValue; +import com.bakdata.conquery.apiv1.query.CQElement; import com.bakdata.conquery.apiv1.query.QueryDescription; +import com.bakdata.conquery.apiv1.query.concept.filter.CQTable; +import com.bakdata.conquery.apiv1.query.concept.filter.FilterValue; +import com.bakdata.conquery.apiv1.query.concept.filter.ValidityDateContainer; import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.io.jackson.serializer.MetaIdRef; import com.bakdata.conquery.io.jackson.serializer.MetaIdRefCollection; @@ -27,20 +37,7 @@ import com.bakdata.conquery.io.jackson.serializer.NsIdRefCollection; import com.bakdata.conquery.model.Base; import com.bakdata.conquery.model.Group; -import com.bakdata.conquery.apiv1.frontend.FERoot; -import com.bakdata.conquery.apiv1.frontend.FEValue; -import com.bakdata.conquery.models.config.auth.AuthenticationRealmFactory; -import com.bakdata.conquery.models.config.auth.AuthorizationConfig; -import com.bakdata.conquery.apiv1.KeyValue; import com.bakdata.conquery.models.common.Range; -import com.bakdata.conquery.models.datasets.concepts.Concept; -import com.bakdata.conquery.models.datasets.concepts.Connector; -import com.bakdata.conquery.models.datasets.concepts.ValidityDate; -import com.bakdata.conquery.models.datasets.concepts.conditions.CTCondition; -import com.bakdata.conquery.models.datasets.concepts.filters.Filter; -import com.bakdata.conquery.models.datasets.concepts.select.Select; -import com.bakdata.conquery.models.datasets.concepts.select.concept.UniversalSelect; -import com.bakdata.conquery.models.datasets.concepts.tree.ConceptTreeChild; import com.bakdata.conquery.models.config.APIConfig; import com.bakdata.conquery.models.config.CSVConfig; import com.bakdata.conquery.models.config.ClusterConfig; @@ -54,21 +51,24 @@ import com.bakdata.conquery.models.config.StandaloneConfig; import com.bakdata.conquery.models.config.XodusConfig; import com.bakdata.conquery.models.config.XodusStoreFactory; +import com.bakdata.conquery.models.config.auth.AuthenticationRealmFactory; +import com.bakdata.conquery.models.config.auth.AuthorizationConfig; import com.bakdata.conquery.models.datasets.Column; import com.bakdata.conquery.models.datasets.Table; -import com.bakdata.conquery.apiv1.ExecutionStatus; -import com.bakdata.conquery.apiv1.FullExecutionStatus; -import com.bakdata.conquery.apiv1.OverviewExecutionStatus; +import com.bakdata.conquery.models.datasets.concepts.Concept; +import com.bakdata.conquery.models.datasets.concepts.Connector; +import com.bakdata.conquery.models.datasets.concepts.ValidityDate; +import com.bakdata.conquery.models.datasets.concepts.conditions.CTCondition; +import com.bakdata.conquery.models.datasets.concepts.filters.Filter; +import com.bakdata.conquery.models.datasets.concepts.select.Select; +import com.bakdata.conquery.models.datasets.concepts.select.concept.UniversalSelect; +import com.bakdata.conquery.models.datasets.concepts.tree.ConceptTreeChild; import com.bakdata.conquery.models.forms.configs.FormConfig; import com.bakdata.conquery.models.forms.configs.FormConfig.FormConfigFullRepresentation; import com.bakdata.conquery.models.forms.configs.FormConfig.FormConfigOverviewRepresentation; import com.bakdata.conquery.models.preproc.TableImportDescriptor; import com.bakdata.conquery.models.preproc.TableInputDescriptor; import com.bakdata.conquery.models.preproc.outputs.OutputDescription; -import com.bakdata.conquery.apiv1.query.CQElement; -import com.bakdata.conquery.apiv1.query.concept.filter.CQTable; -import com.bakdata.conquery.apiv1.query.concept.filter.FilterValue; -import com.bakdata.conquery.apiv1.query.concept.filter.ValidityDateContainer; import com.bakdata.conquery.resources.api.APIResource; import com.bakdata.conquery.resources.api.ConceptResource; import com.bakdata.conquery.resources.api.ConceptsProcessor; @@ -162,7 +162,7 @@ public class Constants { .otherClass(MetaDataPatch.class) .otherClass(FrontendConfig.CurrencyConfig.class) .otherClass(ConceptsProcessor.ResolvedFilterResult.class) - .otherClass(FilterResource.StringContainer.class) + .otherClass(FilterResource.AutocompleteRequest.class) .otherClass(ExecutionStatus.class) .otherClass(ConceptsProcessor.ResolvedConceptsResult.class) .otherClass(ConceptResource.ConceptCodeList.class) diff --git a/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java b/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java index 7af305dac1..367e9aeb25 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java @@ -8,6 +8,7 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; +import java.util.Optional; import java.util.OptionalInt; import java.util.Set; import java.util.concurrent.ExecutionException; @@ -43,8 +44,8 @@ import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; -import com.google.common.collect.ImmutableList; import lombok.AllArgsConstructor; +import lombok.Data; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; @@ -63,9 +64,9 @@ public class ConceptsProcessor { CacheBuilder.newBuilder() .softValues() .expireAfterWrite(10, TimeUnit.MINUTES) - .build(new CacheLoader, FEList>() { + .build(new CacheLoader<>() { @Override - public FEList load(Concept concept) throws Exception { + public FEList load(Concept concept) { return FrontEndConceptBuilder.createTreeMap(concept); } }); @@ -76,10 +77,12 @@ public FEList load(Concept concept) throws Exception { .build(new CacheLoader<>() { @Override - public List load(Pair, String> filterAndSearch) throws Exception { + public List load(Pair, String> filterAndSearch) { String searchTerm = filterAndSearch.getValue(); AbstractSelectFilter filter = filterAndSearch.getKey(); + log.trace("Calculating a new search cache for the term \"{}\" on filter[{}]", searchTerm, filter.getId()); + return autocompleteTextFilter(filter, searchTerm); } @@ -155,9 +158,17 @@ public ResolvedConceptsResult resolveFilterValues(AbstractSelectFilter filter ); } - public List autocompleteTextFilter(AbstractSelectFilter filter, String text, OptionalInt pageNumberOpt, OptionalInt itemsPerPageOpt) { - int pageNumber = pageNumberOpt.orElse(0); - int itemsPerPage = itemsPerPageOpt.orElse(50); + @Data + public static class AutoCompleteResult { + private final List values; + private final long total; + } + + public AutoCompleteResult autocompleteTextFilter(AbstractSelectFilter filter, Optional maybeText, OptionalInt pageNumberOpt, OptionalInt itemsPerPageOpt) { + final int pageNumber = pageNumberOpt.orElse(0); + final int itemsPerPage = itemsPerPageOpt.orElse(50); + + final String text = maybeText.orElse(""); Preconditions.checkArgument(pageNumber >= 0, "Page number must be 0 or a positive integer."); Preconditions.checkArgument(itemsPerPage > 1, "Must at least have one item per page."); @@ -169,15 +180,16 @@ public List autocompleteTextFilter(AbstractSelectFilter filter, Stri fullResult = searchCache.get(Pair.of(filter, text)); } catch (ExecutionException e) { - log.warn("Failed to search for \"{}\".", text, (Throwable) (log.isTraceEnabled()? e: null)); - return ImmutableList.of(); + log.warn("Failed to search for \"{}\".", text, (Throwable) (log.isTraceEnabled() ? e : null)); + return new AutoCompleteResult(Collections.emptyList(), 0); } - int startIncl = fullResult.isEmpty() ? 0 : Math.min(itemsPerPage * pageNumber, fullResult.size()); + int startIncl = Math.min(itemsPerPage * pageNumber, fullResult.size()); int endExcl = Math.min(startIncl + itemsPerPage, fullResult.size()); log.trace("Preparing subresult for search term \"{}\" in the index range [{}-{})", text, startIncl, endExcl); - return fullResult.subList(startIncl, endExcl); + + return new AutoCompleteResult(fullResult.subList(startIncl, endExcl), fullResult.size()); } /** diff --git a/backend/src/main/java/com/bakdata/conquery/resources/api/FilterResource.java b/backend/src/main/java/com/bakdata/conquery/resources/api/FilterResource.java index 08ae6c6d24..41e6ddb652 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/api/FilterResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/api/FilterResource.java @@ -3,23 +3,19 @@ import static com.bakdata.conquery.resources.ResourceConstants.*; import java.util.List; -import java.util.Objects; +import java.util.Optional; import java.util.OptionalInt; import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import javax.ws.rs.BadRequestException; import javax.ws.rs.Consumes; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; import javax.ws.rs.core.Response.Status; -import com.bakdata.conquery.apiv1.frontend.FEValue; import com.bakdata.conquery.io.jersey.ExtraMimeTypes; import com.bakdata.conquery.models.datasets.concepts.filters.specific.AbstractSelectFilter; import com.bakdata.conquery.resources.api.ConceptsProcessor.ResolvedConceptsResult; @@ -45,7 +41,7 @@ public ResolvedConceptsResult resolveFilterValues(FilterValues filterValues) { @POST @Path("autocomplete") - public List autocompleteTextFilter(@Valid StringContainer text, @Context HttpServletRequest req, @QueryParam("page") OptionalInt pageNumberOpt, @QueryParam("pageSize") OptionalInt itemsPerPageOpt) { + public ConceptsProcessor.AutoCompleteResult autocompleteTextFilter(@Valid FilterResource.AutocompleteRequest request) { if (!(filter instanceof AbstractSelectFilter)) { throw new WebApplicationException(filter.getId() + " is not a SELECT filter, but " + filter.getClass().getSimpleName() + ".", Status.BAD_REQUEST); @@ -53,7 +49,7 @@ public List autocompleteTextFilter(@Valid StringContainer text, @Contex try { - return processor.autocompleteTextFilter((AbstractSelectFilter) filter, Objects.requireNonNullElse(text.getText(), ""), pageNumberOpt, itemsPerPageOpt); + return processor.autocompleteTextFilter((AbstractSelectFilter) filter, request.getText(), request.getPage(), request.getPageSize()); }catch (IllegalArgumentException e) { throw new BadRequestException(e); } @@ -65,8 +61,10 @@ public static class FilterValues { } @Data - public static class StringContainer { + public static class AutocompleteRequest { @Nullable - private String text; + private Optional text; + private OptionalInt page; + private OptionalInt pageSize; } } diff --git a/docs/Concept JSONs.md b/docs/Concept JSONs.md index 083256a972..b822515f72 100644 --- a/docs/Concept JSONs.md +++ b/docs/Concept JSONs.md @@ -202,10 +202,9 @@ Supported Fields: | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/Filter.java#L38) | pattern | `String` | `null` | | | | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/Filter.java#L34) | unit | `String` | `null` | | | | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/SingleColumnFilter.java#L20) | column | ID of `@Valid @NotNull @NsIdRef Column` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/AbstractSelectFilter.java#L36-L38) | labels | bijective map from `String` to `String` | | | user given mapping from the values in the CSVs to shown labels | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/AbstractSelectFilter.java#L58) | searchType | one of PREFIX, CONTAINS, EXACT | `"EXACT"` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/AbstractSelectFilter.java#L50) | template | [FilterTemplate](#Type-FilterTemplate) | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/AbstractSelectFilter.java#L41) | values | `Set` | `[]` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/AbstractSelectFilter.java#L38-L40) | labels | bijective map from `String` to `String` | | | user given mapping from the values in the CSVs to shown labels | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/AbstractSelectFilter.java#L61) | searchType | one of PREFIX, CONTAINS, EXACT | `"EXACT"` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/AbstractSelectFilter.java#L53) | template | [FilterTemplate](#Type-FilterTemplate) | `null` | | | | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/identifiable/Labeled.java#L25-L29) | label | `String` | `null` | "someLabel" | shown in the frontend | | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/identifiable/NamedImpl.java#L17) | name | `String` | `null` | | |

@@ -377,10 +376,9 @@ Supported Fields: | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/Filter.java#L38) | pattern | `String` | `null` | | | | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/Filter.java#L34) | unit | `String` | `null` | | | | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/SingleColumnFilter.java#L20) | column | ID of `@Valid @NotNull @NsIdRef Column` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/AbstractSelectFilter.java#L36-L38) | labels | bijective map from `String` to `String` | | | user given mapping from the values in the CSVs to shown labels | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/AbstractSelectFilter.java#L58) | searchType | one of PREFIX, CONTAINS, EXACT | `"EXACT"` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/AbstractSelectFilter.java#L50) | template | [FilterTemplate](#Type-FilterTemplate) | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/AbstractSelectFilter.java#L41) | values | `Set` | `[]` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/AbstractSelectFilter.java#L38-L40) | labels | bijective map from `String` to `String` | | | user given mapping from the values in the CSVs to shown labels | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/AbstractSelectFilter.java#L61) | searchType | one of PREFIX, CONTAINS, EXACT | `"EXACT"` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/AbstractSelectFilter.java#L53) | template | [FilterTemplate](#Type-FilterTemplate) | `null` | | | | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/identifiable/Labeled.java#L25-L29) | label | `String` | `null` | "someLabel" | shown in the frontend | | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/identifiable/NamedImpl.java#L17) | name | `String` | `null` | | |

@@ -412,10 +410,9 @@ Supported Fields: | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/Filter.java#L38) | pattern | `String` | `null` | | | | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/Filter.java#L34) | unit | `String` | `null` | | | | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/SingleColumnFilter.java#L20) | column | ID of `@Valid @NotNull @NsIdRef Column` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/AbstractSelectFilter.java#L36-L38) | labels | bijective map from `String` to `String` | | | user given mapping from the values in the CSVs to shown labels | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/AbstractSelectFilter.java#L58) | searchType | one of PREFIX, CONTAINS, EXACT | `"EXACT"` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/AbstractSelectFilter.java#L50) | template | [FilterTemplate](#Type-FilterTemplate) | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/AbstractSelectFilter.java#L41) | values | `Set` | `[]` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/AbstractSelectFilter.java#L38-L40) | labels | bijective map from `String` to `String` | | | user given mapping from the values in the CSVs to shown labels | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/AbstractSelectFilter.java#L61) | searchType | one of PREFIX, CONTAINS, EXACT | `"EXACT"` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/AbstractSelectFilter.java#L53) | template | [FilterTemplate](#Type-FilterTemplate) | `null` | | | | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/identifiable/Labeled.java#L25-L29) | label | `String` | `null` | "someLabel" | shown in the frontend | | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/identifiable/NamedImpl.java#L17) | name | `String` | `null` | | |

diff --git a/docs/REST API JSONs.md b/docs/REST API JSONs.md index 8a3d943af3..17ecb6ed97 100644 --- a/docs/REST API JSONs.md +++ b/docs/REST API JSONs.md @@ -73,7 +73,7 @@ Returns: [ResolvedConceptsResult](#Type-ResolvedConceptsResult)

-### POST datasets/{dataset}/concepts/{concept}/tables/{table}/filters/{filter}/autocomplete [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/FilterResource.java#L46) +### POST datasets/{dataset}/concepts/{concept}/tables/{table}/filters/{filter}/autocomplete [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/FilterResource.java#L42)
Details

@@ -82,14 +82,12 @@ Java Type: `com.bakdata.conquery.resources.api.FilterResource` Method: `autocompleteTextFilter` -Expects: [StringContainer](#Type-StringContainer) -Expects: `OptionalInt` -Expects: `OptionalInt` -Returns: list of [FEValue](#Type-FEValue) +Expects: [AutocompleteRequest](#Type-AutocompleteRequest) +Returns: `AutoCompleteResult`

-### POST datasets/{dataset}/concepts/{concept}/tables/{table}/filters/{filter}/resolve [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/FilterResource.java#L40) +### POST datasets/{dataset}/concepts/{concept}/tables/{table}/filters/{filter}/resolve [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/FilterResource.java#L36)
Details

@@ -724,6 +722,22 @@ Supported Fields: ## Other Types +### Type AutocompleteRequest [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/FilterResource.java#L63) + + +

Details

+ +Java Type: `com.bakdata.conquery.resources.api.FilterResource$AutocompleteRequest` + +Supported Fields: + +| | Field | Type | Default | Example | Description | +| --- | --- | --- | --- | --- | --- | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/FilterResource.java#L67) | page | `OptionalInt` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/FilterResource.java#L68) | pageSize | `OptionalInt` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/FilterResource.java#L65) | text | `@Nullable Optional` | `null` | | | +

+ ### Type CQTable [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/filter/CQTable.java#L21) @@ -829,7 +843,7 @@ Supported Fields: | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FEValue.java#L24) | templateValues | map from `String` to `String` | ? | | |

-### Type FilterValues [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/FilterResource.java#L62) +### Type FilterValues [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/FilterResource.java#L58)
Details

@@ -840,7 +854,7 @@ Supported Fields: | | Field | Type | Default | Example | Description | | --- | --- | --- | --- | --- | --- | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/FilterResource.java#L64) | values | list of `String` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/FilterResource.java#L60) | values | list of `String` | `null` | | |

### Type FormConfig [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/forms/configs/FormConfig.java#L49) @@ -999,7 +1013,7 @@ Supported Fields: | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L25) | tags | list of `String` | `null` | | |

-### Type ResolvedConceptsResult [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java#L274) +### Type ResolvedConceptsResult [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java#L286)
Details

@@ -1010,12 +1024,12 @@ Supported Fields: | | Field | Type | Default | Example | Description | | --- | --- | --- | --- | --- | --- | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java#L279) | resolvedConcepts | list of ID of `ConceptElement` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java#L280) | resolvedFilter | [ResolvedFilterResult](#Type-ResolvedFilterResult) | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java#L281) | unknownCodes | list of `String` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java#L291) | resolvedConcepts | list of ID of `ConceptElement` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java#L292) | resolvedFilter | [ResolvedFilterResult](#Type-ResolvedFilterResult) | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java#L293) | unknownCodes | list of `String` | ? | | |

-### Type ResolvedFilterResult [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java#L264) +### Type ResolvedFilterResult [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java#L276)
Details

@@ -1026,23 +1040,9 @@ Supported Fields: | | Field | Type | Default | Example | Description | | --- | --- | --- | --- | --- | --- | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java#L270) | filterId | ID of `Filter` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java#L269) | tableId | ID of `Connector` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java#L271) | value | list of [FEValue](#Type-FEValue) | ? | | | -

- -### Type StringContainer [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/FilterResource.java#L67) - - -
Details

- -Java Type: `com.bakdata.conquery.resources.api.FilterResource$StringContainer` - -Supported Fields: - -| | Field | Type | Default | Example | Description | -| --- | --- | --- | --- | --- | --- | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/FilterResource.java#L69) | text | `String` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java#L282) | filterId | ID of `Filter` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java#L281) | tableId | ID of `Connector` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java#L283) | value | list of [FEValue](#Type-FEValue) | ? | | |

### Type ValidityDateContainer [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/filter/ValidityDateContainer.java#L9)