From 20d2861508df18da18e66c94a5a268067565121b Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 30 Apr 2024 14:21:01 -0300 Subject: testing aml form as json --- packages/web-util/src/forms/Calendar.tsx | 253 +++++++++++++-------- .../src/forms/InputAbsoluteTime.stories.tsx | 2 +- packages/web-util/src/forms/InputAbsoluteTime.tsx | 10 +- .../web-util/src/forms/InputAmount.stories.tsx | 2 +- packages/web-util/src/forms/InputArray.stories.tsx | 6 +- .../src/forms/InputChoiceHorizontal.stories.tsx | 2 +- .../src/forms/InputChoiceStacked.stories.tsx | 2 +- packages/web-util/src/forms/InputFile.stories.tsx | 2 +- .../web-util/src/forms/InputInteger.stories.tsx | 2 +- packages/web-util/src/forms/InputLine.stories.tsx | 2 +- .../src/forms/InputSelectMultiple.stories.tsx | 4 +- .../web-util/src/forms/InputSelectMultiple.tsx | 2 +- .../web-util/src/forms/InputSelectOne.stories.tsx | 2 +- packages/web-util/src/forms/InputText.stories.tsx | 2 +- .../web-util/src/forms/InputTextArea.stories.tsx | 2 +- .../web-util/src/forms/InputToggle.stories.tsx | 2 +- packages/web-util/src/forms/InputToggle.tsx | 2 +- packages/web-util/src/forms/forms.ts | 46 ++-- 18 files changed, 212 insertions(+), 133 deletions(-) (limited to 'packages/web-util') diff --git a/packages/web-util/src/forms/Calendar.tsx b/packages/web-util/src/forms/Calendar.tsx index a0df639f3..b08129f56 100644 --- a/packages/web-util/src/forms/Calendar.tsx +++ b/packages/web-util/src/forms/Calendar.tsx @@ -1,20 +1,40 @@ -import { AbsoluteTime } from "@gnu-taler/taler-util" -import { add as dateAdd, sub as dateSub, eachDayOfInterval, endOfMonth, endOfWeek, format, getMonth, getYear, isSameDay, isSameMonth, startOfDay, startOfMonth, startOfWeek } from "date-fns" -import { VNode, h } from "preact" -import { useState } from "preact/hooks" -import { useTranslationContext } from "../index.browser.js" +import { AbsoluteTime } from "@gnu-taler/taler-util"; +import { + add as dateAdd, + sub as dateSub, + eachDayOfInterval, + endOfMonth, + endOfWeek, + format, + getMonth, + getYear, + isSameDay, + isSameMonth, + startOfDay, + startOfMonth, + startOfWeek, +} from "date-fns"; +import { VNode, h } from "preact"; +import { useState } from "preact/hooks"; +import { useTranslationContext } from "../index.browser.js"; -export function Calendar({ value, onChange }: { value: AbsoluteTime | undefined, onChange: (v: AbsoluteTime) => void }): VNode { - const today = startOfDay(new Date()) - const selected = !value ? today : new Date(AbsoluteTime.toStampMs(value)) - const [showingDate, setShowingDate] = useState(selected) - const month = getMonth(showingDate) - const year = getYear(showingDate) +export function Calendar({ + value, + onChange, +}: { + value: AbsoluteTime | undefined; + onChange: (v: AbsoluteTime) => void; +}): VNode { + const today = startOfDay(new Date()); + const selected = !value ? today : new Date(AbsoluteTime.toStampMs(value)); + const [showingDate, setShowingDate] = useState(selected); + const month = getMonth(showingDate); + const year = getYear(showingDate); const start = startOfWeek(startOfMonth(showingDate)); const end = endOfWeek(endOfMonth(showingDate)); const daysInMonth = eachDayOfInterval({ start, end }); - const { i18n } = useTranslationContext() + const { i18n } = useTranslationContext(); const monthNames = [ i18n.str`January`, i18n.str`February`, @@ -28,92 +48,139 @@ export function Calendar({ value, onChange }: { value: AbsoluteTime | undefined, i18n.str`October`, i18n.str`November`, i18n.str`December`, - ] - return
-
- -
{year}
- -
-
- -
{monthNames[month]}
- -
-
-
M
-
T
-
W
-
T
-
F
-
S
-
S
-
-
-
- {daysInMonth.map(current => ( - +
{year}
+ +
+
+ +
{monthNames[month]}
+ +
+
+
M
+
T
+
W
+
T
+
F
+
S
+
S
+
+
+
+ {daysInMonth.map((current, idx) => ( + - ))} + data-[selected=true]:!bg-blue-400 data-[selected=true]:hover:!bg-blue-300 " + > + + + ))} +
+ {daysInMonth.length < 40 ?
: undefined}
- {daysInMonth.length < 40 ?
: undefined}
-
+ ); } diff --git a/packages/web-util/src/forms/InputAbsoluteTime.stories.tsx b/packages/web-util/src/forms/InputAbsoluteTime.stories.tsx index 6245cf27c..3887efe37 100644 --- a/packages/web-util/src/forms/InputAbsoluteTime.stories.tsx +++ b/packages/web-util/src/forms/InputAbsoluteTime.stories.tsx @@ -48,7 +48,7 @@ const form: FlexibleForm = { title: "this is a simple form" as TranslatedString, fields: [{ type: "absoluteTime", - props: { + properties: { label: "label of the field" as TranslatedString, name: "today", pattern: "dd/MM/yyyy HH:mm" diff --git a/packages/web-util/src/forms/InputAbsoluteTime.tsx b/packages/web-util/src/forms/InputAbsoluteTime.tsx index 772ab1813..f5fd4fc50 100644 --- a/packages/web-util/src/forms/InputAbsoluteTime.tsx +++ b/packages/web-util/src/forms/InputAbsoluteTime.tsx @@ -10,15 +10,15 @@ import { useField } from "./useField.js"; import { noHandlerPropsAndNoContextForField } from "./InputArray.js"; export function InputAbsoluteTime( - props: { pattern?: string } & UIFormProps, + properties: { pattern?: string } & UIFormProps, ): VNode { - const pattern = props.pattern ?? "dd/MM/yyyy"; + const pattern = properties.pattern ?? "dd/MM/yyyy"; const [open, setOpen] = useState(false); //FIXME: remove deprecated - const fieldCtx = useField(props.name); + const fieldCtx = useField(properties.name); const { value, onChange } = - props.handler ?? fieldCtx ?? noHandlerPropsAndNoContextForField(props.name); + properties.handler ?? fieldCtx ?? noHandlerPropsAndNoContextForField(properties.name); return ( @@ -66,7 +66,7 @@ export function InputAbsoluteTime( : format(v.t_ms, pattern); }, }} - {...props} + {...properties} /> {open && ( setOpen(false)}> diff --git a/packages/web-util/src/forms/InputAmount.stories.tsx b/packages/web-util/src/forms/InputAmount.stories.tsx index c9f12a437..d5073ed86 100644 --- a/packages/web-util/src/forms/InputAmount.stories.tsx +++ b/packages/web-util/src/forms/InputAmount.stories.tsx @@ -48,7 +48,7 @@ const form: FlexibleForm = { title: "this is a simple form" as TranslatedString, fields: [{ type: "amount", - props: { + properties: { label: "label of the field" as TranslatedString, name: "amount", }, diff --git a/packages/web-util/src/forms/InputArray.stories.tsx b/packages/web-util/src/forms/InputArray.stories.tsx index 8dbd3ff07..eb61b04e3 100644 --- a/packages/web-util/src/forms/InputArray.stories.tsx +++ b/packages/web-util/src/forms/InputArray.stories.tsx @@ -54,18 +54,18 @@ const form: FlexibleForm = { title: "this is a simple form" as TranslatedString, fields: [{ type: "array", - props: { + properties: { label: "People" as TranslatedString, name: "comment", fields: [{ type: "text", - props: { + properties: { label: "the name" as TranslatedString, name: "name", } }, { type: "integer", - props: { + properties: { label: "the age" as TranslatedString, name: "age", } diff --git a/packages/web-util/src/forms/InputChoiceHorizontal.stories.tsx b/packages/web-util/src/forms/InputChoiceHorizontal.stories.tsx index b950d3d02..e1da89353 100644 --- a/packages/web-util/src/forms/InputChoiceHorizontal.stories.tsx +++ b/packages/web-util/src/forms/InputChoiceHorizontal.stories.tsx @@ -48,7 +48,7 @@ const form: FlexibleForm = { title: "this is a simple form" as TranslatedString, fields: [{ type: "choiceHorizontal", - props: { + properties: { label: "label of the field" as TranslatedString, name: "comment", choices: [{ diff --git a/packages/web-util/src/forms/InputChoiceStacked.stories.tsx b/packages/web-util/src/forms/InputChoiceStacked.stories.tsx index ed5170d17..89f252e96 100644 --- a/packages/web-util/src/forms/InputChoiceStacked.stories.tsx +++ b/packages/web-util/src/forms/InputChoiceStacked.stories.tsx @@ -48,7 +48,7 @@ const form: FlexibleForm = { title: "this is a simple form" as TranslatedString, fields: [{ type: "choiceStacked", - props: { + properties: { label: "label of the field" as TranslatedString, name: "comment", choices: [{ diff --git a/packages/web-util/src/forms/InputFile.stories.tsx b/packages/web-util/src/forms/InputFile.stories.tsx index ba06debf9..9d9ad0bd7 100644 --- a/packages/web-util/src/forms/InputFile.stories.tsx +++ b/packages/web-util/src/forms/InputFile.stories.tsx @@ -48,7 +48,7 @@ const form: FlexibleForm = { title: "this is a simple form" as TranslatedString, fields: [{ type: "file", - props: { + properties: { label: "label of the field" as TranslatedString, name: "comment", required: true, diff --git a/packages/web-util/src/forms/InputInteger.stories.tsx b/packages/web-util/src/forms/InputInteger.stories.tsx index bd1a467ab..04a6d1049 100644 --- a/packages/web-util/src/forms/InputInteger.stories.tsx +++ b/packages/web-util/src/forms/InputInteger.stories.tsx @@ -43,7 +43,7 @@ const form: FlexibleForm = { title: "this is a simple form" as TranslatedString, fields: [{ type: "integer", - props: { + properties: { label: "label of the field" as TranslatedString, name: "age", tooltip: "just numbers" as TranslatedString, diff --git a/packages/web-util/src/forms/InputLine.stories.tsx b/packages/web-util/src/forms/InputLine.stories.tsx index da41a221e..1c62a6164 100644 --- a/packages/web-util/src/forms/InputLine.stories.tsx +++ b/packages/web-util/src/forms/InputLine.stories.tsx @@ -48,7 +48,7 @@ const form: FlexibleForm = { title: "this is a simple form" as TranslatedString, fields: [{ type: "text", - props: { + properties: { label: "label of the field" as TranslatedString, name: "comment", }, diff --git a/packages/web-util/src/forms/InputSelectMultiple.stories.tsx b/packages/web-util/src/forms/InputSelectMultiple.stories.tsx index 6ce5445c0..b1649fecf 100644 --- a/packages/web-util/src/forms/InputSelectMultiple.stories.tsx +++ b/packages/web-util/src/forms/InputSelectMultiple.stories.tsx @@ -50,7 +50,7 @@ const form: FlexibleForm = { title: "this is a simple form" as TranslatedString, fields: [{ type: "selectMultiple", - props: { + properties: { label: "allow diplicates" as TranslatedString, name: "pets", placeholder: "search..." as TranslatedString, @@ -67,7 +67,7 @@ const form: FlexibleForm = { }, }, { type: "selectMultiple", - props: { + properties: { label: "unique values" as TranslatedString, name: "things", unique: true, diff --git a/packages/web-util/src/forms/InputSelectMultiple.tsx b/packages/web-util/src/forms/InputSelectMultiple.tsx index 972389cb3..12e88fcc1 100644 --- a/packages/web-util/src/forms/InputSelectMultiple.tsx +++ b/packages/web-util/src/forms/InputSelectMultiple.tsx @@ -1,10 +1,10 @@ import { Fragment, VNode, h } from "preact"; import { useState } from "preact/hooks"; import { UIFormProps } from "./FormProvider.js"; +import { noHandlerPropsAndNoContextForField } from "./InputArray.js"; import { ChoiceS } from "./InputChoiceStacked.js"; import { LabelWithTooltipMaybeRequired } from "./InputLine.js"; import { useField } from "./useField.js"; -import { noHandlerPropsAndNoContextForField } from "./InputArray.js"; export function InputSelectMultiple( props: { diff --git a/packages/web-util/src/forms/InputSelectOne.stories.tsx b/packages/web-util/src/forms/InputSelectOne.stories.tsx index 9e9029a77..f87aeda66 100644 --- a/packages/web-util/src/forms/InputSelectOne.stories.tsx +++ b/packages/web-util/src/forms/InputSelectOne.stories.tsx @@ -48,7 +48,7 @@ const form: FlexibleForm = { title: "this is a simple form" as TranslatedString, fields: [{ type: "selectOne", - props: { + properties: { label: "label of the field" as TranslatedString, name: "things", placeholder: "search..." as TranslatedString, diff --git a/packages/web-util/src/forms/InputText.stories.tsx b/packages/web-util/src/forms/InputText.stories.tsx index 04ab8a1c6..8eced7736 100644 --- a/packages/web-util/src/forms/InputText.stories.tsx +++ b/packages/web-util/src/forms/InputText.stories.tsx @@ -48,7 +48,7 @@ const form: FlexibleForm = { title: "this is a simple form" as TranslatedString, fields: [{ type: "text", - props: { + properties: { label: "label of the field" as TranslatedString, name: "comment", }, diff --git a/packages/web-util/src/forms/InputTextArea.stories.tsx b/packages/web-util/src/forms/InputTextArea.stories.tsx index c8c3eb088..6713548a8 100644 --- a/packages/web-util/src/forms/InputTextArea.stories.tsx +++ b/packages/web-util/src/forms/InputTextArea.stories.tsx @@ -48,7 +48,7 @@ const form: FlexibleForm = { title: "this is a simple form" as TranslatedString, fields: [{ type: "text", - props: { + properties: { label: "label of the field" as TranslatedString, name: "comment", }, diff --git a/packages/web-util/src/forms/InputToggle.stories.tsx b/packages/web-util/src/forms/InputToggle.stories.tsx index ca6857618..e10098718 100644 --- a/packages/web-util/src/forms/InputToggle.stories.tsx +++ b/packages/web-util/src/forms/InputToggle.stories.tsx @@ -48,7 +48,7 @@ const form: FlexibleForm = { title: "this is a simple form" as TranslatedString, fields: [{ type: "toggle", - props: { + properties: { label: "label of the field" as TranslatedString, name: "comment", }, diff --git a/packages/web-util/src/forms/InputToggle.tsx b/packages/web-util/src/forms/InputToggle.tsx index c56efec3a..58386045c 100644 --- a/packages/web-util/src/forms/InputToggle.tsx +++ b/packages/web-util/src/forms/InputToggle.tsx @@ -1,8 +1,8 @@ import { VNode, h } from "preact"; import { UIFormProps } from "./FormProvider.js"; +import { noHandlerPropsAndNoContextForField } from "./InputArray.js"; import { LabelWithTooltipMaybeRequired } from "./InputLine.js"; import { useField } from "./useField.js"; -import { noHandlerPropsAndNoContextForField } from "./InputArray.js"; export function InputToggle( props: UIFormProps, diff --git a/packages/web-util/src/forms/forms.ts b/packages/web-util/src/forms/forms.ts index d2ff9c37e..6bda2f674 100644 --- a/packages/web-util/src/forms/forms.ts +++ b/packages/web-util/src/forms/forms.ts @@ -38,20 +38,32 @@ type FieldType = { * List all the form fields so typescript can type-check the form instance */ export type UIFormField = - | { type: "group"; props: FieldType["group"] } - | { type: "caption"; props: FieldType["caption"] } - | { type: "array"; props: FieldType["array"] } - | { type: "file"; props: FieldType["file"] } - | { type: "amount"; props: FieldType["amount"] } - | { type: "selectOne"; props: FieldType["selectOne"] } - | { type: "selectMultiple"; props: FieldType["selectMultiple"] } - | { type: "text"; props: FieldType["text"] } - | { type: "textArea"; props: FieldType["textArea"] } - | { type: "choiceStacked"; props: FieldType["choiceStacked"] } - | { type: "choiceHorizontal"; props: FieldType["choiceHorizontal"] } - | { type: "integer"; props: FieldType["integer"] } - | { type: "toggle"; props: FieldType["toggle"] } - | { type: "absoluteTime"; props: FieldType["absoluteTime"] }; + | { type: "group"; properties: FieldType["group"] } + | { type: "caption"; properties: FieldType["caption"] } + | { type: "array"; properties: FieldType["array"] } + | { type: "file"; properties: FieldType["file"] } + | { type: "amount"; properties: FieldType["amount"] } + | { type: "selectOne"; properties: FieldType["selectOne"] } + | { + type: "selectMultiple"; + properties: FieldType["selectMultiple"]; + } + | { type: "text"; properties: FieldType["text"] } + | { type: "textArea"; properties: FieldType["textArea"] } + | { + type: "choiceStacked"; + properties: FieldType["choiceStacked"]; + } + | { + type: "choiceHorizontal"; + properties: FieldType["choiceHorizontal"]; + } + | { type: "integer"; properties: FieldType["integer"] } + | { type: "toggle"; properties: FieldType["toggle"] } + | { + type: "absoluteTime"; + properties: FieldType["absoluteTime"]; + }; type FieldComponentFunction = ( props: FieldType[key], @@ -102,7 +114,7 @@ export function RenderAllFieldsByUiConfig({ const Component = UIFormConfiguration[ field.type ] as FieldComponentFunction; - return Component(field.props); + return Component(field.properties); }), ); } @@ -115,8 +127,8 @@ export function RenderAllFieldsByUiConfig({ /** * Helper function that created a typed object. - * - * @returns + * + * @returns */ // export function createNewForm() { // const res: FormSet = { -- cgit v1.2.3