commit 9e3af6e18b0dd90b444b11776ace1874d16a9ca5
parent aa88f573b76a4bb9c3edea9a8797c2e68589409e
Author: Sebastian <sebasjm@gmail.com>
Date: Sun, 5 Jan 2025 18:10:16 -0300
remove name from search form
Diffstat:
2 files changed, 86 insertions(+), 27 deletions(-)
diff --git a/packages/aml-backoffice-ui/src/pages/CaseUpdate.tsx b/packages/aml-backoffice-ui/src/pages/CaseUpdate.tsx
@@ -109,13 +109,28 @@ export function CaseUpdate({
const shape: Array<UIHandlerId> = [];
const requiredFields: Array<UIHandlerId> = [];
- theForm.config.design.forEach((section) => {
- Array.prototype.push.apply(shape, getShapeFromFields(section.fields));
- Array.prototype.push.apply(
- requiredFields,
- getRequiredFields(section.fields),
- );
- });
+ switch (theForm.config.type) {
+ case "double-column": {
+ theForm.config.design.forEach((section) => {
+ Array.prototype.push.apply(shape, getShapeFromFields(section.fields));
+ Array.prototype.push.apply(
+ requiredFields,
+ getRequiredFields(section.fields),
+ );
+ });
+ break;
+ }
+ case "single-column": {
+ Array.prototype.push.apply(
+ shape,
+ getShapeFromFields(theForm.config.fields),
+ );
+ Array.prototype.push.apply(
+ requiredFields,
+ getRequiredFields(theForm.config.fields),
+ );
+ }
+ }
const { handler, status } = useFormState<FormType>(shape, initial, (st) => {
const partialErrors = undefinedIfEmpty<FormErrors<FormType>>({
@@ -199,7 +214,67 @@ export function CaseUpdate({
<Fragment>
<LocalNotificationBanner notification={notification} />
<div class="space-y-10 divide-y -mt-5 divide-gray-900/10">
- {theForm.config.design.map((section, i) => {
+ {(function () {
+ switch (theForm.config.type) {
+ case "double-column": {
+ return theForm.config.design.map((section, i) => {
+ if (!section) return <Fragment />;
+ return (
+ <div
+ key={i}
+ class="grid grid-cols-1 gap-x-8 gap-y-8 pt-5 md:grid-cols-3"
+ >
+ <div class="px-4 sm:px-0">
+ <h2 class="text-base font-semibold leading-7 text-gray-900">
+ {section.title}
+ </h2>
+ {section.description && (
+ <p class="mt-1 text-sm leading-6 text-gray-600">
+ {section.description}
+ </p>
+ )}
+ </div>
+ <div class="bg-white shadow-sm ring-1 ring-gray-900/5 rounded-md md:col-span-2">
+ <div class="p-3">
+ <div class="grid max-w-2xl grid-cols-1 gap-x-6 gap-y-8 sm:grid-cols-6">
+ <RenderAllFieldsByUiConfig
+ key={i}
+ fields={convertUiField(
+ i18n,
+ section.fields,
+ handler,
+ getConverterById,
+ )}
+ />
+ </div>
+ </div>
+ </div>
+ </div>
+ );
+ });
+ }
+ case "single-column": {
+ return (
+ <div class="bg-white shadow-sm ring-1 ring-gray-900/5 rounded-md md:col-span-2">
+ <div class="p-3">
+ <div class="grid max-w-2xl grid-cols-1 gap-x-6 gap-y-8 sm:grid-cols-6">
+ <RenderAllFieldsByUiConfig
+ fields={convertUiField(
+ i18n,
+ theForm.config.fields,
+ handler,
+ getConverterById,
+ )}
+ />
+ </div>
+ </div>
+ </div>
+ );
+ }
+ }
+ })()}
+ </div>
+ {/* {theForm.config.design.map((section, i) => {
if (!section) return <Fragment />;
return (
<div
@@ -234,7 +309,7 @@ export function CaseUpdate({
</div>
);
})}
- </div>
+ </div> */}
<div class="mt-6 flex items-center justify-end gap-x-6">
<a
@@ -249,7 +324,7 @@ export function CaseUpdate({
disabled={!submitHandler}
class="disabled:opacity-50 disabled:cursor-default rounded-md bg-indigo-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600"
>
- <i18n.Translate>Confirm</i18n.Translate>
+ <i18n.Translate>Submit</i18n.Translate>
</Button>
</div>
</Fragment>
diff --git a/packages/aml-backoffice-ui/src/pages/Search.tsx b/packages/aml-backoffice-ui/src/pages/Search.tsx
@@ -309,9 +309,6 @@ function XTalerBankForm({
"x-taler-bank",
form.status.result.hostname,
form.status.result.account,
- {
- "receiver-name": form.status.result.name,
- },
);
return (
@@ -354,9 +351,7 @@ function IbanForm({
const paytoUri =
form.status.status === "fail"
? undefined
- : buildPayto("iban", form.status.result.account, form.status.result.bic, {
- "receiver-name": form.status.result.name,
- });
+ : buildPayto("iban", form.status.result.account, undefined);
return (
<form
@@ -497,8 +492,6 @@ function createGenericPaytoValidator(i18n: InternationalizationAPI) {
interface PaytoUriIBANForm {
account: string;
- name: string;
- bic: string;
}
function createIbanPaytoValidator(i18n: InternationalizationAPI) {
@@ -507,14 +500,11 @@ function createIbanPaytoValidator(i18n: InternationalizationAPI) {
): FormStatus<PaytoUriIBANForm> {
const errors = undefinedIfEmpty<FormErrors<PaytoUriIBANForm>>({
account: !state.account ? i18n.str`required` : undefined,
- name: !state.name ? i18n.str`required` : undefined,
});
if (errors === undefined) {
const result: PaytoUriIBANForm = {
account: state.account!,
- name: state.name!,
- bic: state.bic!,
};
return {
status: "ok",
@@ -524,8 +514,6 @@ function createIbanPaytoValidator(i18n: InternationalizationAPI) {
}
const result: RecursivePartial<PaytoUriIBANForm> = {
account: state.account,
- name: state.name,
- bic: state.bic,
};
return {
status: "fail",
@@ -537,7 +525,6 @@ function createIbanPaytoValidator(i18n: InternationalizationAPI) {
interface PaytoUriTalerBankForm {
hostname: string;
account: string;
- name: string;
}
function createTalerBankPaytoValidator(i18n: InternationalizationAPI) {
return function check(
@@ -546,14 +533,12 @@ function createTalerBankPaytoValidator(i18n: InternationalizationAPI) {
const errors = undefinedIfEmpty<FormErrors<PaytoUriTalerBankForm>>({
account: !state.account ? i18n.str`required` : undefined,
hostname: !state.hostname ? i18n.str`required` : undefined,
- name: !state.name ? i18n.str`required` : undefined,
});
if (errors === undefined) {
const result: PaytoUriTalerBankForm = {
account: state.account!,
hostname: state.hostname!,
- name: state.name!,
};
return {
status: "ok",
@@ -564,7 +549,6 @@ function createTalerBankPaytoValidator(i18n: InternationalizationAPI) {
const result: RecursivePartial<PaytoUriTalerBankForm> = {
account: state.account,
hostname: state.hostname,
- name: state.name,
};
return {
status: "fail",
