From 5181d060cf09ffc7250c9f1069920da0724e0284 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 22 Mar 2024 15:15:15 -0300 Subject: wip, doesn't compile. now merchant doesn't have it's own definition of types... it uses the one defined by taler-util --- .../merchant-backoffice-ui/src/hooks/templates.ts | 48 +++++++++++----------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'packages/merchant-backoffice-ui/src/hooks/templates.ts') diff --git a/packages/merchant-backoffice-ui/src/hooks/templates.ts b/packages/merchant-backoffice-ui/src/hooks/templates.ts index 96671452e..cdcc418ef 100644 --- a/packages/merchant-backoffice-ui/src/hooks/templates.ts +++ b/packages/merchant-backoffice-ui/src/hooks/templates.ts @@ -20,11 +20,11 @@ import { RequestError, } from "@gnu-taler/web-util/browser"; import { useEffect, useState } from "preact/hooks"; -import { MerchantBackend } from "../declaration.js"; import { MAX_RESULT_SIZE, PAGE_SIZE } from "../utils/constants.js"; import { useBackendInstanceRequest, useMatchMutate } from "./backend.js"; // FIX default import https://github.com/microsoft/TypeScript/issues/49189 +import { TalerErrorDetail, TalerMerchantApi } from "@gnu-taler/taler-util"; import _useSWR, { SWRHook } from "swr"; const useSWR = _useSWR as unknown as SWRHook; @@ -33,7 +33,7 @@ export function useTemplateAPI(): TemplateAPI { const { request } = useBackendInstanceRequest(); const createTemplate = async ( - data: MerchantBackend.Template.TemplateAddDetails, + data: TalerMerchantApi.TemplateAddDetails, ): Promise> => { const res = await request(`/private/templates`, { method: "POST", @@ -45,7 +45,7 @@ export function useTemplateAPI(): TemplateAPI { const updateTemplate = async ( templateId: string, - data: MerchantBackend.Template.TemplatePatchDetails, + data: TalerMerchantApi.TemplatePatchDetails, ): Promise> => { const res = await request(`/private/templates/${templateId}`, { method: "PATCH", @@ -67,11 +67,11 @@ export function useTemplateAPI(): TemplateAPI { const createOrderFromTemplate = async ( templateId: string, - data: MerchantBackend.Template.UsingTemplateDetails, + data: TalerMerchantApi.UsingTemplateDetails, ): Promise< - HttpResponseOk + HttpResponseOk > => { - const res = await request( + const res = await request( `/templates/${templateId}`, { method: "POST", @@ -101,11 +101,11 @@ export function useTemplateAPI(): TemplateAPI { export interface TemplateAPI { createTemplate: ( - data: MerchantBackend.Template.TemplateAddDetails, + data: TalerMerchantApi.TemplateAddDetails, ) => Promise>; updateTemplate: ( id: string, - data: MerchantBackend.Template.TemplatePatchDetails, + data: TalerMerchantApi.TemplatePatchDetails, ) => Promise>; testTemplateExist: ( id: string @@ -113,8 +113,8 @@ export interface TemplateAPI { deleteTemplate: (id: string) => Promise>; createOrderFromTemplate: ( id: string, - data: MerchantBackend.Template.UsingTemplateDetails, - ) => Promise>; + data: TalerMerchantApi.UsingTemplateDetails, + ) => Promise>; } export interface InstanceTemplateFilter { @@ -126,8 +126,8 @@ export function useInstanceTemplates( args?: InstanceTemplateFilter, updatePosition?: (id: string) => void, ): HttpResponsePaginated< - MerchantBackend.Template.TemplateSummaryResponse, - MerchantBackend.ErrorDetail + TalerMerchantApi.TemplateSummaryResponse, + TalerErrorDetail > { const { templateFetcher } = useBackendInstanceRequest(); @@ -148,8 +148,8 @@ export function useInstanceTemplates( error: beforeError, isValidating: loadingBefore, } = useSWR< - HttpResponseOk, - RequestError>( + HttpResponseOk, + RequestError>( [ `/private/templates`, args?.position, @@ -162,22 +162,22 @@ export function useInstanceTemplates( error: afterError, isValidating: loadingAfter, } = useSWR< - HttpResponseOk, - RequestError + HttpResponseOk, + RequestError >([`/private/templates`, args?.position, -totalAfter], templateFetcher); //this will save last result const [lastBefore, setLastBefore] = useState< HttpResponse< - MerchantBackend.Template.TemplateSummaryResponse, - MerchantBackend.ErrorDetail + TalerMerchantApi.TemplateSummaryResponse, + TalerErrorDetail > >({ loading: true }); const [lastAfter, setLastAfter] = useState< HttpResponse< - MerchantBackend.Template.TemplateSummaryResponse, - MerchantBackend.ErrorDetail + TalerMerchantApi.TemplateSummaryResponse, + TalerErrorDetail > >({ loading: true }); useEffect(() => { @@ -241,14 +241,14 @@ export function useInstanceTemplates( export function useTemplateDetails( templateId: string, ): HttpResponse< - MerchantBackend.Template.TemplateDetails, - MerchantBackend.ErrorDetail + TalerMerchantApi.TemplateDetails, + TalerErrorDetail > { const { templateFetcher } = useBackendInstanceRequest(); const { data, error, isValidating } = useSWR< - HttpResponseOk, - RequestError + HttpResponseOk, + RequestError >([`/private/templates/${templateId}`], templateFetcher, { refreshInterval: 0, refreshWhenHidden: false, -- cgit v1.2.3