From cc02d4d4d93e7748c6b894e5b55a8bbfa6bb7cfa Mon Sep 17 00:00:00 2001
From: Piyush Gupta <piyushguptaa2z123@gmail.com>
Date: Mon, 3 Nov 2025 22:43:05 +0530
Subject: [PATCH] fix: folder name sorting

---
 .../secret-folder/secret-folder-dal.ts        | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/backend/src/services/secret-folder/secret-folder-dal.ts b/backend/src/services/secret-folder/secret-folder-dal.ts
index 7dfeaddcf..c999b69d2 100644
--- a/backend/src/services/secret-folder/secret-folder-dal.ts
+++ b/backend/src/services/secret-folder/secret-folder-dal.ts
@@ -419,13 +419,18 @@ export const secretFolderDALFactory = (db: TDbClient) => {
         .select(
           selectAllTableCols(TableName.SecretFolder),
           db.raw(
-            `DENSE_RANK() OVER (ORDER BY ${TableName.SecretFolder}."name" ${
-              orderDirection ?? OrderByDirection.ASC
-            }) as rank`
+            `DENSE_RANK() OVER (ORDER BY CASE WHEN ${TableName.SecretFolder}."name" LIKE '\\_%' THEN ${orderDirection === OrderByDirection.ASC ? "0" : "1"} ELSE ${orderDirection === OrderByDirection.ASC ? "1" : "0"} END,
+            LOWER(${TableName.SecretFolder}."name") ${orderDirection},
+            ${TableName.SecretFolder}."name" ${orderDirection}
+        ) as rank`
           ),
           db.ref("slug").withSchema(TableName.Environment).as("environment")
         )
-        .orderBy(`${TableName.SecretFolder}.${orderBy}`, orderDirection);
+        .orderByRaw(
+          `CASE WHEN ${TableName.SecretFolder}.${orderBy} LIKE '\\_%' THEN ${orderDirection === OrderByDirection.ASC ? "0" : "1"} ELSE ${orderDirection === OrderByDirection.ASC ? "1" : "0"} END`
+        )
+        .orderByRaw(`LOWER(${TableName.SecretFolder}.${orderBy}) ${orderDirection}`)
+        .orderByRaw(`${TableName.SecretFolder}.${orderBy} ${orderDirection}`);
 
       if (limit) {
         const rankOffset = offset + 1; // ranks start from 1
@@ -434,7 +439,12 @@ export const secretFolderDALFactory = (db: TDbClient) => {
           .select("*")
           .from<Awaited<typeof query>[number]>("w")
           .where("w.rank", ">=", rankOffset)
-          .andWhere("w.rank", "<", rankOffset + limit);
+          .andWhere("w.rank", "<", rankOffset + limit)
+          .orderByRaw(
+            `CASE WHEN "w"."${orderBy}" LIKE '\\_%' THEN ${orderDirection === OrderByDirection.ASC ? "0" : "1"} ELSE ${orderDirection === OrderByDirection.ASC ? "1" : "0"} END`
+          )
+          .orderByRaw(`LOWER("w"."${orderBy}") ${orderDirection}`)
+          .orderByRaw(`"w"."${orderBy}" ${orderDirection}`);
       }
 
       const folders = await query;