Skip to content

inbox view: fix mark_as_done optimistic update #393

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

Merged
aquaductape merged 1 commit into from
Dec 1, 2025
Merged

inbox view: fix mark_as_done optimistic update #393

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
55 changes: 46 additions & 9 deletions js/app/packages/app/component/ViewConfig.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,9 @@ const ALL_VIEWCONFIG_DEFAULTS = {
hotkeyOptions: {
e: (entity, extra) => {
if (entity.type === 'email') {
archiveEmail(entity.id, { isDone: entity.done });
archiveEmail(entity.id, {
isDone: entity.done,
});
}
if (extra?.notificationSource) {
markNotificationsForEntityAsDone(extra.notificationSource, entity);
Expand Down Expand Up @@ -297,24 +299,50 @@ export async function archiveEmail(
id: string,
options: { isDone: boolean; optimisticallyExclude?: boolean }
) {
// optimistic update
await queryClient.cancelQueries({ queryKey: queryKeys.all.email });
await Promise.all([
queryClient.cancelQueries({ queryKey: queryKeys.all.email }),
queryClient.cancelQueries({ queryKey: queryKeys.all.dss }),
]);

const previous = queryClient.getQueriesData<{
const previousEmail = queryClient.getQueriesData<{
pages: { items: EntityData[] }[];
}>({
queryKey: queryKeys.all.email,
});
const previousEmailThreadItemFromDss = queryClient.getQueriesData<{
pages: { items: EntityData[] }[];
}>({
queryKey: queryKeys.all.dss,
});

const applyOptimistic = (data?: { pages: { items: EntityData[] }[] }) => {
const applyOptimistic = (data?: {
pages: { items: (EntityData | { data: EntityData })[] }[];
}) => {
if (!data) return data;

return {
...data,
pages: data.pages.map((page) => ({
...page,
items: options.optimisticallyExclude
? page.items.filter((item) => item.id !== id)
? page.items.filter((item) => {
if ('data' in item) {
return item.data.id !== id;
}
return item.id !== id;
})
: page.items.map((item) => {
if ('data' in item) {
return item.data.id === id
? {
...item,
data: {
...item.data,
inboxVisible: false,
},
}
: item;
}
return item.id === id
? {
...item,
Expand All @@ -326,7 +354,10 @@ export async function archiveEmail(
};
};

for (const [key, data] of previous) {
for (const [key, data] of [
...previousEmailThreadItemFromDss,
...previousEmail,
]) {
queryClient.setQueryData(key, applyOptimistic(data));
}

Expand All @@ -335,12 +366,18 @@ export async function archiveEmail(
await emailClient.flagArchived({ value: !options.isDone, id });
} catch (_err) {
// rollback on error
for (const [key, data] of previous) {
for (const [key, data] of previousEmail) {
queryClient.setQueryData(key, data);
}
for (const [key, data] of previousEmailThreadItemFromDss) {
queryClient.setQueryData(key, data);
}
} finally {
// revalidate
await queryClient.invalidateQueries({ queryKey: queryKeys.all.email });
await Promise.all([
queryClient.invalidateQueries({ queryKey: queryKeys.all.email }),
queryClient.invalidateQueries({ queryKey: queryKeys.all.dss }),
]);
}
}

Expand Down