From c74fe0ca73a96e7c50165268c08b876a100bb8c7 Mon Sep 17 00:00:00 2001 From: Akhil Mohan Date: Tue, 6 Feb 2024 16:40:31 +0530 Subject: [PATCH] fix: resolved sort order for environment going unpredictable --- backend/src/services/project/project-dal.ts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/backend/src/services/project/project-dal.ts b/backend/src/services/project/project-dal.ts index e937a8e0f..44ba57481 100644 --- a/backend/src/services/project/project-dal.ts +++ b/backend/src/services/project/project-dal.ts @@ -21,7 +21,11 @@ export const projectDALFactory = (db: TDbClient) => { db.ref("slug").withSchema(TableName.Environment).as("envSlug"), db.ref("name").withSchema(TableName.Environment).as("envName") ) - .orderBy("createdAt", "asc", "last"); + .orderBy([ + { column: `${TableName.Project}.name`, order: "asc" }, + { column: `${TableName.Environment}.position`, order: "asc" } + ]); + const nestedWorkspaces = sqlNestRelationships({ data: workspaces, key: "id", @@ -102,7 +106,11 @@ export const projectDALFactory = (db: TDbClient) => { db.ref("id").withSchema(TableName.Environment).as("envId"), db.ref("slug").withSchema(TableName.Environment).as("envSlug"), db.ref("name").withSchema(TableName.Environment).as("envName") - ); + ) + .orderBy([ + { column: `${TableName.Project}.name`, order: "asc" }, + { column: `${TableName.Environment}.position`, order: "asc" } + ]); return sqlNestRelationships({ data: workspaces, key: "id",