.

silverstripe · Dec 31, 2023 · a235e0e · a235e0e
1 parent 8ed3b94
commit a235e0e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/components/ElementEditor/AddElementPopover.js b/client/src/components/ElementEditor/AddElementPopover.js
@@ -78,7 +78,7 @@ class AddElementPopover extends Component {
       extraClass
     );
 
-    const globalUseGraphQL = false;
+    const globalUseGraphQL = true;
     const buttonOnClickHandler = globalUseGraphQL ? this.getElementButtonClickHandler : this.handleButtonOnClick;
 
     const buttons = elementTypes.map((elementType) => ({

diff --git a/client/src/components/ElementEditor/ElementEditor.js b/client/src/components/ElementEditor/ElementEditor.js
@@ -57,8 +57,8 @@ class ElementEditor extends PureComponent {
   handleDragEnd(sourceId, afterId) {
     const { actions: { handleSortBlock }, areaId } = this.props;
 
-    const globalUseGraphqQL = true;
-    if (globalUseGraphqQL) {
+    const globalUseGraphQL = true;
+    if (globalUseGraphQL) {
       // see sortBlockMutation.js for reference
       handleSortBlock(sourceId, afterId, areaId).then(() => {
         const preview = window.jQuery('.cms-preview');

diff --git a/client/src/components/ElementEditor/ElementList.js b/client/src/components/ElementEditor/ElementList.js
@@ -25,7 +25,7 @@ class ElementList extends Component {
   // this will cause a re-render of the component
   // this callback should be passed to other components via context and get called after doing mutations
   fetchContentBlocks() {
-    const globalUseGraphQL = false;
+    const globalUseGraphQL = true;
     if (globalUseGraphQL) {
       return;
     }
@@ -62,7 +62,7 @@ class ElementList extends Component {
       isDraggingOver,
     } = this.props;
 
-    const globalUseGraphQL = false;
+    const globalUseGraphQL = true;
     const contentBlocks = globalUseGraphQL ? blocks : this.state.contentBlocks;
 
     // Blocks can be either null or an empty array
@@ -121,7 +121,7 @@ class ElementList extends Component {
    */
   renderLoading() {
     const { loading, LoadingComponent } = this.props;
-    const globalUseGraphQL = false;
+    const globalUseGraphQL = true;
     const isLoading = globalUseGraphQL ? loading : this.state.isLoading;
 
     if (isLoading) {
@@ -132,7 +132,7 @@ class ElementList extends Component {
 
   render() {
     const { blocks } = this.props;
-    const globalUseGraphQL = false;
+    const globalUseGraphQL = true;
     const contentBlocks = globalUseGraphQL ? blocks : this.state.contentBlocks;
 
     const listClassNames = classNames(

diff --git a/client/src/state/editor/sortBlockMutation.js b/client/src/state/editor/sortBlockMutation.js
@@ -34,6 +34,8 @@ const config = {
         const variables = readBlocksConfig.options({ areaId }).variables;
         const cachedData = store.readQuery({ query: readBlocksQuery, variables });
 
+        // store is apollo
+        // console.log(store);
 
         // Query returns a deeply nested object. Explicit reconstruction via spreads is too verbose.
         // This is an alternative, relatively efficient way to deep clone