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

Revert useEntity array changes, do that in the schema parser

Browse source
This commit is contained in:
Alex Gleason 2023-03-15 14:19:13 -05:00
parent 6b30671875
commit 74ebd560e6
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/soapbox/entity-store/hooks/useEntity.ts
View file

@ -39,7 +39,7 @@ function useEntity<TEntity extends Entity>(
const fetchEntity = () => {
setIsFetching(true);
api.get(endpoint).then(({ data }) => {
const entity = schema.parse(Array.isArray(data) ? data[0] : data);
const entity = schema.parse(data);
dispatch(importEntities([entity], entityType));
setIsFetching(false);
}).catch(() => {

4
app/soapbox/hooks/useGroups.ts
View file

@ -1,3 +1,5 @@
import { z } from 'zod';
import { Entities } from 'soapbox/entity-store/entities';
import { useEntities, useEntity } from 'soapbox/entity-store/hooks';
import { groupSchema, Group } from 'soapbox/schemas/group';
@ -40,7 +42,7 @@ function useGroupRelationship(groupId: string) {
return useEntity<GroupRelationship>(
[Entities.GROUP_RELATIONSHIPS, groupId],
`/api/v1/groups/relationships?id[]=${groupId}`,
{ schema: groupRelationshipSchema },
{ schema: z.array(groupRelationshipSchema).transform(arr => arr[0]) },
);
}