API Remove GraphQL

silverstripe · Aug 19, 2024 · 9ac18a4 · 9ac18a4
1 parent 97107b0
commit 9ac18a4
Show file tree

Hide file tree

Showing 86 changed files with 2,546 additions and 4,016 deletions.
diff --git a/_config/config.yml b/_config/config.yml
@@ -21,6 +21,9 @@ SilverStripe\Core\Injector\Injector:
   SilverStripe\AssetAdmin\Controller\AssetAdmin:
     properties:
       ThumbnailGenerator: '%$SilverStripe\AssetAdmin\Model\ThumbnailGenerator.assetadmin'
+  SilverStripe\AssetAdmin\Controller\AssetAdminOpen:
+    properties:
+      ThumbnailGenerator: '%$SilverStripe\AssetAdmin\Model\ThumbnailGenerator.assetadmin'
 ---
 Name: assetadminfield
 After:
@@ -43,13 +46,3 @@ Name: assetadminmodals
 SilverStripe\Admin\ModalController:
   extensions:
     - SilverStripe\AssetAdmin\Extensions\RemoteFileModalExtension
----
-Name: asset-admin-graphql-thumbnails
-Only:
-  moduleexists: 'silverstripe/graphql'
----
-SilverStripe\Core\Injector\Injector:
-  SilverStripe\AssetAdmin\Model\ThumbnailGenerator.graphql:
-    class: SilverStripe\AssetAdmin\Model\ThumbnailGenerator
-    properties:
-      Generates: false
diff --git a/_config/graphql.yml b/_config/graphql.yml
diff --git a/_graphql/config.yml b/_graphql/config.yml
diff --git a/_graphql/interfaces.yml b/_graphql/interfaces.yml
diff --git a/_graphql/mutations.yml b/_graphql/mutations.yml
diff --git a/_graphql/queries.yml b/_graphql/queries.yml
diff --git a/_graphql/types/DescendantFileCount.yml b/_graphql/types/DescendantFileCount.yml
diff --git a/_graphql/types/File.yml b/_graphql/types/File.yml
diff --git a/_graphql/types/FileFilterInput.yml b/_graphql/types/FileFilterInput.yml
diff --git a/_graphql/types/FileInput.yml b/_graphql/types/FileInput.yml
diff --git a/_graphql/types/FileUsage.yml b/_graphql/types/FileUsage.yml
diff --git a/_graphql/types/Folder.yml b/_graphql/types/Folder.yml
diff --git a/_graphql/types/FolderInput.yml b/_graphql/types/FolderInput.yml
diff --git a/_graphql/types/PublicationNotice.yml b/_graphql/types/PublicationNotice.yml
diff --git a/_graphql/unions.yml b/_graphql/unions.yml
diff --git a/client/dist/js/TinyMCE_sslink-file.js b/client/dist/js/TinyMCE_sslink-file.js
diff --git a/client/dist/js/TinyMCE_ssmedia.js b/client/dist/js/TinyMCE_ssmedia.js
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/boot/index.js b/client/src/boot/index.js
@@ -5,7 +5,6 @@ import AssetAdminRouter from 'containers/AssetAdmin/AssetAdminRouter';
 import applyTransform from 'boot/applyTransform';
 import registerReducers from 'boot/registerReducers';
 import registerComponents from 'boot/registerComponents';
-import registerQueries from 'boot/registerQueries';
 import { joinUrlPaths } from 'lib/urls';
 
 document.addEventListener('DOMContentLoaded', () => {
@@ -37,7 +36,5 @@ document.addEventListener('DOMContentLoaded', () => {
     ],
   });
 
-  registerQueries();
-
   registerReducers();
 });
diff --git a/client/src/boot/registerQueries.js b/client/src/boot/registerQueries.js
diff --git a/client/src/components/BulkActions/tests/BulkActions-test.js b/client/src/components/BulkActions/tests/BulkActions-test.js
@@ -33,7 +33,9 @@ test('BulkActions canApply() shows an action button when canApply returns true',
           callback: () => true,
         },
       ],
-      items: [{ applies: true }]
+      items: [{ applies: true }],
+      onClearSelection: () => {},
+      onSelectAll: () => {},
     }}
     />
   );
@@ -59,7 +61,9 @@ test('BulkActions canApply() shows an action button when canApply returns false'
           callback: () => true,
         },
       ],
-      items: [{ applies: false }]
+      items: [{ applies: false }],
+      onClearSelection: () => {},
+      onSelectAll: () => {},
     }}
     />
   );
@@ -83,6 +87,8 @@ test('BulkActions getOptionsByValue() should return the option which matches the
         },
       ],
       items: [{ applies: true }],
+      onClearSelection: () => {},
+      onSelectAll: () => {},
     }}
     />
   );

diff --git a/client/src/components/GalleryItem/tests/GalleryItem-test.js b/client/src/components/GalleryItem/tests/GalleryItem-test.js
@@ -166,7 +166,7 @@ test('GalleryItem getThumbnailStyles() should return backgroundImage with the co
   expect(thumbnail.classList).toContain('gallery-item__thumbnail--small');
 });
 
-test('GalleryItem getThumbnailStyles() should return backgroundImage with the correct data-url when thumbnail is included in graphql body', () => {
+test('GalleryItem getThumbnailStyles() should return backgroundImage with the correct data-url when thumbnail is included in json response', () => {
   const { container } = render(
     <GalleryItem {...makeProps({
       item: {

diff --git a/client/src/components/UploadField/UploadField.js b/client/src/components/UploadField/UploadField.js
@@ -412,7 +412,7 @@ class UploadField extends Component {
    */
   renderDropzone() {
     const { AssetDropzone } = this.props;
-    if (!this.props.data.createFileEndpoint) {
+    if (!this.props.data.endpoints.createFile) {
       return null;
     }
     const dimensions = {
@@ -423,8 +423,8 @@ class UploadField extends Component {
     const maxFilesize = this.getMaxFilesize();
 
     const dropzoneOptions = {
-      url: this.props.data.createFileEndpoint.url,
-      method: this.props.data.createFileEndpoint.method,
+      url: this.props.data.endpoints.createFile.url,
+      method: this.props.data.endpoints.createFile.method,
       paramName: 'Upload',
       maxFiles,
       maxFilesize,
@@ -575,11 +575,6 @@ UploadField.propTypes = {
   disabled: PropTypes.bool,
   data: PropTypes.shape({
     files: PropTypes.arrayOf(fileShape),
-    createFileEndpoint: PropTypes.shape({
-      url: PropTypes.string.isRequired,
-      method: PropTypes.string.isRequired,
-      payloadFormat: PropTypes.string.isRequired,
-    }),
     multi: PropTypes.bool,
     parentid: PropTypes.number,
     canUpload: PropTypes.bool,