Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

duplicate reflect #2280

Merged
merged 8 commits into from
May 20, 2024
Merged

duplicate reflect #2280

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a7911d8
chore(): keep track of last reflectionID value
themonster2015 May 16, 2024
46899fa
Merge branch 'next' into fix/reflections-not-displaying
themonster2015 May 16, 2024
4c6def3
chore(): update with feedback
themonster2015 May 16, 2024
a52c2a0
chore(): refactor
themonster2015 May 16, 2024
ad8d157
chore(): use useCallback
themonster2015 May 16, 2024
7465e20
chore(): remove change
themonster2015 May 16, 2024
6c072fe
Merge branch 'next' into fix/reflections-not-displaying
themonster2015 May 16, 2024
4e1ae27
Merge branch 'next' into fix/reflections-not-displaying
themonster2015 May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 61 additions & 52 deletions libs/hooks/src/use-reflections.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,10 @@ export const useReflections = (props: UseReflectionProps) => {
return vars;
}, [sorting, filters]);

React.useEffect(() => {
setState({ reflections: [] });
}, [filters]);

const [fetchReflections, reflectionsQuery] = useGetReflectionStreamLazyQuery({
variables: {
...mergedVars,
Expand Down Expand Up @@ -138,7 +142,7 @@ export const useReflections = (props: UseReflectionProps) => {
)
);
},
[entityId, entityType, pendingReflections, state.reflections],
[entityId, entityType, reflectionCursors, state.reflections],
);

const { lastResponse, removeLastResponse, isPolling, startPolling } = useQueryPolling<
Expand Down Expand Up @@ -186,69 +190,74 @@ export const useReflections = (props: UseReflectionProps) => {
lastResponse,
mergedVars,
pendingReflections,
reflectionCursors,
reflectionsQuery.data,
removeLastResponse,
removePendingReflections,
startPolling,
state.reflections,
]);

const fetchInitialData = async (restoreItem: { key: string; offsetTop: number }) => {
if (restoreItem && !reflectionsQuery.called) {
try {
const results = await fetchReflections({
variables: {
...mergedVars,
after: restoreItem?.key,
indexer: indexingDID.current,
},
});
if (results.error) {
setErrors(prev => [...prev, results.error]);
return;
}
if (!results.data) return;

const { edges, pageInfo } = extractData(results.data, entityType, reflectionCursors);

setState({
reflections: edges
.filter(edge => !reflectionCursors.has(edge.cursor))
.reverse() as AkashaReflectStreamEdge[],
pageInfo,
});
} catch (err) {
setErrors(prev => prev.concat(err));
}
} else if (!reflectionsQuery.called) {
try {
const results = await fetchReflections({
variables: {
...mergedVars,
indexer: indexingDID.current,
sorting: { createdAt: SortOrder.Desc },
},
});
if (results.error) {
setErrors(prev => [...prev, results.error]);
return;
const fetchInitialData = React.useCallback(
async (restoreItem: { key: string; offsetTop: number }) => {
if (restoreItem && !reflectionsQuery.called) {
try {
const results = await fetchReflections({
variables: {
...mergedVars,
after: restoreItem?.key,
indexer: indexingDID.current,
},
});
if (results.error) {
setErrors(prev => [...prev, results.error]);
return;
}

if (!results.data) return;

const { edges, pageInfo } = extractData(results.data, entityType, reflectionCursors);

setState({
reflections: edges
.filter(edge => !reflectionCursors.has(edge.cursor))
.reverse() as AkashaReflectStreamEdge[],
pageInfo,
});
} catch (err) {
setErrors(prev => prev.concat(err));
}
} else {
try {
const results = await fetchReflections({
variables: {
...mergedVars,
indexer: indexingDID.current,
sorting: { createdAt: SortOrder.Desc },
},
});
if (results.error) {
setErrors(prev => [...prev, results.error]);
return;
}

if (!results.data) return;
if (!results.data) return;

const { edges, pageInfo } = extractData(results.data, entityType, reflectionCursors);
const { edges, pageInfo } = extractData(results.data, entityType, reflectionCursors);

setState({
reflections: edges.filter(
edge => !reflectionCursors.has(edge.cursor),
) as AkashaReflectStreamEdge[],
pageInfo: pageInfo,
});
} catch (err) {
setErrors(prev => prev.concat(err));
setState({
reflections: edges.filter(
edge => !reflectionCursors.has(edge.cursor),
) as AkashaReflectStreamEdge[],
pageInfo: pageInfo,
});
} catch (err) {
setErrors(prev => prev.concat(err));
}
}
}
};
},
[entityType, fetchReflections, mergedVars, reflectionCursors, reflectionsQuery.called],
);

const fetchNextPage = async (lastCursor: string) => {
if (reflectionsQuery.loading || reflectionsQuery.error || !lastCursor) return;
Expand Down