ENH Remove unused legacy graphql code

silverstripe · Jun 20, 2024 · 32ede20 · 32ede20
1 parent 464105c
commit 32ede20
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 1,348 deletions.
diff --git a/_config/graphql-legacy.yml b/_config/graphql-legacy.yml
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/boot/registerQueries.js b/client/src/boot/registerQueries.js
@@ -2,20 +2,15 @@ import Injector from 'lib/Injector';
 import { fileInterface, file } from 'lib/fileFragments';
 import readFilesQuery from 'state/files/readFilesQuery';
 import readOneFileQuery from 'state/files/readOneFileQuery';
-import readFilesQueryLegacy from 'state/files/_legacy/readFilesQuery';
 import readDescendantFileCountsQuery from 'state/files/readDescendantFileCountsQuery';
-import readOneFileQueryLegacy from 'state/files/_legacy/readOneFileQuery';
 import readFileUsageQuery from 'state/files/readFileUsageQuery';
 
-// Backward compatibility hack. Remove when GraphQL 4 is in core
-const isLegacy = !!document.body.getAttribute('data-graphql-legacy');
-
 const registerQueries = () => {
   Injector.query.registerFragment('FileInterfaceFields', fileInterface);
   Injector.query.registerFragment('FileFields', file);
-  Injector.query.register('ReadFilesQuery', isLegacy ? readFilesQueryLegacy : readFilesQuery);
+  Injector.query.register('ReadFilesQuery', readFilesQuery);
   Injector.query.register('readDescendantFileCountsQuery', readDescendantFileCountsQuery);
-  Injector.query.register('ReadOneFileQuery', isLegacy ? readOneFileQueryLegacy : readOneFileQuery);
+  Injector.query.register('ReadOneFileQuery', readOneFileQuery);
   Injector.query.register('readFileUsageQuery', readFileUsageQuery);
 };
 export default registerQueries;
diff --git a/client/src/state/files/_legacy/readFilesQuery.js b/client/src/state/files/_legacy/readFilesQuery.js
diff --git a/client/src/state/files/_legacy/readOneFileQuery.js b/client/src/state/files/_legacy/readOneFileQuery.js
diff --git a/composer.json b/composer.json
@@ -30,10 +30,7 @@
     },
     "autoload": {
         "psr-4": {
-            "SilverStripe\\AssetAdmin\\": [
-                "code/",
-                "_legacy/"
-            ],
+            "SilverStripe\\AssetAdmin\\": "code/",
             "SilverStripe\\AssetAdmin\\Tests\\": "tests/php/",
             "SilverStripe\\AssetAdmin\\Tests\\Behat\\Context\\": "tests/behat/src/"
         }

diff --git a/tests/php/GraphQL/Legacy/CreateFolderMutationCreatorTest.php b/tests/php/GraphQL/Legacy/CreateFolderMutationCreatorTest.php