From 56da180423029a1b53d2be343eed4f073e96dc89 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 3 Apr 2024 09:52:53 -0300 Subject: wip #8655: updating paginated queries --- .../src/paths/instance/accounts/create/index.tsx | 2 +- .../src/paths/instance/accounts/list/index.tsx | 26 +++++++--------------- .../src/paths/instance/products/list/index.tsx | 2 +- 3 files changed, 10 insertions(+), 20 deletions(-) (limited to 'packages/merchant-backoffice-ui/src/paths') diff --git a/packages/merchant-backoffice-ui/src/paths/instance/accounts/create/index.tsx b/packages/merchant-backoffice-ui/src/paths/instance/accounts/create/index.tsx index 35c9e6624..0ce126b76 100644 --- a/packages/merchant-backoffice-ui/src/paths/instance/accounts/create/index.tsx +++ b/packages/merchant-backoffice-ui/src/paths/instance/accounts/create/index.tsx @@ -46,7 +46,7 @@ export default function CreateValidator({ onConfirm, onBack }: Props): VNode { { - return api.management.addAccount(state.token, request) + return api.management.addBankAccount(state.token, request) .then(() => { onConfirm() }) diff --git a/packages/merchant-backoffice-ui/src/paths/instance/accounts/list/index.tsx b/packages/merchant-backoffice-ui/src/paths/instance/accounts/list/index.tsx index 8de6c763e..ab63d0d5f 100644 --- a/packages/merchant-backoffice-ui/src/paths/instance/accounts/list/index.tsx +++ b/packages/merchant-backoffice-ui/src/paths/instance/accounts/list/index.tsx @@ -19,7 +19,7 @@ * @author Sebastian Javier Marchano (sebasjm) */ -import { HttpStatusCode, TalerErrorDetail, TalerMerchantApi } from "@gnu-taler/taler-util"; +import { HttpStatusCode, TalerError, TalerErrorDetail, TalerMerchantApi } from "@gnu-taler/taler-util"; import { ErrorType, HttpError, @@ -34,6 +34,7 @@ import { useInstanceBankAccounts } from "../../../../hooks/bank.js"; import { Notification } from "../../../../utils/types.js"; import { ListPage } from "./ListPage.js"; import { useSessionContext } from "../../../../context/session.js"; +import { ErrorLoadingMerchant } from "../../../../components/ErrorLoadingMerchant.js"; interface Props { onUnauthorized: () => VNode; @@ -50,32 +51,21 @@ export default function ListOtpDevices({ onSelect, onNotFound, }: Props): VNode { - const [position, setPosition] = useState(undefined); const { i18n } = useTranslationContext(); const [notif, setNotif] = useState(undefined); const { lib: api } = useMerchantApiContext(); const { state } = useSessionContext(); - const result = useInstanceBankAccounts({ position }, (id) => setPosition(id)); + const result = useInstanceBankAccounts(); - if (result.loading) return ; - if (!result.ok) { - if ( - result.type === ErrorType.CLIENT && - result.status === HttpStatusCode.Unauthorized - ) - return onUnauthorized(); - if ( - result.type === ErrorType.CLIENT && - result.status === HttpStatusCode.NotFound - ) - return onNotFound(); - return onLoadError(result); + if (!result) return + if (result instanceof TalerError) { + return } return ( - {result.data.accounts.length < 1 && + {result.result.length < 1 && } { - const resp = await lib.management.getProduct(state.token, id); + const resp = await lib.management.getProductDetails(state.token, id); return resp.type === "ok"; }} onSelect={onSelect} -- cgit v1.2.3