Merge pull request #1477 from creative-commoners/pulls/3/standardise-…

…endpoints

API Remove GraphQL

_config/config.yml

@@ -18,13 +18,27 @@ SilverStripe\Admin\Forms\UsedOnTable:
 Name: assetadminthumbnails
 ---
 SilverStripe\Core\Injector\Injector:
+  # This ThumbnailGenerator is used for upload fields despite its name.
+  # It generates thumbnails because there aren't expected to be many loaded on any given page load
   SilverStripe\AssetAdmin\Model\ThumbnailGenerator.assetadmin:
     class: SilverStripe\AssetAdmin\Model\ThumbnailGenerator
     properties:
       Generates: true
+  # This ThumbnailGenerator is used for asset admin.
+  # It doesn't generate thumbnails (other than on upload) because we expect lots of images
+  # on any given page load.
+  # Setting `Generates: false` to prevent trying to generate new thumbnails when loading asset admin
+  # if the thumbnail generation criteria change, because that would massively slow down the CMS.
+  SilverStripe\AssetAdmin\Model\ThumbnailGenerator.assetadminopen:
+    class: SilverStripe\AssetAdmin\Model\ThumbnailGenerator
+    properties:
+      Generates: false
   SilverStripe\AssetAdmin\Controller\AssetAdmin:
     properties:
       ThumbnailGenerator: '%$SilverStripe\AssetAdmin\Model\ThumbnailGenerator.assetadmin'
+  SilverStripe\AssetAdmin\Controller\AssetAdminOpen:
+    properties:
+      ThumbnailGenerator: '%$SilverStripe\AssetAdmin\Model\ThumbnailGenerator.assetadminopen'
 ---
 Name: assetadminfield
 After:
@@ -47,13 +61,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

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();
 });

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: () => {},
     }}
     />
   );

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: {

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,16 +575,12 @@ 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,
     canAttach: PropTypes.bool,
     maxFiles: PropTypes.number,
+    endpoints: PropTypes.object,
   }),
   UploadFieldItem: PropTypes.elementType,
   AssetDropzone: PropTypes.elementType,