feat: move vega charts to API #185
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
alexgarel
reviewed
Jun 24, 2024
frontend/src/mixins/search-ctl.ts
Outdated
| } = { | ||
| q: queryParts.join(' '), | ||
| langs: this.langs, | ||
| page_size: this.pageSize.toString(), | ||
| index: this.index, | ||
| charts: ['nutriscore_grade', 'nova_group', 'ecoscore_grade'].join(',') |
There was a problem hiding this comment.
Same as facets, charts is built from <searchalicious-chart name=.../> nodes.
… feat-implement-vega-serverside
* any agg: true search field can be used; * code mutulization with facets ; * list of charts is listed from <searchalicious-chart/> list
Marc-AntoineA
force-pushed
the
feat-implement-vega-serverside
branch
2 times, most recently
from
559ba92 to
4be2add
Compare
Marc-AntoineA
force-pushed
the
feat-implement-vega-serverside
branch
from
4be2add to
5dea4e5
Compare
Kout95
reviewed
Jun 25, 2024
Comment on lines
+14
to
+120
| {"category": bucket["key"], "amount": bucket["doc_count"]} | ||
| for bucket in buckets | ||
| if bucket["key"] != "unknown" | ||
| ] | ||
| values.sort(key=lambda x: x["category"]) | ||
|
|
||
| charts[chart_name] = { | ||
| "$schema": "https://vega.github.io/schema/vega/v5.json", | ||
| "title": chart_name, | ||
| "autosize": {"type": "fit", "contains": "padding"}, | ||
| "signals": [ | ||
| { | ||
| "name": "width", | ||
| "init": "containerSize()[0]", | ||
| "on": [{"events": "window:resize", "update": "containerSize()[0]"}], | ||
| }, | ||
| { | ||
| "name": "tooltip", | ||
| "value": {}, | ||
| "on": [ | ||
| {"events": "rect:pointerover", "update": "datum"}, | ||
| {"events": "rect:pointerout", "update": "{}"}, | ||
| ], | ||
| }, | ||
| ], | ||
| "height": 140, | ||
| "padding": 5, | ||
| "data": [ | ||
| { | ||
| "name": "table", | ||
| "values": values, | ||
| }, | ||
| ], | ||
| "scales": [ | ||
| { | ||
| "name": "xscale", | ||
| "type": "band", | ||
| "domain": {"data": "table", "field": "category"}, | ||
| "range": "width", | ||
| "padding": 0.05, | ||
| "round": True, | ||
| }, | ||
| { | ||
| "name": "yscale", | ||
| "domain": {"data": "table", "field": "amount"}, | ||
| "nice": True, | ||
| "range": "height", | ||
| }, | ||
| ], | ||
| "axes": [ | ||
| {"orient": "bottom", "scale": "xscale", "domain": False, "ticks": False} | ||
| ], | ||
| "marks": [ | ||
| { | ||
| "type": "rect", | ||
| "from": {"data": "table"}, | ||
| "encode": { | ||
| "enter": { | ||
| "x": {"scale": "xscale", "field": "category"}, | ||
| "width": {"scale": "xscale", "band": 1}, | ||
| "y": {"scale": "yscale", "field": "amount"}, | ||
| "y2": {"scale": "yscale", "value": 0}, | ||
| }, | ||
| "update": { | ||
| "fill": {"value": "steelblue"}, | ||
| }, | ||
| "hover": { | ||
| "fill": {"value": "red"}, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| "type": "text", | ||
| "encode": { | ||
| "enter": { | ||
| "align": {"value": "center"}, | ||
| "baseline": {"value": "bottom"}, | ||
| "fill": {"value": "#333"}, | ||
| }, | ||
| "update": { | ||
| "x": { | ||
| "scale": "xscale", | ||
| "signal": "tooltip.category", | ||
| "band": 0.5, | ||
| }, | ||
| "y": { | ||
| "scale": "yscale", | ||
| "signal": "tooltip.amount", | ||
| "offset": -2, | ||
| }, | ||
| "text": {"signal": "tooltip.amount"}, | ||
| "fillOpacity": [ | ||
| {"test": "datum === tooltip", "value": 0}, | ||
| {"value": 1}, | ||
| ], | ||
| }, | ||
| }, | ||
| }, | ||
| ], | ||
| } |
There was a problem hiding this comment.
For me, you have to give data by API and then build the options in frontend like this :
This allows to avoid chart options for every graph
There was a problem hiding this comment.
After discussion, we will keep it like this right now. Might be re-discussed with Alex.
Marc-AntoineA
commented
Jun 25, 2024
app/validations.py
Outdated
| return errors | ||
| global_config = cast(Config, CONFIG) | ||
| index_id, index_config = global_config.get_index_config(index_id) | ||
| if index_config is None: | ||
| raise ValueError(f"Cannot get index config for index_id {index_id}") | ||
| for field_name in facets: | ||
| print(index_config) |
… feat-implement-vega-serverside
Kout95
approved these changes
Jun 25, 2024
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.
What
This PR implements moves vega charts serverside and generalizes it a little (we just have to add
<searchalicious-chart name="..."/>clientside).Resolves #123