Merge pull request #2977 from creative-commoners/pulls/6/standardise-…

…endpoints

API Remove GraphQL

client/src/boot/registerComponents.js

@@ -1,31 +1,6 @@
 import Injector from 'lib/Injector';
 import AnchorSelectorField from 'components/AnchorSelectorField/AnchorSelectorField';
-import readOnePageQuery from 'state/history/readOnePageQuery';
-import rollbackPageMutation from 'state/history/rollbackPageMutation';
 
 export default () => {
   Injector.component.register('AnchorSelectorField', AnchorSelectorField);
-
-  Injector.transform(
-    'pages-history',
-    (updater) => {
-      // Add CMS page history GraphQL query to the HistoryViewer
-      updater.component('HistoryViewer.pages-controller-cms-content', readOnePageQuery, 'PageHistoryViewer');
-    }
-  );
-
-  Injector.transform(
-    'pages-history-revert',
-    (updater) => {
-      // Add CMS page revert GraphQL mutation to the HistoryViewerToolbar
-      updater.component(
-        'HistoryViewerToolbar.VersionedAdmin.HistoryViewer.SiteTree.HistoryViewerVersionDetail',
-        // This was using `copyToStage` incorrectly which also provides from and to stage
-        // arguments. The "rollback" mutation correctly handles relations and is a more consumable
-        // API endpoint.
-        rollbackPageMutation,
-        'PageRevertMutation'
-      );
-    }
-  );
 };

client/src/legacy/TinyMCE_sslink-anchor.js

@@ -3,7 +3,6 @@ import i18n from 'i18n';
 import TinyMCEActionRegistrar from 'lib/TinyMCEActionRegistrar';
 import React from 'react';
 import { createRoot } from 'react-dom/client';
-import { ApolloProvider } from '@apollo/client';
 import { Provider } from 'react-redux';
 import jQuery from 'jquery';
 import ShortcodeSerialiser from 'lib/ShortcodeSerialiser';
@@ -73,7 +72,6 @@ jQuery.entwine('ss', ($) => {
 
     renderModal(isOpen) {
       const store = ss.store;
-      const client = ss.apolloClient;
       const handleHide = () => this.close();
       const handleInsert = (...args) => this.handleInsert(...args);
       const attrs = this.getOriginalAttributes();
@@ -87,22 +85,20 @@ jQuery.entwine('ss', ($) => {
         this.setReactRoot(root);
       }
       root.render(
-        <ApolloProvider client={client}>
-          <Provider store={store}>
-            <InsertLinkInternalModal
-              isOpen={isOpen}
-              onInsert={handleInsert}
-              onClosed={handleHide}
-              title={i18n._t('CMS.LINK_ANCHOR', 'Link to an anchor on a page')}
-              bodyClassName="modal__dialog"
-              className="insert-link__dialog-wrapper--anchor"
-              fileAttributes={attrs}
-              identifier="Admin.InsertLinkAnchorModal"
-              requireLinkText={requireLinkText}
-              currentPageID={currentPageID}
-            />
-          </Provider>
-        </ApolloProvider>
+        <Provider store={store}>
+          <InsertLinkInternalModal
+            isOpen={isOpen}
+            onInsert={handleInsert}
+            onClosed={handleHide}
+            title={i18n._t('CMS.LINK_ANCHOR', 'Link to an anchor on a page')}
+            bodyClassName="modal__dialog"
+            className="insert-link__dialog-wrapper--anchor"
+            fileAttributes={attrs}
+            identifier="Admin.InsertLinkAnchorModal"
+            requireLinkText={requireLinkText}
+            currentPageID={currentPageID}
+          />
+        </Provider>
       );
     },