From efaeb4ef348718013270d0f32c9bd7bb071995c0 Mon Sep 17 00:00:00 2001 From: EEA Jenkins <2368628+eea-jenkins@users.noreply.github.com> Date: Thu, 18 Jan 2024 15:34:22 +0200 Subject: [PATCH 1/5] Back to devel --- docs/HISTORY.txt | 3 +++ eea/api/dataconnector/version.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index b4f8c92..56fe1ea 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -1,6 +1,9 @@ Changelog ========= +9.1-dev0 - (unreleased) +--------------------------- + 9.0 - (2024-01-12) --------------------------- * Change: feat: improve plotlychart visualization serialization diff --git a/eea/api/dataconnector/version.txt b/eea/api/dataconnector/version.txt index dd98ee6..442afad 100644 --- a/eea/api/dataconnector/version.txt +++ b/eea/api/dataconnector/version.txt @@ -1 +1 @@ -9.0 +9.1-dev0 From 6ada0cbac93fcf8b4edab5c180066831952d68f3 Mon Sep 17 00:00:00 2001 From: Razvan Miu Date: Mon, 18 Mar 2024 13:45:01 +0200 Subject: [PATCH 2/5] feat: add filters to plotly visualizations --- eea/api/dataconnector/browser/blocks.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/eea/api/dataconnector/browser/blocks.py b/eea/api/dataconnector/browser/blocks.py index fc1d9aa..078a5a6 100644 --- a/eea/api/dataconnector/browser/blocks.py +++ b/eea/api/dataconnector/browser/blocks.py @@ -185,8 +185,10 @@ def getVisualization(serializer, layout=True): return {} chartData = visualization.get("chartData", {}) - use_data_sources = visualization.get("use_data_sources", layout) provider_url = visualization.get("provider_url", None) + use_data_sources = visualization.get("use_data_sources", layout) + filters = visualization.get("filters", layout) + variation = visualization.get("variation", layout) if use_data_sources: chartData = getVisualizationLayout(chartData) @@ -197,7 +199,9 @@ def getVisualization(serializer, layout=True): "layout": chartData.get("layout", {}), "frames": chartData.get("frames", []) }, - "use_data_sources": use_data_sources + "use_data_sources": use_data_sources, + "filters": filters, + "variation": variation } if use_data_sources and provider_url: From 7e4ed6f4c3977d8e09adedacd0ba5a15d3c82773 Mon Sep 17 00:00:00 2001 From: Razvan Miu Date: Mon, 18 Mar 2024 13:46:06 +0200 Subject: [PATCH 3/5] update default values --- eea/api/dataconnector/browser/blocks.py | 4 ++-- eea/api/dataconnector/version.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eea/api/dataconnector/browser/blocks.py b/eea/api/dataconnector/browser/blocks.py index 078a5a6..111e992 100644 --- a/eea/api/dataconnector/browser/blocks.py +++ b/eea/api/dataconnector/browser/blocks.py @@ -187,8 +187,8 @@ def getVisualization(serializer, layout=True): chartData = visualization.get("chartData", {}) provider_url = visualization.get("provider_url", None) use_data_sources = visualization.get("use_data_sources", layout) - filters = visualization.get("filters", layout) - variation = visualization.get("variation", layout) + filters = visualization.get("filters", None) + variation = visualization.get("variation", None) if use_data_sources: chartData = getVisualizationLayout(chartData) diff --git a/eea/api/dataconnector/version.txt b/eea/api/dataconnector/version.txt index 442afad..9406985 100644 --- a/eea/api/dataconnector/version.txt +++ b/eea/api/dataconnector/version.txt @@ -1 +1 @@ -9.1-dev0 +10.0-dev0 From 08dc43094febe4b0da535bed0ed12e6557fca5e1 Mon Sep 17 00:00:00 2001 From: EEA Jenkins Date: Mon, 18 Mar 2024 13:52:45 +0200 Subject: [PATCH 4/5] Updated version to 10.0 --- eea/api/dataconnector/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eea/api/dataconnector/version.txt b/eea/api/dataconnector/version.txt index 9406985..2f52450 100644 --- a/eea/api/dataconnector/version.txt +++ b/eea/api/dataconnector/version.txt @@ -1 +1 @@ -10.0-dev0 +10.0 From 510aea073d28b6e986a8f5726aa6713871c3a474 Mon Sep 17 00:00:00 2001 From: EEA Jenkins Date: Mon, 18 Mar 2024 13:52:47 +0200 Subject: [PATCH 5/5] Updated changelog - removed develop information --- docs/HISTORY.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index 56fe1ea..02abfca 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -1,8 +1,10 @@ Changelog ========= -9.1-dev0 - (unreleased) +9.1 - (2024-03-18) --------------------------- +* Change: feat: add filters to plotly visualizations + [razvanMiu] 9.0 - (2024-01-12) ---------------------------