diff --git a/src/components/manage/Blocks/NavigationBlock/Edit.jsx b/src/components/manage/Blocks/NavigationBlock/Edit.jsx index c3c69c2..3e8b260 100644 --- a/src/components/manage/Blocks/NavigationBlock/Edit.jsx +++ b/src/components/manage/Blocks/NavigationBlock/Edit.jsx @@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react'; import { connect } from 'react-redux'; import { compose } from 'redux'; import _uniqueId from 'lodash/uniqueId'; -import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields'; +//import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields'; import View from './View'; import config from '@plone/volto/registry'; @@ -75,7 +75,7 @@ const Edit = (props) => { position: 'relative', }} > - + {/* */}
{ - return typeof obj === 'object' && obj !== null && Object.keys(obj).length > 0; -}; - -export const getSchemaWithDataQuery = (props) => { - if (!props.schema) return {}; - let schemaWithDataQuery = {}; - Object.keys(props.schema).forEach((element) => { - if (props.schema[element].type === 'data-provider') { - if ( - !objectHasData( - props?.connected_data_parameters?.byProviderPath?.[props.path], - ) && - !objectHasData( - props?.connected_data_parameters?.byContextPath?.[props.path], - ) - ) { - const dataQuery = {}; - dataQuery[element + '_data_query'] = { - defaultformat: 'compactnumber', - type: 'data-query', - }; - schemaWithDataQuery[element] = props.schema[element]; - schemaWithDataQuery = { ...schemaWithDataQuery, ...dataQuery }; - } - } - schemaWithDataQuery[element] = props.schema[element]; - }); - return schemaWithDataQuery; -}; - export function getLocation(href) { var match = href.match( /^(https?:)\/\/(([^:/?#]*)(?::([0-9]+))?)([/]{0,1}[^?#]*)(\?[^#]*|)(#.*|)$/, @@ -65,40 +33,3 @@ export function samePath(url, path) { const cleanPath = path.replace(/\/$/, ''); return clean === cleanPath; } - -export const updateConnectedDataParameters = (props) => { - props.schema && - Object.keys(props.schema).forEach((element) => { - if (props.schema[element].type === 'data-query') { - if ( - props?.newData?.columns?.[element] && - (props?.newData?.columns?.[element]?.value?.i !== - props?.data?.columns?.[element]?.value?.i || - props?.newData?.columns?.[element]?.value?.v !== - props?.data?.columns?.[element]?.value?.v) - ) { - const path = getBasePath(props.pathname); - const byPath = props?.connected_data_parameters?.byPath; - const connected_data_parameters = - (byPath?.[path]?.override?.length > 0 && - byPath?.[path]?.override?.[`${props.id}_${element}`]) || - null; - if ( - connected_data_parameters === null || - connected_data_parameters?.i !== - props?.newData?.columns?.[element]?.value?.i || - connected_data_parameters?.v?.join(',') !== - props?.newData?.columns?.[element]?.value?.v - ) { - props.dispatch( - setConnectedDataParameters( - path.replace('/edit', ''), - props?.newData?.columns?.[element]?.value, - `${props.id}_${element}`, - ), - ); - } - } - } - }); -}; diff --git a/src/index.js b/src/index.js index b5b04c4..076f442 100644 --- a/src/index.js +++ b/src/index.js @@ -1,7 +1,6 @@ import Forbidden from '@plone/volto/components/theme/Forbidden/Forbidden'; import Unauthorized from '@plone/volto/components/theme/Unauthorized/Unauthorized'; -import { installBlocks } from '@eeacms/volto-plotlycharts'; import { applyConfig as installFiseFrontend } from './localconfig'; import ObjectListInlineWidget from './components/manage/Widgets/ObjectListInlineWidget'; @@ -11,10 +10,7 @@ import './slate-styles.css'; export default function applyConfig(config) { // Add here your project's configuration here by modifying `config` accordingly - config = [installBlocks, installFiseFrontend].reduce( - (acc, apply) => apply(acc), - config, - ); + config = [installFiseFrontend].reduce((acc, apply) => apply(acc), config); config.settings = { ...config.settings,