awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1371 from akhilmhdh/fix/sort-order-ws-env

Browse Source 
fix: resolved sort order for environment going unpredictable
This commit is contained in:
Maidul Islam
2024-02-06 11:41:57 -05:00
committed by GitHub
parent d5f8526a84 c74fe0ca73
commit 0529b50ad7
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
backend/src/services/project/project-dal.ts
View File

@@ -21,7 +21,11 @@ export const projectDALFactory = (db: TDbClient) => {
db.ref("slug").withSchema(TableName.Environment).as("envSlug"), db.ref("slug").withSchema(TableName.Environment).as("envSlug"),
db.ref("name").withSchema(TableName.Environment).as("envName") 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({ const nestedWorkspaces = sqlNestRelationships({
data: workspaces, data: workspaces,
key: "id", key: "id",
@@ -102,7 +106,11 @@ export const projectDALFactory = (db: TDbClient) => {
db.ref("id").withSchema(TableName.Environment).as("envId"), db.ref("id").withSchema(TableName.Environment).as("envId"),
db.ref("slug").withSchema(TableName.Environment).as("envSlug"), db.ref("slug").withSchema(TableName.Environment).as("envSlug"),
db.ref("name").withSchema(TableName.Environment).as("envName") db.ref("name").withSchema(TableName.Environment).as("envName")
); )
.orderBy([
{ column: `${TableName.Project}.name`, order: "asc" },
{ column: `${TableName.Environment}.position`, order: "asc" }
]);
return sqlNestRelationships({ return sqlNestRelationships({
data: workspaces, data: workspaces,
key: "id", key: "id",