-
Notifications
You must be signed in to change notification settings - Fork 115
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
NEW Validation of fields when inline saving
- Loading branch information
1 parent
cfa66b9
commit e387931
Showing
24 changed files
with
1,432 additions
and
446 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
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
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,128 +1,57 @@ | ||
| import React from 'react'; | ||
| import { compose } from 'redux'; | ||
| import { connect } from 'react-redux'; | ||
| import React, { useContext, useEffect } from 'react'; | ||
| import AbstractAction from 'components/ElementActions/AbstractAction'; | ||
| import backend from 'lib/Backend'; | ||
| import i18n from 'i18n'; | ||
| import { loadElementSchemaValue } from 'state/editor/loadElementSchemaValue'; | ||
| import { loadElementFormStateName } from 'state/editor/loadElementFormStateName'; | ||
| import { initialize } from 'redux-form'; | ||
| import { ElementContext } from 'components/ElementEditor/Element'; | ||
|
|
||
| /** | ||
| * Using a REST backend, serialize the current form data and post it to the backend endpoint to save | ||
| * the inline edit form's data for the current block. | ||
| */ | ||
| const SaveAction = (MenuComponent) => (props) => { | ||
| if (!props.expandable || props.type.broken) { | ||
| // Some elemental blocks can not be edited inline (e.g. User form blocks) | ||
| // We don't want to add a "Save" action for those blocks. | ||
| return ( | ||
| <MenuComponent {...props} /> | ||
| ); | ||
| } | ||
| const { | ||
| doSaveElement, | ||
| onSaveButtonClick, | ||
| onAfterSave, | ||
| submitForm, | ||
| formHasRendered, | ||
| formDirty, | ||
| } = useContext(ElementContext); | ||
|
|
||
| const handleClick = (event) => { | ||
| event.stopPropagation(); | ||
| onSaveButtonClick(); | ||
| }; | ||
|
|
||
| const { element, type, securityId, formData, reinitialiseForm } = props; | ||
| const { jQuery: $ } = window; | ||
| const noTitle = i18n.inject( | ||
| i18n._t( | ||
| 'ElementHeader.NOTITLE', | ||
| 'Untitled {type} block' | ||
| ), | ||
| { type: type.title } | ||
| ); | ||
|
|
||
| const endpointSpec = { | ||
| url: loadElementSchemaValue('saveUrl', element.id), | ||
| method: loadElementSchemaValue('saveMethod'), | ||
| payloadFormat: loadElementSchemaValue('payloadFormat'), | ||
| defaultData: { | ||
| SecurityID: securityId | ||
| }, | ||
| }; | ||
|
|
||
| const endpoint = backend.createEndpointFetcher(endpointSpec); | ||
| endpoint(formData) | ||
| .then(() => { | ||
| // Update the Apollo query cache with the new form data | ||
| const { apolloClient } = window.ss; | ||
|
|
||
| apolloClient.queryManager.reFetchObservableQueries(); | ||
| reinitialiseForm(formData); | ||
|
|
||
| const preview = $('.cms-preview'); | ||
| preview.entwine('ss.preview')._loadUrl(preview.find('iframe').attr('src')); | ||
|
|
||
| const newTitle = formData ? formData[`PageElements_${element.id}_Title`] : null; | ||
| $.noticeAdd({ | ||
| text: i18n.inject( | ||
| i18n._t( | ||
| 'ElementSaveAction.SUCCESS_NOTIFICATION', | ||
| 'Saved \'{title}\' successfully' | ||
| ), | ||
| { title: newTitle || noTitle } | ||
| ), | ||
| stay: false, | ||
| type: 'success' | ||
| }); | ||
| }) | ||
| .catch(() => { | ||
| $.noticeAdd({ | ||
| text: i18n.inject( | ||
| i18n._t( | ||
| 'ElementSaveAction.ERROR_NOTIFICATION', | ||
| 'Error saving \'{title}\'' | ||
| ), | ||
| { title: element.Title || noTitle } | ||
| ), | ||
| stay: false, | ||
| type: 'error' | ||
| }); | ||
| }); | ||
| const saveElement = () => { | ||
| submitForm(); | ||
| onAfterSave(); | ||
| }; | ||
|
|
||
| const newProps = { | ||
| title: i18n._t('ElementSaveAction.SAVE', 'Save'), | ||
| className: 'element-editor__actions-save', | ||
| onClick: handleClick, | ||
| toggle: props.toggle, | ||
| }; | ||
|
|
||
| useEffect(() => { | ||
| if (formHasRendered && doSaveElement) { | ||
| saveElement(); | ||
| } | ||
| }, [formHasRendered, doSaveElement]); | ||
|
|
||
| if (!props.expandable || props.type.broken) { | ||
| // Some elemental blocks can not be edited inline (e.g. User form blocks) | ||
| // We don't want to add a "Save" action for those blocks. | ||
| return ( | ||
| <MenuComponent {...props} /> | ||
| ); | ||
| } | ||
|
|
||
| return ( | ||
| <MenuComponent {...props}> | ||
| {props.children} | ||
|
|
||
| <AbstractAction {...newProps} /> | ||
| { formDirty && <AbstractAction {...newProps} /> } | ||
| </MenuComponent> | ||
| ); | ||
| }; | ||
|
|
||
| function mapStateToProps(state, ownProps) { | ||
| const formName = loadElementFormStateName(ownProps.element.id); | ||
|
|
||
| let formData = null; | ||
|
|
||
| if (state.form.formState.element && state.form.formState.element[formName]) { | ||
| formData = state.form.formState.element[formName].values; | ||
| } | ||
|
|
||
| return { | ||
| formData, | ||
| securityId: state.config.SecurityID, | ||
| }; | ||
| } | ||
|
|
||
| function mapDispatchToProps(dispatch, ownProps) { | ||
| const formName = loadElementFormStateName(ownProps.element.id); | ||
|
|
||
| return { | ||
| reinitialiseForm(savedData) { | ||
| dispatch(initialize(`element.${formName}`, savedData)); | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| export { SaveAction as Component }; | ||
|
|
||
| export default compose(connect(mapStateToProps, mapDispatchToProps), SaveAction); | ||
| export default SaveAction; |
Oops, something went wrong.