FIX Force refresh of Elemental brock on version state change

silverstripe · May 30, 2024 · 7cbde1e · 7cbde1e
1 parent 35c723d
commit 7cbde1e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/client/src/components/ElementEditor/Content.js b/client/src/components/ElementEditor/Content.js
@@ -6,7 +6,7 @@ import { compose } from 'redux';
 class Content extends PureComponent {
   render() {
     const {
-      id,
+      element,
       fileUrl,
       fileTitle,
       content,
@@ -48,7 +48,7 @@ class Content extends PureComponent {
           <InlineEditFormComponent
             extraClass={extraClass}
             onClick={(event) => event.stopPropagation()}
-            elementId={id}
+            element={element}
             activeTab={activeTab}
             onFormInit={onFormInit}
             handleLoadingError={handleLoadingError}

diff --git a/client/src/components/ElementEditor/Element.js b/client/src/components/ElementEditor/Element.js
@@ -399,7 +399,7 @@ const Element = (props) => {
         onDragEnd={onDragEnd}
       />
       <ContentComponent
-        id={element.id}
+        element={element}
         fileUrl={element.blockSchema.fileURL}
         fileTitle={element.blockSchema.fileTitle}
         content={getSummary(element, type)}

diff --git a/client/src/components/ElementEditor/InlineEditForm.js b/client/src/components/ElementEditor/InlineEditForm.js
@@ -54,11 +54,11 @@ class InlineEditForm extends PureComponent {
   }
 
   render() {
-    const { elementId, extraClass, onClick, onFormInit, formHasState, notVisible } = this.props;
+    const { element, extraClass, onClick, onFormInit, formHasState, notVisible } = this.props;
     const { loadingError } = this.state;
 
     const classNames = classnames('element-editor-editform', extraClass);
-    const schemaUrl = loadElementSchemaValue('schemaUrl', elementId);
+    const schemaUrl = loadElementSchemaValue('schemaUrl', element.id) + `?isLiveVersion=${element.isLiveVersion}&isPublished=${element.isPublished}&=version=${element.version}`;
 
     // formTag needs to be a form rather than a div so that the php FormAction that turns into
     // a <button type="submit>" submits this <form>, rather than the <form> for the parent page EditForm
@@ -104,7 +104,7 @@ InlineEditForm.propTypes = {
 };
 
 function mapStateToProps(state, ownProps) {
-  const formName = loadElementFormStateName(ownProps.elementId);
+  const formName = loadElementFormStateName(ownProps.element.id);
 
   return {
     formHasState: state.form.formState && state.form.formState.element &&