Merge pull request #844 from open-sausages/pulls/1.2/sort-it-out

BUG Folder sort incorrect
silverstripe · Oct 3, 2018 · 32e0346 · 32e0346
2 parents 5133295 + 5422e28
commit 32e0346
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 49 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/containers/AssetAdmin/AssetAdmin.js b/client/src/containers/AssetAdmin/AssetAdmin.js
@@ -195,23 +195,19 @@ class AssetAdmin extends Component {
       queuedFiles,
     } = this.props;
 
-    return [
+    const combinedFilesList = [
       // Exclude uploaded files that have been reloaded via graphql
       ...queuedFiles
         .items
         .filter(item => !item.id || !files.find(file => file.id === item.id)),
       ...files,
-    ].sort((left, right) => {
-      if (left.type !== right.type) {
-        if (left.type === 'folder') {
-          return -1;
-        }
-        if (right.type === 'folder') {
-          return 1;
-        }
-      }
-      return right.queuedId - left.queuedId;
-    });
+    ];
+
+    // Seperate folder and files then return an array with folders at the top (for table view)
+    const foldersList = combinedFilesList.filter((file) => file.type === 'folder');
+    const filesList = combinedFilesList.filter((file) => file.type !== 'folder');
+
+    return foldersList.concat(filesList);
   }
 
   /**

diff --git a/code/GraphQL/FolderTypeCreator.php b/code/GraphQL/FolderTypeCreator.php
@@ -157,19 +157,6 @@ public function resolveChildrenConnection(
         $filter['parentId'] = $object->ID;
         $list = $filterInputType->filterList($list, $filter);
 
-        // Sort folders first
-        $list = $list->alterDataQuery(function (DataQuery $query, DataList $list) {
-            $existingOrderBys = $query->query()->getOrderBy();
-            $query->sort(
-                '(CASE WHEN "ClassName"=\'SilverStripe\\\\Assets\\\\Folder\' THEN 1 ELSE 0 END)',
-                'DESC',
-                true
-            );
-            foreach ($existingOrderBys as $field => $dir) {
-                $query->sort($field, $dir, false);
-            }
-        });
-
         // Filter by permission
         $ids = $list->column('ID');
         $permissionChecker = File::singleton()->getPermissionChecker();

diff --git a/tests/php/GraphQL/FolderTypeCreatorTest.php b/tests/php/GraphQL/FolderTypeCreatorTest.php
@@ -18,29 +18,6 @@ class FolderTypeCreatorTest extends SapphireTest
 
     protected $usesDatabase = true;
 
-    public function testItSortsChildrenOnTypeByDefault()
-    {
-        $rootFolder = Folder::singleton();
-
-        $file = File::create(['Name' => 'aaa file']);
-        $file->write();
-
-        $folder = Folder::create(['Name' => 'bbb folder']);
-        $folder->write();
-
-        $list = $this->resolveChildrenConnection(
-            $rootFolder,
-            []
-        );
-        $this->assertEquals(
-            [
-                $folder->Name,
-                $file->Name,
-            ],
-            $list['edges']->column('Name')
-        );
-    }
-
     public function testItDoesNotFilterByParentIdWithRecursiveFlag()
     {
         $rootFolder = Folder::singleton();