taler-typescript-core

Wallet core logic and WebUIs for various components
Log | Files | Refs | Submodules | README | LICENSE

commit 60ce250c8530710e0fa10fdf79ff4089878c0c99
parent fe38ba18dccc929ef91deee491cac6a4cc290acb
Author: Sebastian <sebasjm@gmail.com>
Date:   Tue, 15 Apr 2025 17:23:27 -0300

fix #9738

Diffstat:
Mpackages/aml-backoffice-ui/build.mjs | 1+
Mpackages/aml-backoffice-ui/src/forms/index.ts | 6++++--
Mpackages/aml-backoffice-ui/src/hooks/decision-request.ts | 8++++----
Mpackages/aml-backoffice-ui/src/pages/decision/Justification.tsx | 14+++++++-------
Mpackages/aml-backoffice-ui/src/pages/decision/Summary.tsx | 2+-
5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/packages/aml-backoffice-ui/build.mjs b/packages/aml-backoffice-ui/build.mjs @@ -19,6 +19,7 @@ import { build } from "@gnu-taler/web-util/build"; await build({ type: "production", + importMeta: import.meta, source: { js: ["src/index.tsx"], assets: [{ base: "src", files: ["src/index.html","src/forms.json"] }], diff --git a/packages/aml-backoffice-ui/src/forms/index.ts b/packages/aml-backoffice-ui/src/forms/index.ts @@ -15,7 +15,8 @@ */ import { form_generic_note, - form_vqf_902_11, + form_vqf_902_11_customer, + form_vqf_902_11_officer, form_vqf_902_14, form_vqf_902_1_customer, form_vqf_902_1_officer, @@ -34,7 +35,8 @@ export const preloadedForms: ( form_vqf_902_4(i18n), form_vqf_902_5(i18n), form_vqf_902_9(i18n), - form_vqf_902_11(i18n), + form_vqf_902_11_customer(i18n), + form_vqf_902_11_officer(i18n), form_vqf_902_14(i18n), form_generic_note(i18n), ]; diff --git a/packages/aml-backoffice-ui/src/hooks/decision-request.ts b/packages/aml-backoffice-ui/src/hooks/decision-request.ts @@ -64,7 +64,7 @@ export interface DecisionRequest { /** * Next measure after deadline */ - onExpire_measures: string[] | undefined; + onExpire_measure: string | undefined; /** * Deadline of this decision */ @@ -132,15 +132,15 @@ export const codecForDecisionRequest = (): Codec<DecisionRequest> => ) .property("new_measures", codecOptional(codecForList(codecForString()))) .property( - "onExpire_measures", - codecOptional(codecForList(codecForString())), + "onExpire_measure", + codecOptional(codecForString()), ) .build("DecisionRequest"); export const DECISION_REQUEST_EMPTY: DecisionRequest = { deadline: undefined, custom_properties: undefined, - onExpire_measures: undefined, + onExpire_measure: undefined, custom_events: undefined, attributes: undefined, accountName: undefined, diff --git a/packages/aml-backoffice-ui/src/pages/decision/Justification.tsx b/packages/aml-backoffice-ui/src/pages/decision/Justification.tsx @@ -35,14 +35,14 @@ export function Justification({ newPayto }: { newPayto?: PaytoString }): VNode { const unknownAccount = !!newPayto const design = formDesign(i18n, measureList, unknownAccount); - const expMeasres: string[] = !request.onExpire_measures - ? [] - : request.onExpire_measures; + const expMeasres: string = !request.onExpire_measure + ? "" + : request.onExpire_measure; const form = useForm<FormType>(design, { investigate: request.keep_investigating, justification: request.justification, - measures: expMeasres, + measure: expMeasres, accountName: request.accountName, }); @@ -51,7 +51,7 @@ export function Justification({ newPayto }: { newPayto?: PaytoString }): VNode { ...request, keep_investigating: !!form.status.result.investigate, justification: form.status.result.justification ?? "", - onExpire_measures: (form.status.result.measures ?? []) as string[], + onExpire_measure: form.status.result.measure ?? "", accountName: form.status.result.justification ?? "", }); }); @@ -67,7 +67,7 @@ type FormType = { justification: string; accountName: string; investigate: boolean; - measures: string[]; + measure: string; }; const formDesign = ( @@ -104,7 +104,7 @@ const formDesign = ( label: m.id, }; }), - id: "measures", + id: "measure", label: i18n.str`Successor measure`, help: i18n.str`Measure taken automatically upon expiration of the current decision.`, }, diff --git a/packages/aml-backoffice-ui/src/pages/decision/Summary.tsx b/packages/aml-backoffice-ui/src/pages/decision/Summary.tsx @@ -125,7 +125,7 @@ export function Summary({ decision.deadline!, ), rules: decision.rules!, - successor_measure: decision.onExpire_measures!.join(" "), + successor_measure: decision.onExpire_measure, custom_measures: {}, // TODO: compute custom measures }, attributes_expiration: decision.attributes?.expiration