Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix schemaEnhancer support for default values on newly created accord… #24

Merged
merged 2 commits into from
Sep 17, 2021
Merged

Fix schemaEnhancer support for default values on newly created accord… #24

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07cda1c
Fix schemaEnhancer support for default values on newly created accord…
sneridagh Sep 16, 2021
d4b1665
Re-refactor, sorry for the noise of the other commits
sneridagh Sep 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 32 additions & 1 deletion src/components/manage/Blocks/Accordion/Edit.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import EditBlockWrapper from './EditBlockWrapper';
import './editor.less';
import { accordionBlockSchema } from './Schema';
import { emptyAccordion, getPanels } from './util';
import { cloneDeep } from 'lodash';
import config from '@plone/volto/registry';

const Edit = (props) => {
const [selectedBlock, setSelectedBlock] = useState({});
Expand All @@ -31,12 +33,41 @@ const Edit = (props) => {
: data.data;
const metadata = props.metadata || props.properties;

const applySchemaEnhancer = (originalSchema) => {
let schema, schemaEnhancer;
const formData = data;
const { blocks } = config;

const blockType = formData['@type'];
const variations = blocks?.blocksConfig[blockType]?.variations || [];

if (variations.length === 0) {
// No variations present but anyways
// finalize the schema with a schemaEnhancer in the block config is present
schemaEnhancer = blocks.blocksConfig?.[blockType]?.schemaEnhancer;
if (schemaEnhancer)
schema = schemaEnhancer({ schema: originalSchema, formData, intl });
}

const activeItemName = formData?.variation;
let activeItem = variations.find((item) => item.id === activeItemName);
if (!activeItem) activeItem = variations.find((item) => item.isDefault);

schemaEnhancer = activeItem?.['schemaEnhancer'];

schema = schemaEnhancer
? schemaEnhancer({ schema: cloneDeep(originalSchema), formData, intl })
: cloneDeep(originalSchema);

return schema;
};

/**
* Will set field values from schema, by matching the default values
* @returns {Object} defaultValues
*/
const setInitialData = () => {
const accordionSchema = accordionBlockSchema({ intl });
const accordionSchema = applySchemaEnhancer(accordionBlockSchema({ intl }));
const defaultValues = Object.keys(accordionSchema.properties).reduce(
(accumulator, currentVal) => {
return accordionSchema.properties[currentVal].default
Expand Down