From 937425c56d44853e9cd7f0355926070aff49a042 Mon Sep 17 00:00:00 2001 From: andrewwallacespeckle Date: Thu, 20 Mar 2025 14:08:26 +0000 Subject: [PATCH 1/4] refactor(fe): workspace sidebar members section --- .../components/workspace/header/Header.vue | 1 + .../components/workspace/sidebar/Members.vue | 17 +++++++++++------ .../layout/sidebar/menu/group/Group.vue | 4 +++- .../src/components/user/AvatarGroup.vue | 12 ++++++++++-- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/packages/frontend-2/components/workspace/header/Header.vue b/packages/frontend-2/components/workspace/header/Header.vue index 7ce3a9e2b..ff732f494 100644 --- a/packages/frontend-2/components/workspace/header/Header.vue +++ b/packages/frontend-2/components/workspace/header/Header.vue @@ -77,6 +77,7 @@ v-if="!isWorkspaceGuest" :workspace-info="workspaceInfo" :is-workspace-admin="isWorkspaceAdmin" + :is-workspace-guest="isWorkspaceGuest" @show-invite-dialog="$emit('show-invite-dialog')" /> diff --git a/packages/frontend-2/components/workspace/sidebar/Members.vue b/packages/frontend-2/components/workspace/sidebar/Members.vue index 5381c5724..952536902 100644 --- a/packages/frontend-2/components/workspace/sidebar/Members.vue +++ b/packages/frontend-2/components/workspace/sidebar/Members.vue @@ -5,7 +5,6 @@ :icon="iconName" :icon-click="iconClick" :icon-text="iconText" - :tag="workspaceInfo.team.totalCount.toString() || undefined" no-hover >
@@ -15,6 +14,11 @@ :users="team.map((teamMember) => teamMember.user)" :max-avatars="isDesktop ? 5 : 3" class="shrink-0" + :on-hidden-count-click=" + () => { + navigateTo(settingsWorkspaceRoutes.members.route(workspaceInfo.slug)) + } + " />
@@ -61,13 +62,14 @@ import Plus from '~~/src/components/global/icon/Plus.vue' import Edit from '~~/src/components/global/icon/Edit.vue' import ArrowFilled from '~~/src/components/global/icon/ArrowFilled.vue' import CommonBadge from '~~/src/components/common/Badge.vue' +import { ChevronRightIcon } from '@heroicons/vue/24/outline' defineProps<{ tag?: string title?: string collapsible?: boolean collapsed?: boolean - icon?: 'add' | 'edit' + icon?: 'add' | 'edit' | 'view' iconText?: string iconClick?: () => void noHover?: boolean diff --git a/packages/ui-components/src/components/user/AvatarGroup.vue b/packages/ui-components/src/components/user/AvatarGroup.vue index 30133f172..a8f2083f5 100644 --- a/packages/ui-components/src/components/user/AvatarGroup.vue +++ b/packages/ui-components/src/components/user/AvatarGroup.vue @@ -14,7 +14,13 @@ :hide-tooltip="hideTooltips" />
- + +{{ totalHiddenCount }} @@ -35,6 +41,7 @@ const props = withDefaults( maxCount?: number hideTooltips?: boolean maxAvatars?: number + onHiddenCountClick?: () => void }>(), { users: () => [], @@ -42,7 +49,8 @@ const props = withDefaults( size: 'base', maxCount: undefined, hideTooltips: false, - maxAvatars: undefined + maxAvatars: undefined, + onHiddenCountClick: undefined } ) From a9f03694d6ccd74f13547a69f5f9d8ea06506422 Mon Sep 17 00:00:00 2001 From: Mike Date: Thu, 20 Mar 2025 15:19:04 +0100 Subject: [PATCH 2/4] Feat: Move project collaborators to own tab (#4226) --- .../settings/collaborators/Collaborators.vue | 55 ++++++++++--------- .../settings/shared/projects/index.vue | 4 +- .../frontend-2/lib/common/helpers/route.ts | 5 +- packages/frontend-2/nuxt.config.ts | 10 ++-- .../frontend-2/pages/projects/[id]/index.vue | 15 ++++- .../projects/[id]/index/collaborators.vue | 19 +++++++ .../pages/projects/[id]/index/settings.vue | 14 +---- .../[id]/index/settings/collaborators.vue | 3 - 8 files changed, 70 insertions(+), 55 deletions(-) create mode 100644 packages/frontend-2/pages/projects/[id]/index/collaborators.vue delete mode 100644 packages/frontend-2/pages/projects/[id]/index/settings/collaborators.vue diff --git a/packages/frontend-2/components/project/page/settings/collaborators/Collaborators.vue b/packages/frontend-2/components/project/page/settings/collaborators/Collaborators.vue index 6acef790f..80b42385e 100644 --- a/packages/frontend-2/components/project/page/settings/collaborators/Collaborators.vue +++ b/packages/frontend-2/components/project/page/settings/collaborators/Collaborators.vue @@ -1,32 +1,35 @@ diff --git a/packages/frontend-2/pages/projects/[id]/index/settings.vue b/packages/frontend-2/pages/projects/[id]/index/settings.vue index 4494c07a7..dcb2b19fc 100644 --- a/packages/frontend-2/pages/projects/[id]/index/settings.vue +++ b/packages/frontend-2/pages/projects/[id]/index/settings.vue @@ -11,11 +11,7 @@