matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

StatusActionBar: use GroupRelationship from entity store

Browse Source
This commit is contained in:
Alex Gleason
2023-06-26 12:09:30 -05:00
parent e07412f872
commit a8792f9a02
5 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/soapbox/api/hooks/groups/useGroup.ts
View File

@@ -13,7 +13,7 @@ function useGroup(groupId: string, refetch = true) {
() => api.get(`/api/v1/groups/${groupId}`),
{ schema: groupSchema, refetch },
);
const { entity: relationship } = useGroupRelationship(groupId);
const { groupRelationship: relationship } = useGroupRelationship(groupId);
return {
...result,

2
app/soapbox/api/hooks/groups/useGroupLookup.ts
View File

@@ -15,7 +15,7 @@ function useGroupLookup(slug: string) {
{ schema: groupSchema, enabled: !!slug },
);
const { entity: relationship } = useGroupRelationship(group?.id);
const { groupRelationship: relationship } = useGroupRelationship(group?.id);
return {
...result,

2
app/soapbox/api/hooks/groups/useGroupMembershipRequests.ts
View File

@@ -12,7 +12,7 @@ function useGroupMembershipRequests(groupId: string) {
const api = useApi();
const path: ExpandedEntitiesPath = [Entities.ACCOUNTS, 'membership_requests', groupId];
const { entity: relationship } = useGroupRelationship(groupId);
const { groupRelationship: relationship } = useGroupRelationship(groupId);
const { entities, invalidate, fetchEntities, ...rest } = useEntities(
path,

15
app/soapbox/api/hooks/groups/useGroupRelationship.ts
View File

@@ -1,18 +1,15 @@
import { useEffect } from 'react';
import { z } from 'zod';
import { fetchGroupRelationshipsSuccess } from 'soapbox/actions/groups';
import { Entities } from 'soapbox/entity-store/entities';
import { useEntity } from 'soapbox/entity-store/hooks';
import { useApi, useAppDispatch } from 'soapbox/hooks';
import { useApi } from 'soapbox/hooks';
import { type GroupRelationship, groupRelationshipSchema } from 'soapbox/schemas';
function useGroupRelationship(groupId: string | undefined) {
const api = useApi();
const dispatch = useAppDispatch();
const { entity: groupRelationship, ...result } = useEntity<GroupRelationship>(
[Entities.GROUP_RELATIONSHIPS, groupId as string],
[Entities.GROUP_RELATIONSHIPS, groupId!],
() => api.get(`/api/v1/groups/relationships?id[]=${groupId}`),
{
enabled: !!groupId,
@@ -20,14 +17,8 @@ function useGroupRelationship(groupId: string | undefined) {
},
);
useEffect(() => {
if (groupRelationship?.id) {
dispatch(fetchGroupRelationshipsSuccess([groupRelationship]));
}
}, [groupRelationship?.id]);
return {
entity: groupRelationship,
groupRelationship,
...result,
};
}