diff options
5 files changed, 285 insertions, 31 deletions
diff --git a/packages/merchant-backoffice-ui/src/InstanceRoutes.tsx b/packages/merchant-backoffice-ui/src/InstanceRoutes.tsx index 5ee17220d..a82e96c14 100644 --- a/packages/merchant-backoffice-ui/src/InstanceRoutes.tsx +++ b/packages/merchant-backoffice-ui/src/InstanceRoutes.tsx @@ -27,10 +27,9 @@ import { import { format } from "date-fns"; import { Fragment, FunctionComponent, h, VNode } from "preact"; import { Route, route, Router } from "preact-router"; -import { useCallback, useEffect, useMemo, useState } from "preact/hooks"; +import { useEffect, useMemo, useState } from "preact/hooks"; import { Loading } from "./components/exception/loading.js"; import { Menu, NotificationCard } from "./components/menu/index.js"; -import { useBackendContext } from "./context/backend.js"; import { InstanceContextProvider } from "./context/instance.js"; import { useBackendDefaultToken, @@ -68,7 +67,7 @@ import ValidatorUpdatePage from "./paths/instance/otp_devices/update/index.js"; import TokenFamilyCreatePage from "./paths/instance/tokenfamilies/create/index.js"; import TokenFamilyListPage from "./paths/instance/tokenfamilies/list/index.js"; -// import TokenFamilyUpdatePage from "./paths/instance/tokenfamilies/update/index.js"; +import TokenFamilyUpdatePage from "./paths/instance/tokenfamilies/update/index.js"; import TransferCreatePage from "./paths/instance/transfers/create/index.js"; import TransferListPage from "./paths/instance/transfers/list/index.js"; @@ -511,7 +510,7 @@ export function InstanceRoutes({ }} onNotFound={IfAdminCreateDefaultOr(NotFoundPage)} /> - {/* <Route + <Route path={InstancePaths.token_family_update} component={TokenFamilyUpdatePage} onUnauthorized={LoginPageAccessDenied} @@ -523,7 +522,7 @@ export function InstanceRoutes({ route(InstancePaths.token_family_list); }} onNotFound={IfAdminCreateDefaultOr(NotFoundPage)} - /> */} + /> <Route path={InstancePaths.token_family_new} component={TokenFamilyCreatePage} diff --git a/packages/merchant-backoffice-ui/src/components/tokenfamily/TokenFamilyForm.tsx b/packages/merchant-backoffice-ui/src/components/tokenfamily/TokenFamilyForm.tsx index 420466eaa..95441b9fa 100644 --- a/packages/merchant-backoffice-ui/src/components/tokenfamily/TokenFamilyForm.tsx +++ b/packages/merchant-backoffice-ui/src/components/tokenfamily/TokenFamilyForm.tsx @@ -25,10 +25,7 @@ import { useCallback, useEffect, useState } from "preact/hooks"; import * as yup from "yup"; import { useBackendContext } from "../../context/backend.js"; import { MerchantBackend } from "../../declaration.js"; -import { - TokenFamilyCreateSchema as createSchema, - TokenFamilyUpdateSchema as updateSchema, -} from "../../schemas/index.js"; +import { TokenFamilyCreateSchema } from "../../schemas/index.js"; import { FormErrors, FormProvider } from "../form/FormProvider.js"; import { Input } from "../form/Input.js"; import { InputWithAddon } from "../form/InputWithAddon.js"; @@ -44,7 +41,7 @@ interface Props { alreadyExist?: boolean; } -export function TokenFamilyForm({ onSubscribe, initial, alreadyExist }: Props) { +export function TokenFamilyForm({ onSubscribe }: Props) { const [value, valueHandler] = useState<Partial<Entity>>({ slug: "", name: "", @@ -58,10 +55,7 @@ export function TokenFamilyForm({ onSubscribe, initial, alreadyExist }: Props) { let errors: FormErrors<Entity> = {}; try { - // (alreadyExist ? updateSchema : createSchema).validateSync(value, { - // abortEarly: false, - // }); - createSchema.validateSync(value, { + TokenFamilyCreateSchema.validateSync(value, { abortEarly: false, }); } catch (err) { @@ -98,22 +92,18 @@ export function TokenFamilyForm({ onSubscribe, initial, alreadyExist }: Props) { object={value} valueHandler={valueHandler} > - {/* {alreadyExist ? undefined : ( */} - <InputWithAddon<Entity> - name="slug" - addonBefore={`${backend.url}/tokenfamily/`} - label={i18n.str`Slug`} - tooltip={i18n.str`token family slug to use in URLs (for internal use only)`} - /> - {/* )} - {alreadyExist ? undefined : ( */} - <InputSelector<Entity> - name="kind" - label={i18n.str`Kind`} - tooltip={i18n.str`token family kind`} - values={["discount", "subscription"]} - /> - {/* )} */} + <InputWithAddon<Entity> + name="slug" + addonBefore={`${backend.url}/tokenfamily/`} + label={i18n.str`Slug`} + tooltip={i18n.str`token family slug to use in URLs (for internal use only)`} + /> + <InputSelector<Entity> + name="kind" + label={i18n.str`Kind`} + tooltip={i18n.str`token family kind`} + values={["discount", "subscription"]} + /> <Input<Entity> name="name" inputType="text" diff --git a/packages/merchant-backoffice-ui/src/paths/instance/tokenfamilies/create/index.tsx b/packages/merchant-backoffice-ui/src/paths/instance/tokenfamilies/create/index.tsx index 5abab05b0..0beef4c45 100644 --- a/packages/merchant-backoffice-ui/src/paths/instance/tokenfamilies/create/index.tsx +++ b/packages/merchant-backoffice-ui/src/paths/instance/tokenfamilies/create/index.tsx @@ -16,7 +16,7 @@ /** * - * @author Sebastian Javier Marchano (sebasjm) + * @author Christian Blättler */ import { useTranslationContext } from "@gnu-taler/web-util/browser"; diff --git a/packages/merchant-backoffice-ui/src/paths/instance/tokenfamilies/update/UpdatePage.tsx b/packages/merchant-backoffice-ui/src/paths/instance/tokenfamilies/update/UpdatePage.tsx new file mode 100644 index 000000000..3735645bd --- /dev/null +++ b/packages/merchant-backoffice-ui/src/paths/instance/tokenfamilies/update/UpdatePage.tsx @@ -0,0 +1,159 @@ +/* + This file is part of GNU Taler + (C) 2021-2023 Taler Systems S.A. + + GNU Taler is free software; you can redistribute it and/or modify it under the + terms of the GNU General Public License as published by the Free Software + Foundation; either version 3, or (at your option) any later version. + + GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> + */ + +/** + * + * @author Christian Blättler + */ + +import { useTranslationContext } from "@gnu-taler/web-util/browser"; +import { h } from "preact"; +import { useState } from "preact/hooks"; +import * as yup from "yup"; +import { MerchantBackend, WithId } from "../../../../declaration.js"; +import { TokenFamilyUpdateSchema } from "../../../../schemas/index.js"; +import { useBackendContext } from "../../../../context/backend.js"; +import { FormErrors, FormProvider } from "../../../../components/form/FormProvider.js"; +import { Input } from "../../../../components/form/Input.js"; +import { InputDate } from "../../../../components/form/InputDate.js"; +import { InputDuration } from "../../../../components/form/InputDuration.js"; +import { AsyncButton } from "../../../../components/exception/AsyncButton.js"; + +type Entity = MerchantBackend.TokenFamilies.TokenFamilyPatchDetail & WithId; + +interface Props { + onUpdate: (d: Entity) => Promise<void>; + onBack?: () => void; + tokenFamily: Entity; +} + +export function UpdatePage({ onUpdate, onBack, tokenFamily }: Props) { + const [value, valueHandler] = useState<Partial<Entity>>({ + ...tokenFamily, + }); + let errors: FormErrors<Entity> = {}; + + try { + TokenFamilyUpdateSchema.validateSync(value, { + abortEarly: false, + }); + } catch (err) { + if (err instanceof yup.ValidationError) { + const yupErrors = err.inner as yup.ValidationError[]; + errors = yupErrors.reduce( + (prev, cur) => + !cur.path ? prev : { ...prev, [cur.path]: cur.message }, + {}, + ); + } + } + const hasErrors = Object.keys(errors).some( + (k) => (errors as any)[k] !== undefined, + ); + + const submitForm = () => { + if (hasErrors) return Promise.reject(); + + return onUpdate(value as Entity); + } + + const { i18n } = useTranslationContext(); + const { url: backendURL } = useBackendContext() + + return ( + <div> + <section class="section"> + <section class="hero is-hero-bar"> + <div class="hero-body"> + <div class="level"> + <div class="level-left"> + <div class="level-item"> + <span class="is-size-4"> + {backendURL}/tokenfamilies/{tokenFamily.id} + </span> + </div> + </div> + </div> + </div> + </section> + <hr /> + + <section class="section is-main-section"> + <div class="columns"> + <div class="column is-four-fifths"> + <FormProvider<Entity> + name="token_family" + errors={errors} + object={value} + valueHandler={valueHandler} + > + <Input<Entity> + name="name" + inputType="text" + label={i18n.str`Name`} + tooltip={i18n.str`user-readable token family name`} + /> + <Input<Entity> + name="description" + inputType="multiline" + label={i18n.str`Description`} + tooltip={i18n.str`token family description for customers`} + /> + <InputDate<Entity> + name="valid_after" + label={i18n.str`Valid After`} + tooltip={i18n.str`token family can issue tokens after this date`} + withTimestampSupport + /> + <InputDate<Entity> + name="valid_before" + label={i18n.str`Valid Before`} + tooltip={i18n.str`token family can issue tokens until this date`} + withTimestampSupport + /> + <InputDuration<Entity> + name="duration" + label={i18n.str`Duration`} + tooltip={i18n.str`validity duration of a issued token`} + withForever + /> + </FormProvider> + + <div class="buttons is-right mt-5"> + {onBack && ( + <button class="button" onClick={onBack}> + <i18n.Translate>Cancel</i18n.Translate> + </button> + )} + <AsyncButton + disabled={hasErrors} + data-tooltip={ + hasErrors + ? i18n.str`Need to complete marked fields` + : "confirm operation" + } + onClick={submitForm} + > + <i18n.Translate>Confirm</i18n.Translate> + </AsyncButton> + </div> + </div> + </div> + </section> + </section> + </div> + ); +} diff --git a/packages/merchant-backoffice-ui/src/paths/instance/tokenfamilies/update/index.tsx b/packages/merchant-backoffice-ui/src/paths/instance/tokenfamilies/update/index.tsx new file mode 100644 index 000000000..4f582d7f3 --- /dev/null +++ b/packages/merchant-backoffice-ui/src/paths/instance/tokenfamilies/update/index.tsx @@ -0,0 +1,106 @@ +/* + This file is part of GNU Taler + (C) 2021-2024 Taler Systems S.A. + + GNU Taler is free software; you can redistribute it and/or modify it under the + terms of the GNU General Public License as published by the Free Software + Foundation; either version 3, or (at your option) any later version. + + GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> + */ + +/** + * + * @author Christian Blättler + */ + +import { + ErrorType, + HttpError, + useTranslationContext, +} from "@gnu-taler/web-util/browser"; +import { Fragment, h, VNode } from "preact"; +import { useState } from "preact/hooks"; +import { Loading } from "../../../../components/exception/loading.js"; +import { NotificationCard } from "../../../../components/menu/index.js"; +import { MerchantBackend, WithId } from "../../../../declaration.js"; +import { Notification } from "../../../../utils/types.js"; +import { UpdatePage } from "./UpdatePage.js"; +import { HttpStatusCode } from "@gnu-taler/taler-util"; +import { useTokenFamilyAPI, useTokenFamilyDetails } from "../../../../hooks/tokenfamily.js"; + +export type Entity = MerchantBackend.TokenFamilies.TokenFamilyPatchDetail & WithId; + +interface Props { + onBack?: () => void; + onConfirm: () => void; + onUnauthorized: () => VNode; + onNotFound: () => VNode; + onLoadError: (e: HttpError<MerchantBackend.ErrorDetail>) => VNode; + slug: string; +} +export default function UpdateTokenFamily({ + slug, + onConfirm, + onBack, + onUnauthorized, + onNotFound, + onLoadError, +}: Props): VNode { + const { updateTokenFamily } = useTokenFamilyAPI(); + const result = useTokenFamilyDetails(slug); + const [notif, setNotif] = useState<Notification | undefined>(undefined); + + const { i18n } = useTranslationContext(); + + if (result.loading) return <Loading />; + 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); + } + + const family: Entity = { + id: slug, + name: result.data.name, + description: result.data.description, + description_i18n: result.data.description_i18n || {}, + duration: result.data.duration, + valid_after: result.data.valid_after, + valid_before: result.data.valid_before, + }; + + return ( + <Fragment> + <NotificationCard notification={notif} /> + <UpdatePage + tokenFamily={family} + onBack={onBack} + onUpdate={(data) => { + return updateTokenFamily(slug, data) + .then(onConfirm) + .catch((error) => { + setNotif({ + message: i18n.str`could not update token family`, + type: "ERROR", + description: error.message, + }); + }); + }} + /> + </Fragment> + ); +} |