diff options
Diffstat (limited to 'web/source/settings/lib')
| -rw-r--r-- | web/source/settings/lib/query/admin/index.ts | 13 | ||||
| -rw-r--r-- | web/source/settings/lib/query/gts-api.ts | 6 | ||||
| -rw-r--r-- | web/source/settings/lib/types/account.ts | 6 |
3 files changed, 20 insertions, 5 deletions
diff --git a/web/source/settings/lib/query/admin/index.ts b/web/source/settings/lib/query/admin/index.ts index cbe66705b..3e7b1a0a0 100644 --- a/web/source/settings/lib/query/admin/index.ts +++ b/web/source/settings/lib/query/admin/index.ts @@ -20,8 +20,9 @@ import { replaceCacheOnMutation, removeFromCacheOnMutation } from "../query-modifiers"; import { gtsApi } from "../gts-api"; import { listToKeyedObject } from "../transforms"; -import { AdminAccount, HandleSignupParams, SearchAccountParams } from "../../types/account"; +import { AdminAccount, HandleSignupParams, SearchAccountParams, SearchAccountResp } from "../../types/account"; import { InstanceRule, MappedRules } from "../../types/rules"; +import parse from "parse-link-header"; const extended = gtsApi.injectEndpoints({ endpoints: (build) => ({ @@ -65,7 +66,7 @@ const extended = gtsApi.injectEndpoints({ ], }), - searchAccounts: build.query<AdminAccount[], SearchAccountParams>({ + searchAccounts: build.query<SearchAccountResp, SearchAccountParams>({ query: (form) => { const params = new(URLSearchParams); Object.entries(form).forEach(([k, v]) => { @@ -83,10 +84,16 @@ const extended = gtsApi.injectEndpoints({ url: `/api/v2/admin/accounts${query}` }; }, + transformResponse: (apiResp: AdminAccount[], meta) => { + const accounts = apiResp; + const linksStr = meta?.response?.headers.get("Link"); + const links = parse(linksStr); + return { accounts, links }; + }, providesTags: (res) => res ? [ - ...res.map(({ id }) => ({ type: 'Account' as const, id })), + ...res.accounts.map(({ id }) => ({ type: 'Account' as const, id })), { type: 'Account', id: 'LIST' }, ] : [{ type: 'Account', id: 'LIST' }], diff --git a/web/source/settings/lib/query/gts-api.ts b/web/source/settings/lib/query/gts-api.ts index a07f5ff1e..6e5eafeab 100644 --- a/web/source/settings/lib/query/gts-api.ts +++ b/web/source/settings/lib/query/gts-api.ts @@ -24,7 +24,7 @@ import type { FetchBaseQueryError, } from '@reduxjs/toolkit/query/react'; import { serialize as serializeForm } from "object-to-formdata"; - +import type { FetchBaseQueryMeta } from "@reduxjs/toolkit/dist/query/fetchBaseQuery"; import type { RootState } from '../../redux/store'; import { InstanceV1 } from '../types/instance'; @@ -65,7 +65,9 @@ export interface GTSFetchArgs extends FetchArgs { const gtsBaseQuery: BaseQueryFn< string | GTSFetchArgs, any, - FetchBaseQueryError + FetchBaseQueryError, + {}, + FetchBaseQueryMeta > = async (args, api, extraOptions) => { // Retrieve state at the moment // this function was called. diff --git a/web/source/settings/lib/types/account.ts b/web/source/settings/lib/types/account.ts index 3e7e9640d..db97001ac 100644 --- a/web/source/settings/lib/types/account.ts +++ b/web/source/settings/lib/types/account.ts @@ -17,6 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ +import { Links } from "parse-link-header"; import { CustomEmoji } from "./custom-emoji"; export interface AdminAccount { @@ -79,6 +80,11 @@ export interface SearchAccountParams { limit?: number, } +export interface SearchAccountResp { + accounts: AdminAccount[]; + links: Links | null; +} + export interface HandleSignupParams { id: string, approve_or_reject: "approve" | "reject", |