From bbd5146e5a562d8cc2d4159d5432589d6ae986d0 Mon Sep 17 00:00:00 2001 From: Chuck Driesler Date: Thu, 29 Aug 2024 20:17:37 +0100 Subject: [PATCH] fix(workspaces): add pagination to workspace team members (#2644) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(workspaces): a suggestion of paginated teams * fix(workspaces): workspace team pagination (?) * fix(workspaces): pagination based on acl createdAt * fix(workspaces): fix some roles-related tests * fix(workspaces): improve query and tests * fix(workspaces): collaborators query without incorrect groupBy * fix(workspaces): add default values to migration * Fixed queries and fragments * Merged main * Remove comment * chore(workspaces): update WorkspaceCollaboratorCollection mocks * chore(workspaces): fix role test * chore(workspaces); ope * fix(workspaces): move workspace acl timestamps to separate table * Merge? * fix(workspaces) drop that table * fix(workspaces): cursor * fix(workspaceInvites): undo merge borkage * fix(workspaces): rework workspace member pagination * fix(workspaces): fix test * fix(workspaces): test test * fix(workspaces): literally garbage --------- Co-authored-by: Mike Tasset Co-authored-by: Gergő Jedlicska --- .../workspaces/members/GuestsTable.vue | 41 +++- .../workspaces/members/InvitesTable.vue | 6 +- .../workspaces/members/MembersTable.vue | 47 ++++- .../components/workspace/InviteDialog.vue | 8 +- .../components/workspace/header/Header.vue | 12 +- .../lib/common/generated/gql/gql.ts | 25 ++- .../lib/common/generated/gql/graphql.ts | 61 ++++-- .../lib/settings/graphql/queries.ts | 17 ++ .../lib/workspaces/graphql/mutations.ts | 7 +- .../typedefs/workspaces.graphql | 15 +- .../modules/core/graph/generated/graphql.ts | 24 ++- packages/server/modules/core/helpers/types.ts | 4 + .../modules/core/repositories/streams.ts | 4 +- .../server/modules/core/repositories/users.ts | 10 +- .../graph/generated/graphql.ts | 12 +- .../modules/workspaces/domain/operations.ts | 18 +- .../server/modules/workspaces/domain/types.ts | 7 + .../workspaces/graph/mocks/workspaces.ts | 19 +- .../workspaces/graph/resolvers/workspaces.ts | 18 +- .../server/modules/workspaces/helpers/db.ts | 3 +- .../modules/workspaces/helpers/roles.ts | 2 +- .../workspaces/repositories/workspaces.ts | 49 +++-- .../modules/workspaces/services/join.ts | 6 +- .../modules/workspaces/services/management.ts | 16 +- .../modules/workspaces/services/retrieval.ts | 43 +++++ .../tests/integration/repositories.spec.ts | 41 ++-- .../tests/integration/roles.graph.spec.ts | 14 +- .../integration/workspaces.graph.spec.ts | 179 ++++++++++++++++-- .../tests/unit/events/eventListener.spec.ts | 9 +- .../tests/unit/services/join.spec.ts | 17 +- .../tests/unit/services/management.spec.ts | 71 +++++-- .../workspaces/tests/unit/utils/roles.spec.ts | 48 ++++- .../modules/workspacesCore/domain/events.ts | 4 +- .../modules/workspacesCore/domain/types.ts | 7 +- .../workspacesCore/helpers/graphTypes.ts | 6 +- ...240813125251_workspaceAclWithTimestamps.ts | 16 ++ .../server/test/graphql/generated/graphql.ts | 33 ++-- packages/server/test/graphql/workspaces.ts | 41 ++-- 38 files changed, 754 insertions(+), 206 deletions(-) create mode 100644 packages/server/modules/workspacesCore/migrations/20240813125251_workspaceAclWithTimestamps.ts diff --git a/packages/frontend-2/components/settings/workspaces/members/GuestsTable.vue b/packages/frontend-2/components/settings/workspaces/members/GuestsTable.vue index 607bd4577..d7cd13dcb 100644 --- a/packages/frontend-2/components/settings/workspaces/members/GuestsTable.vue +++ b/packages/frontend-2/components/settings/workspaces/members/GuestsTable.vue @@ -1,6 +1,7 @@