Changed default order of asset query

usercode · Mar 5, 2023 · 8cfe69c · 8cfe69c
1 parent 5a13835
commit 8cfe69c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/DragonFly.Client/Modules/ContentModule.cs b/src/DragonFly.Client/Modules/ContentModule.cs
@@ -22,7 +22,7 @@ public class ContentModule : ClientModule
     public override void Init(IDragonFlyApi api)
     {
         api.MainMenu().Add("Schema", "fa-solid fa-layer-group", "schema");
-        api.MainMenu().Add("Structure", "fa-solid fa-folder-tree", "structure");
+        //api.MainMenu().Add("Structure", "fa-solid fa-folder-tree", "structure");
         api.MainMenu().Add("Content", "fa-solid fa-list", "content");
 
         api.RegisterField<ArrayField, ArrayFieldView, ArrayFieldOptionsView>();

diff --git a/src/DragonFly.MongoDB/Storages/MongoStorage.Assets.cs b/src/DragonFly.MongoDB/Storages/MongoStorage.Assets.cs
@@ -124,10 +124,18 @@ public async Task<QueryResult<Asset>> QueryAsync(AssetQuery assetQuery)
             query = query.Where(x => x.Name!.Contains(assetQuery.Pattern) || x.Slug!.Contains(assetQuery.Pattern));
         }
 
-        IList<MongoAsset> result = await query
-                                            .OrderByDescending(x => x.Name)
-                                            .Take(assetQuery.Take)
-                                            .ToListAsync();
+        query = query.Take(assetQuery.Take);
+
+        if (assetQuery.Folder == null)
+        {
+            query = query.OrderByDescending(x => x.CreatedAt);
+        }
+        else
+        {
+            query = query.OrderBy(x => x.Name);
+        }
+
+        IList<MongoAsset> result = await query.ToListAsync();
 
         QueryResult<Asset> queryResult = new QueryResult<Asset>();
         queryResult.Items = result