moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Entities enum

This commit is contained in:
Chewbacca 2023-03-14 10:19:34 -04:00
parent f4d2f42c01
commit 1b542c3ed7
3 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/soapbox/entity-store/entities.ts
View File

@ -1,4 +1,7 @@
export enum Entities { export enum Entities {
GROUPS = 'Groups',
GROUP_RELATIONSHIPS = 'GroupRelationships',
GROUP_MEMBERSHIPS = 'GroupMemberships', GROUP_MEMBERSHIPS = 'GroupMemberships',
POPULAR_GROUPS = 'PopularGroups' POPULAR_GROUPS = 'PopularGroups',
SUGGESTED_GROUPS = 'SuggestedGroups',
} }

2
app/soapbox/hooks/api/useSuggestedGroups.ts
View File

@ -9,7 +9,7 @@ function useSuggestedGroups() {
const features = useFeatures(); const features = useFeatures();
const { entities, ...result } = useEntities<Group>( const { entities, ...result } = useEntities<Group>(
[Entities.POPULAR_GROUPS, ''], [Entities.SUGGESTED_GROUPS, ''],
'/api/mock/groups', // '/api/v1/truth/suggestions/groups' '/api/mock/groups', // '/api/v1/truth/suggestions/groups'
{ {
schema: groupSchema, schema: groupSchema,

30
app/soapbox/hooks/useGroups.ts
View File

@ -1,12 +1,20 @@
import { Entities } from 'soapbox/entity-store/entities';
import { useEntities, useEntity } from 'soapbox/entity-store/hooks'; import { useEntities, useEntity } from 'soapbox/entity-store/hooks';
import { groupSchema, Group } from 'soapbox/schemas/group'; import { groupSchema, Group } from 'soapbox/schemas/group';
import { groupRelationshipSchema, GroupRelationship } from 'soapbox/schemas/group-relationship'; import { groupRelationshipSchema, GroupRelationship } from 'soapbox/schemas/group-relationship';
function useGroups() { function useGroups() {
const { entities, ...result } = useEntities<Group>(['Group', ''], '/api/v1/groups', { schema: groupSchema }); const { entities, ...result } = useEntities<Group>(
[Entities.GROUPS, ''],
'/api/v1/groups',
{ schema: groupSchema },
);
const { relationships } = useGroupRelationships(entities.map(entity => entity.id)); const { relationships } = useGroupRelationships(entities.map(entity => entity.id));
const groups = entities.map((group) => ({ ...group, relationship: relationships[group.id] || null })); const groups = entities.map((group) => ({
...group,
relationship: relationships[group.id] || null,
}));
return { return {
...result, ...result,
@ -15,7 +23,11 @@ function useGroups() {
} }
function useGroup(groupId: string, refetch = true) { function useGroup(groupId: string, refetch = true) {
const { entity: group, ...result } = useEntity<Group>(['Group', groupId], `/api/v1/groups/${groupId}`, { schema: groupSchema, refetch }); const { entity: group, ...result } = useEntity<Group>(
[Entities.GROUPS, groupId],
`/api/v1/groups/${groupId}`,
{ schema: groupSchema, refetch },
);
const { entity: relationship } = useGroupRelationship(groupId); const { entity: relationship } = useGroupRelationship(groupId);
return { return {
@ -25,13 +37,21 @@ function useGroup(groupId: string, refetch = true) {
} }
function useGroupRelationship(groupId: string) { function useGroupRelationship(groupId: string) {
return useEntity<GroupRelationship>(['GroupRelationship', groupId], `/api/v1/groups/relationships?id[]=${groupId}`, { schema: groupRelationshipSchema }); return useEntity<GroupRelationship>(
[Entities.GROUP_RELATIONSHIPS, groupId],
`/api/v1/groups/relationships?id[]=${groupId}`,
{ schema: groupRelationshipSchema },
);
} }
function useGroupRelationships(groupIds: string[]) { function useGroupRelationships(groupIds: string[]) {
const q = groupIds.map(id => `id[]=${id}`).join('&'); const q = groupIds.map(id => `id[]=${id}`).join('&');
const endpoint = groupIds.length ? `/api/v1/groups/relationships?${q}` : undefined; const endpoint = groupIds.length ? `/api/v1/groups/relationships?${q}` : undefined;
const { entities, ...result } = useEntities<GroupRelationship>(['GroupRelationship', q], endpoint, { schema: groupRelationshipSchema }); const { entities, ...result } = useEntities<GroupRelationship>(
[Entities.GROUP_RELATIONSHIPS, q],
endpoint,
{ schema: groupRelationshipSchema },
);
const relationships = entities.reduce<Record<string, GroupRelationship>>((map, relationship) => { const relationships = entities.reduce<Record<string, GroupRelationship>>((map, relationship) => {
map[relationship.id] = relationship; map[relationship.id] = relationship;