shiyue/kan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: order members by role and createdAt

Browse Source
This commit is contained in:
Henry
2026-01-28 21:45:19 +00:00
parent 303ca1409f
commit f210921d54
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/api/src/routers/workspace.ts
View File

@@ -83,7 +83,8 @@ export const workspaceRouter = createTRPCRouter({
const isAdmin = userMember?.role === "admin"; const isAdmin = userMember?.role === "admin";
// Show emails if user is admin OR workspace setting allows it // Show emails if user is admin OR workspace setting allows it
const shouldShowEmails = isAdmin || result.showEmailsToMembers === true; const shouldShowEmails =
isAdmin || result.showEmailsToMembers === true;
// If emails should be hidden, filter them out // If emails should be hidden, filter them out
if (!shouldShowEmails) { if (!shouldShowEmails) {

5
packages/db/src/repository/workspace.repo.ts
View File

@@ -194,8 +194,13 @@ export const getByPublicIdWithMembers = (
email: true, email: true,
role: true, role: true,
status: true, status: true,
createdAt: true,
}, },
where: isNull(workspaceMembers.deletedAt), where: isNull(workspaceMembers.deletedAt),
orderBy: (member, { desc }) => [
desc(sql`CASE WHEN ${member.role} = 'admin' THEN 1 ELSE 0 END`),
desc(member.createdAt),
],
with: { with: {
user: { user: {
columns: { columns: {