-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #10 from eea/115135_data_connected_blocks
Implemented dynamic sql request for data connected blocks
- Loading branch information
Showing
9 changed files
with
192 additions
and
381 deletions.
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,90 +1,68 @@ | ||
| import { useState, useEffect } from 'react'; | ||
| import _uniqueId from 'lodash/uniqueId'; | ||
|
|
||
| import { connect } from 'react-redux'; | ||
| import { compose } from 'redux'; | ||
| import _uniqueId from 'lodash/uniqueId'; | ||
|
|
||
| import { | ||
| setConnectedDataParameters, | ||
| deleteConnectedDataParameters, | ||
| } from 'volto-datablocks/actions'; | ||
|
|
||
| import { getSchemaWithDataQuery, objectHasData, getBasePath } from '~/helpers'; | ||
| import { settings } from '~/config'; | ||
| import DB from '~/components/manage/DataBase/DB'; | ||
|
|
||
| const DefaultView = props => { | ||
| const [state, setState] = useState({ | ||
| id: _uniqueId('block_'), | ||
| schemaWithDataQuery: null, | ||
| dataQueryKeys: [], | ||
| ids: [], | ||
| loaded: false, | ||
| loading: false, | ||
| errors: [], | ||
| items: [], | ||
| }); | ||
| const id = props.id || state.id; | ||
| const path = getBasePath(props.pathname); | ||
| const { view, data } = props; | ||
| const selectQuery = data?.sql?.selectQuery; | ||
| const additionalQuery = data?.sql?.additionalQuery; | ||
| const providerUrl = data?.providerUrl || settings.providerUrl || null; | ||
| useEffect(() => { | ||
| // Set schema adding data_query if needed | ||
| const schemaWithDataQuery = getSchemaWithDataQuery({ ...props, path }); | ||
| setState({ ...state, schemaWithDataQuery }); | ||
| /* eslint-disable-next-line */ | ||
| }, [props.connected_data_parameters?.byContextPath, props.connected_data_parameters?.byProviderPath]); | ||
|
|
||
| useEffect(() => { | ||
| // Set data_query keys and ids | ||
| if (state.schemaWithDataQuery) { | ||
| const dataQueryKeys = []; | ||
| const ids = []; | ||
| Object.keys(state.schemaWithDataQuery).forEach(element => { | ||
| if (state.schemaWithDataQuery[element].type === 'data-query') { | ||
| dataQueryKeys.push(element); | ||
| ids.push(`${id}_${element}`); | ||
| } | ||
| }); | ||
| setState({ ...state, dataQueryKeys, ids }); | ||
| if ( | ||
| selectQuery.table && | ||
| selectQuery.columnKey && | ||
| selectQuery.columnValue && | ||
| providerUrl && | ||
| !state.loading | ||
| ) { | ||
| setState({ ...state, loading: true }); | ||
| DB.table(providerUrl, selectQuery.table) | ||
| .get() | ||
| .where(selectQuery.columnKey, selectQuery.columnValue) | ||
| .where(additionalQuery.columnKey, additionalQuery.columnValue) | ||
| .makeRequest() | ||
| .then(response => { | ||
| setState({ | ||
| ...state, | ||
| loaded: true, | ||
| loading: false, | ||
| errors: [], | ||
| items: response.results, | ||
| }); | ||
| }) | ||
| .catch(errors => { | ||
| setState({ | ||
| loaded: false, | ||
| loading: false, | ||
| errors: errors, | ||
| items: [], | ||
| }); | ||
| }); | ||
| } | ||
| /* eslint-disable-next-line */ | ||
| }, [state.schemaWithDataQuery]); | ||
| // Update connected_data_parameters if data_query available in data.columns | ||
| __CLIENT__ && | ||
| state.dataQueryKeys.forEach((key, index) => { | ||
| if ( | ||
| !objectHasData( | ||
| props.connected_data_parameters?.byProviderPath?.[path], | ||
| ) && | ||
| !objectHasData( | ||
| props.connected_data_parameters?.byContextPath?.[path], | ||
| ) && | ||
| !props.connected_data_parameters?.byPath?.[path]?.override?.[ | ||
| state.ids[index] | ||
| ] && | ||
| props.data?.columns?.[key]?.value?.i && | ||
| props.data?.columns?.[key]?.value?.v | ||
| ) { | ||
| props.dispatch( | ||
| setConnectedDataParameters( | ||
| path, | ||
| props.data.columns[key].value, | ||
| state.ids[index], | ||
| ), | ||
| ); | ||
| } | ||
| }); | ||
| }, [data?.sql, data?.provider_url]) | ||
|
|
||
| useEffect(() => { | ||
| props.onChange && props.onChange(state); | ||
| return () => { | ||
| // Delete connected data parrameters on Unmount | ||
| __CLIENT__ && | ||
| state.dataQueryKeys && | ||
| state.dataQueryKeys.forEach((key, index) => { | ||
| props.dispatch(deleteConnectedDataParameters(path, state.ids[index])); | ||
| }); | ||
| }; | ||
| /* eslint-disable-next-line */ | ||
| }, [state]); | ||
| return props.view; | ||
|
|
||
| return view; | ||
| }; | ||
|
|
||
| export default compose( | ||
| connect((state, props) => ({ | ||
| connected_data_parameters: state.connected_data_parameters, | ||
| pathname: state.router.location.pathname, | ||
| })), | ||
| )(DefaultView); |
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
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
Oops, something went wrong.