bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Groups: add dot to group with pending membership requests

Browse source
This commit is contained in:
Alex Gleason 2023-03-29 12:21:43 -05:00
parent 89ab02224f
commit 609a25fd8d
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/soapbox/components/group-card.tsx
View file

@ -43,8 +43,14 @@ const GroupCard: React.FC<IGroupCard> = ({ group }) => {
{/* Group Info */} {/* Group Info */}
<Stack alignItems='center' justifyContent='end' grow className='basis-1/2 py-4' space={0.5}> <Stack alignItems='center' justifyContent='end' grow className='basis-1/2 py-4' space={0.5}>
<HStack alignItems='center' space={1.5}>
<Text size='lg' weight='bold' dangerouslySetInnerHTML={{ __html: group.display_name_html }} /> <Text size='lg' weight='bold' dangerouslySetInnerHTML={{ __html: group.display_name_html }} />
{group.relationship?.pending_requests && (
<div className='h-2 w-2 rounded-full bg-secondary-500' />
)}
</HStack>
<HStack className='text-gray-700 dark:text-gray-600' space={2} wrap> <HStack className='text-gray-700 dark:text-gray-600' space={2} wrap>
<GroupRelationship group={group} /> <GroupRelationship group={group} />
<GroupPrivacy group={group} /> <GroupPrivacy group={group} />

4
app/soapbox/features/groups/index.tsx
View file

@ -15,8 +15,6 @@ import PlaceholderGroupCard from '../placeholder/components/placeholder-group-ca
import PendingGroupsRow from './components/pending-groups-row'; import PendingGroupsRow from './components/pending-groups-row';
import TabBar, { TabItems } from './components/tab-bar'; import TabBar, { TabItems } from './components/tab-bar';
import type { Group as GroupEntity } from 'soapbox/types/entities';
const messages = defineMessages({ const messages = defineMessages({
placeholder: { id: 'groups.search.placeholder', defaultMessage: 'Search My Groups' }, placeholder: { id: 'groups.search.placeholder', defaultMessage: 'Search My Groups' },
}); });
@ -109,7 +107,7 @@ const Groups: React.FC = () => {
> >
{groups.map((group) => ( {groups.map((group) => (
<Link key={group.id} to={`/groups/${group.id}`}> <Link key={group.id} to={`/groups/${group.id}`}>
<GroupCard group={group as GroupEntity} /> <GroupCard group={group} />
</Link> </Link>
))} ))}
</ScrollableList> </ScrollableList>

1
app/soapbox/normalizers/group-relationship.ts
View file

@ -17,6 +17,7 @@ export const GroupRelationshipRecord = ImmutableRecord({
notifying: null, notifying: null,
requested: false, requested: false,
role: 'user' as GroupRoles, role: 'user' as GroupRoles,
pending_requests: false,
}); });
export const normalizeGroupRelationship = (relationship: Record<string, any>) => { export const normalizeGroupRelationship = (relationship: Record<string, any>) => {

1
app/soapbox/schemas/group-relationship.ts
View file

@ -9,6 +9,7 @@ const groupRelationshipSchema = z.object({
role: z.nativeEnum(GroupRoles).catch(GroupRoles.USER), role: z.nativeEnum(GroupRoles).catch(GroupRoles.USER),
blocked_by: z.boolean().catch(false), blocked_by: z.boolean().catch(false),
notifying: z.boolean().nullable().catch(null), notifying: z.boolean().nullable().catch(null),
pending_requests: z.boolean().catch(false),
}); });
type GroupRelationship = z.infer<typeof groupRelationshipSchema>; type GroupRelationship = z.infer<typeof groupRelationshipSchema>;