From deb4fbc41f92d39500a8d610ff7cb9b2dd0988e6 Mon Sep 17 00:00:00 2001 From: razvanMiu Date: Mon, 10 May 2021 13:25:00 +0300 Subject: [PATCH] Update --- .../manage/Blocks/SiteTableau/Edit.jsx | 25 ++++++++++++++++++- .../manage/Blocks/SiteTableau/View.jsx | 6 ++++- .../manage/Blocks/SiteTableau/index.js | 1 + 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/components/manage/Blocks/SiteTableau/Edit.jsx b/src/components/manage/Blocks/SiteTableau/Edit.jsx index 344ff62b..049c0e21 100644 --- a/src/components/manage/Blocks/SiteTableau/Edit.jsx +++ b/src/components/manage/Blocks/SiteTableau/Edit.jsx @@ -7,10 +7,33 @@ import getSchema from './schema'; import View from './View'; const Edit = (props) => { - const { provider_data = null } = props; + const { provider_data = null, data = {} } = props; const provider_keys = Object.keys(provider_data || {}); const [schema, setSchema] = React.useState(getSchema(config, provider_keys)); + /** +Provider name: Site flags +Provider path: /data-connectors/site-flags +SELECT * +FROM ( + SELECT *, CONVERT(varchar(4), euregReportingYear) AS siteReportingYear + FROM [IED].[latest].[Browse5_Header] as B5H + LEFT JOIN [IED].[latest].[site_flags] as SF + ON B5H.[siteInspireId] = SF.[Site Inspire ID] +) as B5H +*/ + + React.useEffect(() => { + if (!data.provider_url) { + props.onChangeBlock(props.block, { + ...props.data, + provider_url: + config.blocks.blocksConfig.site_tableau_block.defaultProviderUrl, + }); + } + /* eslint-disable-next-line */ + }, []); + React.useEffect(() => { setSchema(getSchema(config, provider_keys)); /* eslint-disable-next-line */ diff --git a/src/components/manage/Blocks/SiteTableau/View.jsx b/src/components/manage/Blocks/SiteTableau/View.jsx index eb4ad979..1fe08e5e 100644 --- a/src/components/manage/Blocks/SiteTableau/View.jsx +++ b/src/components/manage/Blocks/SiteTableau/View.jsx @@ -43,7 +43,11 @@ const View = (props) => { (breakpoint) => breakpoint.device === device, )[0]?.url; const url = breakpointUrl || data.url; - const disabled = disabledKey ? !provider_data?.[disabledKey]?.[0] : false; + const disabled = disabledKey + ? !provider_data?.[disabledKey]?.[ + provider_data?.siteReportingYear?.indexOf(query.siteReportingYear) + ] + : false; React.useEffect(() => { setMounted(true); diff --git a/src/components/manage/Blocks/SiteTableau/index.js b/src/components/manage/Blocks/SiteTableau/index.js index 4de7f815..050f810b 100644 --- a/src/components/manage/Blocks/SiteTableau/index.js +++ b/src/components/manage/Blocks/SiteTableau/index.js @@ -23,6 +23,7 @@ export default (config) => { tablet: [981, 768], mobile: [767, 0], }, + defaultProviderUrl: '/data-connectors/site-flags', }; return config; };