From 2a69482201e2d904a28bc3ba6e640da16d7243b6 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sat, 19 Oct 2024 17:43:30 -0500 Subject: [PATCH] Fix circular dependency in Group Members --- src/features/group/components/group-member-list-item.tsx | 3 +-- src/features/group/group-members.tsx | 3 +-- src/utils/groups.ts | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/features/group/components/group-member-list-item.tsx b/src/features/group/components/group-member-list-item.tsx index eea6514f8..f1102965c 100644 --- a/src/features/group/components/group-member-list-item.tsx +++ b/src/features/group/components/group-member-list-item.tsx @@ -14,8 +14,7 @@ import PlaceholderAccount from 'soapbox/features/placeholder/components/placehol import { useAppDispatch, useFeatures } from 'soapbox/hooks'; import { GroupRoles } from 'soapbox/schemas/group-member'; import toast from 'soapbox/toast'; - -import { MAX_ADMIN_COUNT } from '../group-members'; +import { MAX_ADMIN_COUNT } from 'soapbox/utils/groups'; import type { Menu as IMenu } from 'soapbox/components/dropdown-menu'; import type { Group, GroupMember } from 'soapbox/types/entities'; diff --git a/src/features/group/group-members.tsx b/src/features/group/group-members.tsx index 360f2c599..0d08d82e8 100644 --- a/src/features/group/group-members.tsx +++ b/src/features/group/group-members.tsx @@ -6,6 +6,7 @@ import { PendingItemsRow } from 'soapbox/components/pending-items-row'; import ScrollableList from 'soapbox/components/scrollable-list'; import { useFeatures } from 'soapbox/hooks'; import { GroupRoles } from 'soapbox/schemas/group-member'; +import { MAX_ADMIN_COUNT } from 'soapbox/utils/groups'; import PlaceholderAccount from '../placeholder/components/placeholder-account'; @@ -18,8 +19,6 @@ interface IGroupMembers { params: { groupId: string }; } -export const MAX_ADMIN_COUNT = 5; - const GroupMembers: React.FC = (props) => { const { groupId } = props.params; diff --git a/src/utils/groups.ts b/src/utils/groups.ts index 28264e090..5430d636c 100644 --- a/src/utils/groups.ts +++ b/src/utils/groups.ts @@ -1,5 +1,7 @@ import { groupSearchHistory } from 'soapbox/settings'; +export const MAX_ADMIN_COUNT = 5; + const RECENT_SEARCHES_KEY = 'soapbox:recent-group-searches'; const clearRecentGroupSearches = (currentUserId: string) => groupSearchHistory.remove(currentUserId);