From 460e1d4715a9910ce451c01f5c8acc857a2beb5f Mon Sep 17 00:00:00 2001
From: Sergey Katsubo <skatsubo@gmail.com>
Date: Fri, 29 Aug 2025 03:22:40 +0300
Subject: [PATCH] fix(server): folder sort order (#21383)

---
 server/src/queries/view.repository.sql     | 2 ++
 server/src/repositories/view-repository.ts | 1 +
 2 files changed, 3 insertions(+)

diff --git a/server/src/queries/view.repository.sql b/server/src/queries/view.repository.sql
index 81f5ca20b8..31da10123f 100644
--- a/server/src/queries/view.repository.sql
+++ b/server/src/queries/view.repository.sql
@@ -12,6 +12,8 @@ where
   and "fileCreatedAt" is not null
   and "fileModifiedAt" is not null
   and "localDateTime" is not null
+order by
+  "directoryPath" asc
 
 -- ViewRepository.getAssetsByOriginalPath
 select
diff --git a/server/src/repositories/view-repository.ts b/server/src/repositories/view-repository.ts
index 93c1280191..ceab79f6eb 100644
--- a/server/src/repositories/view-repository.ts
+++ b/server/src/repositories/view-repository.ts
@@ -20,6 +20,7 @@ export class ViewRepository {
       .where('fileCreatedAt', 'is not', null)
       .where('fileModifiedAt', 'is not', null)
       .where('localDateTime', 'is not', null)
+      .orderBy('directoryPath', 'asc')
       .execute();
 
     return results.map((row) => row.directoryPath.replaceAll(/\/$/g, ''));