mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-07 15:27:46 +00:00
feat: added sort for roles in both user and identity details view
This commit is contained in:
@@ -412,7 +412,15 @@ export const identityProjectDALFactory = (db: TDbClient) => {
|
|||||||
}
|
}
|
||||||
]
|
]
|
||||||
});
|
});
|
||||||
return members;
|
|
||||||
|
return members.map((el) => ({
|
||||||
|
...el,
|
||||||
|
roles: el.roles.sort((a, b) => {
|
||||||
|
const roleA = (a.customRoleName || a.role).toLowerCase();
|
||||||
|
const roleB = (b.customRoleName || b.role).toLowerCase();
|
||||||
|
return roleA.localeCompare(roleB);
|
||||||
|
})
|
||||||
|
}));
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
throw new DatabaseError({ error, name: "FindByProjectId" });
|
throw new DatabaseError({ error, name: "FindByProjectId" });
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -92,7 +92,8 @@ export const projectMembershipDALFactory = (db: TDbClient) => {
|
|||||||
db.ref("temporaryAccessEndTime").withSchema(TableName.ProjectUserMembershipRole),
|
db.ref("temporaryAccessEndTime").withSchema(TableName.ProjectUserMembershipRole),
|
||||||
db.ref("name").as("projectName").withSchema(TableName.Project)
|
db.ref("name").as("projectName").withSchema(TableName.Project)
|
||||||
)
|
)
|
||||||
.where({ isGhost: false });
|
.where({ isGhost: false })
|
||||||
|
.orderBy(`${TableName.Users}.username` as "username");
|
||||||
|
|
||||||
const members = sqlNestRelationships({
|
const members = sqlNestRelationships({
|
||||||
data: docs,
|
data: docs,
|
||||||
@@ -149,7 +150,14 @@ export const projectMembershipDALFactory = (db: TDbClient) => {
|
|||||||
}
|
}
|
||||||
]
|
]
|
||||||
});
|
});
|
||||||
return members;
|
return members.map((el) => ({
|
||||||
|
...el,
|
||||||
|
roles: el.roles.sort((a, b) => {
|
||||||
|
const roleA = (a.customRoleName || a.role).toLowerCase();
|
||||||
|
const roleB = (b.customRoleName || b.role).toLowerCase();
|
||||||
|
return roleA.localeCompare(roleB);
|
||||||
|
})
|
||||||
|
}));
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
throw new DatabaseError({ error, name: "Find all project members" });
|
throw new DatabaseError({ error, name: "Find all project members" });
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user