From b9656b1e222597d092023d4b5f42263f078c9448 Mon Sep 17 00:00:00 2001
From: Peng Xiao <pengxiao@outlook.com>
Date: Sat, 16 Sep 2023 03:24:00 +0800
Subject: [PATCH] fix: orderby in members list (#4375)

Co-authored-by: LongYinan <lynweklm@gmail.com>
---
 apps/server/src/modules/workspaces/resolver.ts | 11 ++++++++---
 tests/affine-cloud/e2e/collaboration.spec.ts   |  5 +++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/apps/server/src/modules/workspaces/resolver.ts b/apps/server/src/modules/workspaces/resolver.ts
index e83f2a97b5..57997079f9 100644
--- a/apps/server/src/modules/workspaces/resolver.ts
+++ b/apps/server/src/modules/workspaces/resolver.ts
@@ -217,9 +217,14 @@ export class WorkspaceResolver {
       },
       skip,
       take: take || 8,
-      orderBy: {
-        createdAt: 'desc',
-      },
+      orderBy: [
+        {
+          createdAt: 'asc',
+        },
+        {
+          type: 'desc',
+        },
+      ],
       include: {
         user: true,
       },
diff --git a/tests/affine-cloud/e2e/collaboration.spec.ts b/tests/affine-cloud/e2e/collaboration.spec.ts
index 2b2a4e7df1..a948588476 100644
--- a/tests/affine-cloud/e2e/collaboration.spec.ts
+++ b/tests/affine-cloud/e2e/collaboration.spec.ts
@@ -234,6 +234,11 @@ test.describe('collaboration members', () => {
       .getByRole('button')
       .all();
 
+    // make sure the first member is the owner
+    expect(page.getByTestId('member-item').first()).toContainText(
+      'Workspace Owner'
+    );
+
     // There have four pagination items: < 1 2 >
     expect(navigationItems.length).toBe(4);
     // Click second page