qugalet/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2024-11-22 19:56:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[frontend] Do optimistic update when approving/rejecting/suspending account (#2892)

Browse source
This commit is contained in:
tobi 2024-05-02 17:57:53 +02:00 committed by GitHub
parent a840f4d49d
commit 35b1c54bde
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 59 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
web/source/settings/lib/query/admin/index.ts
View file

@ -20,7 +20,7 @@
import { replaceCacheOnMutation, removeFromCacheOnMutation } from "../query-modifiers"; import { replaceCacheOnMutation, removeFromCacheOnMutation } from "../query-modifiers";
import { gtsApi } from "../gts-api"; import { gtsApi } from "../gts-api";
import { listToKeyedObject } from "../transforms"; import { listToKeyedObject } from "../transforms";
import { AdminAccount, HandleSignupParams, SearchAccountParams, SearchAccountResp } from "../../types/account"; import { ActionAccountParams, AdminAccount, HandleSignupParams, SearchAccountParams, SearchAccountResp } from "../../types/account";
import { InstanceRule, MappedRules } from "../../types/rules"; import { InstanceRule, MappedRules } from "../../types/rules";
import parse from "parse-link-header"; import parse from "parse-link-header";
@ -84,22 +84,19 @@ const extended = gtsApi.injectEndpoints({
url: `/api/v2/admin/accounts${query}` url: `/api/v2/admin/accounts${query}`
}; };
}, },
// Headers required for paging.
transformResponse: (apiResp: AdminAccount[], meta) => { transformResponse: (apiResp: AdminAccount[], meta) => {
const accounts = apiResp; const accounts = apiResp;
const linksStr = meta?.response?.headers.get("Link"); const linksStr = meta?.response?.headers.get("Link");
const links = parse(linksStr); const links = parse(linksStr);
return { accounts, links }; return { accounts, links };
}, },
providesTags: (res) => // Only provide LIST tag id since this model is not the
res // same as getAccount model (due to transformResponse).
? [ providesTags: [{ type: "Account", id: "TRANSFORMED" }]
...res.accounts.map(({ id }) => ({ type: 'Account' as const, id })),
{ type: 'Account', id: 'LIST' },
]
: [{ type: 'Account', id: 'LIST' }],
}), }),
actionAccount: build.mutation<string, { id: string, action: string, reason: string }>({ actionAccount: build.mutation<string, ActionAccountParams>({
query: ({ id, action, reason }) => ({ query: ({ id, action, reason }) => ({
method: "POST", method: "POST",
url: `/api/v1/admin/accounts/${id}/action`, url: `/api/v1/admin/accounts/${id}/action`,
@ -109,9 +106,26 @@ const extended = gtsApi.injectEndpoints({
text: reason text: reason
} }
}), }),
invalidatesTags: (_result, _error, { id }) => [ // Do an optimistic update on this account to mark
{ type: 'Account', id }, // it according to whatever action was submitted.
], async onQueryStarted({ id, action }, { dispatch, queryFulfilled }) {
const patchResult = dispatch(
extended.util.updateQueryData("getAccount", id, (draft) => {
if (action === "suspend") {
draft.suspended = true;
draft.account.suspended = true;
}
})
);
// Revert optimistic
// update if query fails.
try {
await queryFulfilled;
} catch {
patchResult.undo();
}
}
}), }),
handleSignup: build.mutation<AdminAccount, HandleSignupParams>({ handleSignup: build.mutation<AdminAccount, HandleSignupParams>({
@ -123,9 +137,32 @@ const extended = gtsApi.injectEndpoints({
body: approve_or_reject === "reject" ?? formData, body: approve_or_reject === "reject" ?? formData,
}; };
}, },
invalidatesTags: (_result, _error, { id }) => [ // Do an optimistic update on this account to mark it approved
{ type: 'Account', id }, // if approved was true, else just invalidate getAccount.
], async onQueryStarted({ id, approve_or_reject }, { dispatch, queryFulfilled }) {
if (approve_or_reject === "reject") {
// Just invalidate this ID and getAccounts.
dispatch(extended.util.invalidateTags([
{ type: "Account", id: id },
{ type: "Account", id: "TRANSFORMED" }
]));
return;
}
const patchResult = dispatch(
extended.util.updateQueryData("getAccount", id, (draft) => {
draft.approved = true;
})
);
// Revert optimistic
// update if query fails.
try {
await queryFulfilled;
} catch {
patchResult.undo();
}
}
}), }),
instanceRules: build.query<MappedRules, void>({ instanceRules: build.query<MappedRules, void>({

7
web/source/settings/lib/types/account.ts
View file

@ -63,6 +63,7 @@ export interface Account {
fields: [], fields: [],
enable_rss: boolean, enable_rss: boolean,
role: any, role: any,
suspended?: boolean,
} }
export interface SearchAccountParams { export interface SearchAccountParams {
@ -92,3 +93,9 @@ export interface HandleSignupParams {
message?: string, message?: string,
send_email?: boolean, send_email?: boolean,
} }
export interface ActionAccountParams {
id: string;
action: "suspend";
reason: string;
}