Feature/optional bounds for filters #1546
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lukavdplas
added
frontend
JeltevanBoheemen
approved these changes
May 16, 2024
Comment on lines
36
to
41
| this.searchService.aggregateSearch(queryModel.corpus, queryModel, aggregator).then(result => | ||
| this.options = _.sortBy( | ||
| result.map(x => ({ label: x.key, value: x.key, doc_count: x.doc_count })), | ||
| o => o.label | ||
| ) | ||
| ).catch(() => this.options = []); |
There was a problem hiding this comment.
I would prefer meaningful variable names over x and o, or type annotations. The code is already quite difficult to read.
I know this is not in the scope of the PR, but just stood out to me now that it's presented to me :)
| [range]="true" [min]="min" [max]="max" | ||
| (onChange)="sliderValue$.next($event.values)"></p-slider> | ||
| </div> | ||
| <ng-container *ngIf="min !== undefined && max !== undefined"> |
There was a problem hiding this comment.
I presume the *ngIf is to delay loading the component until after the min and max are set?
In that case we need to be sure that these are always set.
There was a problem hiding this comment.
Yes, you can't really make a slider otherwise. The same component should be requesting a min/max value.
| @@ -0,0 +1,163 @@ | |||
| import { CorpusField } from './corpus'; | |||
There was a problem hiding this comment.
By god this is great.
There was a problem hiding this comment.
Not the import. The file.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This makes the specification of
upperandlowerbound for the range filter and date filter optional (close #1535). If no upper or lower bound has been defined, the frontend will request the min/max values when rendering the filter component.Summary of changes to the code:
searchService.aggregateSearch()is now as general as the name implies, and allows aggregations other than thetermstype.dateHistogramSearch()is removed.Aggregatorclass with subclasses for specific aggregation types. This class handles the translation to an elasticsearch query, and translation from an elasticsearch result.termsanddate_histogramaggregations as the same type, but they are not compatible. Changed the definitions so these are different return types.RangeFilterandDateFilternow acceptundefinedmin/max values (i.e. no bound). If the corpus did not specify an upper/lower bound, these will be the initial values.