Skip to content
This repository has been archived by the owner on Apr 25, 2024. It is now read-only.

Commit

Permalink
Merge pull request #59 from eea/develop
Browse files Browse the repository at this point in the history
fix(discodata connector): send data_query to DataConnectedValue
  • Loading branch information
razvanMiu committed Mar 2, 2022
2 parents fd2adfd + ff780d8 commit caca551
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 4 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,16 @@ All notable changes to this project will be documented in this file. Dates are d

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### [0.2.5](https://github.com/eea/volto-forests-theme/compare/0.2.4...0.2.5)

- fix(discodata connector): send data_query to DataConnectedValue [`007e038`](https://github.com/eea/volto-forests-theme/commit/007e038ddf35aa5bfc3c2a8e5368c70187b5062d)

#### [0.2.4](https://github.com/eea/volto-forests-theme/compare/0.2.3...0.2.4)

> 21 February 2022
- lead nav menu always center content [`#58`](https://github.com/eea/volto-forests-theme/pull/58)
- Sticky nav pagination also sticky [`a242ed0`](https://github.com/eea/volto-forests-theme/commit/a242ed0193dd06b2d59ce17c568fbf8a1b32784d)
- lead nav menu always center content [`194ead3`](https://github.com/eea/volto-forests-theme/commit/194ead3fdbf1900abd2697308e6522aae5dcaafe)

#### [0.2.3](https://github.com/eea/volto-forests-theme/compare/0.2.2...0.2.3)

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@eeacms/volto-forests-theme",
"version": "0.2.4",
"version": "0.2.5",
"description": "@eeacms/volto-forests-theme: Volto add-on",
"main": "src/index.js",
"author": "European Environment Agency: IDM2 A-Team",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ const providerView = (dataProviderKey, dataProvider, editMode) => {
<DataConnectedValue
url={dataProvider.path}
column={dataProvider.displayColumn}
data={{
data_query: dataProvider.data_query,
has_data_query_by_context: dataProvider.has_data_query_by_context,
has_data_query_by_provider:
dataProvider.has_data_query_by_provider,
}}
textTemplate={dataProvider.textTemplate}
specifier={dataProvider.specifier}
animatedCounter={!editMode ? dataProvider.animatedCounter : ''}
Expand Down Expand Up @@ -111,7 +117,7 @@ const View = (props) => {
}, [JSON.stringify(dataProviders)]);

const view = (
<div className="flex h-100 pa-1">
<div className="flex h-100 pa-1" style={{ position: 'relative' }}>
<div className="flex flex-column w-100">
{/* {props.data?.block_title ? <h5>{props.data.block_title}</h5> : ''} */}
{parentsDataProviders &&
Expand Down Expand Up @@ -175,7 +181,6 @@ export default compose(
props.data?.data_providers
?.map((provider) => ({
provider_url: provider.path,
title: provider.title,
has_data_query_by_context: provider.has_data_query_by_context,
has_data_query_by_provider: provider.has_data_query_by_provider,
data_query: provider.data_query,
Expand Down

0 comments on commit caca551

Please sign in to comment.