diff options
Diffstat (limited to 'packages/merchant-backoffice-ui/src/paths/admin')
5 files changed, 29 insertions, 31 deletions
diff --git a/packages/merchant-backoffice-ui/src/paths/admin/create/CreatePage.tsx b/packages/merchant-backoffice-ui/src/paths/admin/create/CreatePage.tsx index 8ce7c1d3a..731ea8939 100644 --- a/packages/merchant-backoffice-ui/src/paths/admin/create/CreatePage.tsx +++ b/packages/merchant-backoffice-ui/src/paths/admin/create/CreatePage.tsx @@ -19,6 +19,7 @@ * @author Sebastian Javier Marchano (sebasjm) */ +import { Duration, TalerMerchantApi } from "@gnu-taler/taler-util"; import { useTranslationContext } from "@gnu-taler/web-util/browser"; import { h, VNode } from "preact"; import { useState } from "preact/hooks"; @@ -28,20 +29,18 @@ import { FormProvider, } from "../../../components/form/FormProvider.js"; import { DefaultInstanceFormFields } from "../../../components/instance/DefaultInstanceFormFields.js"; -import { MerchantBackend } from "../../../declaration.js"; +import { SetTokenNewInstanceModal } from "../../../components/modal/index.js"; import { INSTANCE_ID_REGEX } from "../../../utils/constants.js"; import { undefinedIfEmpty } from "../../../utils/table.js"; -import { SetTokenNewInstanceModal } from "../../../components/modal/index.js"; -import { Duration } from "@gnu-taler/taler-util"; -export type Entity = Omit<Omit<MerchantBackend.Instances.InstanceConfigurationMessage, "default_pay_delay">, "default_wire_transfer_delay"> & { +export type Entity = Omit<Omit<TalerMerchantApi.InstanceConfigurationMessage, "default_pay_delay">, "default_wire_transfer_delay"> & { auth_token?: string; default_pay_delay: Duration, default_wire_transfer_delay: Duration, }; interface Props { - onCreate: (d: MerchantBackend.Instances.InstanceConfigurationMessage) => Promise<void>; + onCreate: (d: TalerMerchantApi.InstanceConfigurationMessage) => Promise<void>; onBack?: () => void; forceId?: string; } @@ -134,7 +133,7 @@ export function CreatePage({ onCreate, onBack, forceId }: Props): VNode { // delete value.default_pay_delay; // delete value.default_wire_transfer_delay; - return onCreate(newValue as any as MerchantBackend.Instances.InstanceConfigurationMessage); + return onCreate(newValue as any as TalerMerchantApi.InstanceConfigurationMessage); }; function updateToken(token: string | null) { diff --git a/packages/merchant-backoffice-ui/src/paths/admin/create/index.tsx b/packages/merchant-backoffice-ui/src/paths/admin/create/index.tsx index 440cd2b07..99e20dcd7 100644 --- a/packages/merchant-backoffice-ui/src/paths/admin/create/index.tsx +++ b/packages/merchant-backoffice-ui/src/paths/admin/create/index.tsx @@ -17,6 +17,7 @@ * * @author Sebastian Javier Marchano (sebasjm) */ +import { TalerMerchantApi } from "@gnu-taler/taler-util"; import { useMerchantApiContext, useTranslationContext, @@ -24,9 +25,8 @@ import { import { Fragment, VNode, h } from "preact"; import { useState } from "preact/hooks"; import { NotificationCard } from "../../../components/menu/index.js"; -import { MerchantBackend } from "../../../declaration.js"; -import { useAdminAPI } from "../../../hooks/instance.js"; import { useSessionContext } from "../../../context/session.js"; +import { useAdminAPI } from "../../../hooks/instance.js"; import { Notification } from "../../../utils/types.js"; import { CreatePage } from "./CreatePage.js"; @@ -35,14 +35,14 @@ interface Props { onConfirm: () => void; forceId?: string; } -export type Entity = MerchantBackend.Instances.InstanceConfigurationMessage; +export type Entity = TalerMerchantApi.InstanceConfigurationMessage; export default function Create({ onBack, onConfirm, forceId }: Props): VNode { const { createInstance } = useAdminAPI(); const [notif, setNotif] = useState<Notification | undefined>(undefined); const { i18n } = useTranslationContext(); const { lib } = useMerchantApiContext(); - const { state, logIn } = useSessionContext(); + const { logIn } = useSessionContext(); return ( <Fragment> @@ -52,7 +52,7 @@ export default function Create({ onBack, onConfirm, forceId }: Props): VNode { onBack={onBack} forceId={forceId} onCreate={async ( - d: MerchantBackend.Instances.InstanceConfigurationMessage, + d: TalerMerchantApi.InstanceConfigurationMessage, ) => { try { await createInstance(d); diff --git a/packages/merchant-backoffice-ui/src/paths/admin/list/TableActive.tsx b/packages/merchant-backoffice-ui/src/paths/admin/list/TableActive.tsx index bc18bb352..a03a2659b 100644 --- a/packages/merchant-backoffice-ui/src/paths/admin/list/TableActive.tsx +++ b/packages/merchant-backoffice-ui/src/paths/admin/list/TableActive.tsx @@ -19,17 +19,17 @@ * @author Sebastian Javier Marchano (sebasjm) */ +import { TalerMerchantApi } from "@gnu-taler/taler-util"; import { useTranslationContext } from "@gnu-taler/web-util/browser"; import { h, VNode } from "preact"; import { StateUpdater, useEffect, useState } from "preact/hooks"; -import { MerchantBackend } from "../../../declaration.js"; import { useSessionContext } from "../../../context/session.js"; interface Props { - instances: MerchantBackend.Instances.Instance[]; + instances: TalerMerchantApi.Instance[]; onUpdate: (id: string) => void; - onDelete: (id: MerchantBackend.Instances.Instance) => void; - onPurge: (id: MerchantBackend.Instances.Instance) => void; + onDelete: (id: TalerMerchantApi.Instance) => void; + onPurge: (id: TalerMerchantApi.Instance) => void; onCreate: () => void; selected?: boolean; } @@ -128,10 +128,10 @@ export function CardTable({ } interface TableProps { rowSelection: string[]; - instances: MerchantBackend.Instances.Instance[]; + instances: TalerMerchantApi.Instance[]; onUpdate: (id: string) => void; - onDelete: (id: MerchantBackend.Instances.Instance) => void; - onPurge: (id: MerchantBackend.Instances.Instance) => void; + onDelete: (id: TalerMerchantApi.Instance) => void; + onPurge: (id: TalerMerchantApi.Instance) => void; rowSelectionHandler: StateUpdater<string[]>; } @@ -265,7 +265,7 @@ function EmptyTable(): VNode { } interface Actions { - element: MerchantBackend.Instances.Instance; + element: TalerMerchantApi.Instance; type: "DELETE" | "UPDATE"; } @@ -274,7 +274,7 @@ function notEmpty<TValue>(value: TValue | null | undefined): value is TValue { } function buildActions( - instances: MerchantBackend.Instances.Instance[], + instances: TalerMerchantApi.Instance[], selected: string[], action: "DELETE", ): Actions[] { diff --git a/packages/merchant-backoffice-ui/src/paths/admin/list/View.tsx b/packages/merchant-backoffice-ui/src/paths/admin/list/View.tsx index 09ad338d2..940d14334 100644 --- a/packages/merchant-backoffice-ui/src/paths/admin/list/View.tsx +++ b/packages/merchant-backoffice-ui/src/paths/admin/list/View.tsx @@ -19,18 +19,18 @@ * @author Sebastian Javier Marchano (sebasjm) */ +import { TalerMerchantApi } from "@gnu-taler/taler-util"; import { useTranslationContext } from "@gnu-taler/web-util/browser"; import { h, VNode } from "preact"; import { useState } from "preact/hooks"; -import { MerchantBackend } from "../../../declaration.js"; import { CardTable as CardTableActive } from "./TableActive.js"; interface Props { - instances: MerchantBackend.Instances.Instance[]; + instances: TalerMerchantApi.Instance[]; onCreate: () => void; onUpdate: (id: string) => void; - onDelete: (id: MerchantBackend.Instances.Instance) => void; - onPurge: (id: MerchantBackend.Instances.Instance) => void; + onDelete: (id: TalerMerchantApi.Instance) => void; + onPurge: (id: TalerMerchantApi.Instance) => void; selected?: boolean; } diff --git a/packages/merchant-backoffice-ui/src/paths/admin/list/index.tsx b/packages/merchant-backoffice-ui/src/paths/admin/list/index.tsx index 561e275ad..d3fa78b65 100644 --- a/packages/merchant-backoffice-ui/src/paths/admin/list/index.tsx +++ b/packages/merchant-backoffice-ui/src/paths/admin/list/index.tsx @@ -19,29 +19,28 @@ * @author Sebastian Javier Marchano (sebasjm) */ +import { HttpStatusCode, TalerErrorDetail, TalerMerchantApi } from "@gnu-taler/taler-util"; import { ErrorType, HttpError, useTranslationContext, } from "@gnu-taler/web-util/browser"; -import { Fragment, h, VNode } from "preact"; +import { Fragment, VNode, h } from "preact"; import { useState } from "preact/hooks"; import { Loading } from "../../../components/exception/loading.js"; import { NotificationCard } from "../../../components/menu/index.js"; import { DeleteModal, PurgeModal } from "../../../components/modal/index.js"; -import { MerchantBackend } from "../../../declaration.js"; import { useAdminAPI, useBackendInstances } from "../../../hooks/instance.js"; import { Notification } from "../../../utils/types.js"; import { View } from "./View.js"; -import { HttpStatusCode } from "@gnu-taler/taler-util"; interface Props { onCreate: () => void; onUpdate: (id: string) => void; - instances: MerchantBackend.Instances.Instance[]; + instances: TalerMerchantApi.Instance[]; onUnauthorized: () => VNode; onNotFound: () => VNode; - onLoadError: (error: HttpError<MerchantBackend.ErrorDetail>) => VNode; + onLoadError: (error: HttpError<TalerErrorDetail>) => VNode; } export default function Instances({ @@ -53,9 +52,9 @@ export default function Instances({ }: Props): VNode { const result = useBackendInstances(); const [deleting, setDeleting] = - useState<MerchantBackend.Instances.Instance | null>(null); + useState<TalerMerchantApi.Instance | null>(null); const [purging, setPurging] = - useState<MerchantBackend.Instances.Instance | null>(null); + useState<TalerMerchantApi.Instance | null>(null); const { deleteInstance, purgeInstance } = useAdminAPI(); const [notif, setNotif] = useState<Notification | undefined>(undefined); const { i18n } = useTranslationContext(); |