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

Merge branch 'fix-useless-call' into 'develop'

Browse source 
Prevent lookup if not enabled

See merge request soapbox-pub/soapbox!2539
This commit is contained in:
Chewbacca 2023-06-02 14:56:56 +00:00
commit 8fa9854016
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,7 +12,7 @@ function useGroupLookup(slug: string) {
Entities.GROUPS, Entities.GROUPS,
(group) => group.slug === slug, (group) => group.slug === slug,
() => api.get(`/api/v1/groups/lookup?name=${slug}`), () => api.get(`/api/v1/groups/lookup?name=${slug}`),
{ schema: groupSchema }, { schema: groupSchema, enabled: !!slug },
); );
const { entity: relationship } = useGroupRelationship(group?.id); const { entity: relationship } = useGroupRelationship(group?.id);

5
app/soapbox/entity-store/hooks/useEntityLookup.ts
View file

@ -25,6 +25,7 @@ function useEntityLookup<TEntity extends Entity>(
const [isFetching, setPromise] = useLoading(true); const [isFetching, setPromise] = useLoading(true);
const entity = useAppSelector(state => findEntity(state, entityType, lookupFn)); const entity = useAppSelector(state => findEntity(state, entityType, lookupFn));
const isEnabled = opts.enabled ?? true;
const isLoading = isFetching && !entity; const isLoading = isFetching && !entity;
const fetchEntity = async () => { const fetchEntity = async () => {
@ -38,10 +39,12 @@ function useEntityLookup<TEntity extends Entity>(
}; };
useEffect(() => { useEffect(() => {
if (!isEnabled) return;
if (!entity || opts.refetch) { if (!entity || opts.refetch) {
fetchEntity(); fetchEntity();
} }
}, []); }, [isEnabled]);
return { return {
entity, entity,