fix forms

libs/pages/plugins/src/lib/ui/FormReturnType.ts

@@ -0,0 +1,14 @@
+import { UseFormReturnType } from '@mantine/form';
+
+export type FormReturnType = UseFormReturnType<
+  { type: string; displayName: string; configuration: Record<string, unknown> },
+  (values: {
+    type: string;
+    displayName: string;
+    configuration: Record<string, unknown>;
+  }) => {
+    type: string;
+    displayName: string;
+    configuration: Record<string, unknown>;
+  }
+>;

libs/pages/plugins/src/lib/ui/custom-plugin-components/custom-bool-checkbox/CustomBoolCheckbox.tsx

@@ -1,13 +1,13 @@
-import { UseFormReturnType } from '@mantine/form';
 import { Checkbox } from '@mantine/core';
 import React, { useState } from 'react';
 import { BooleanField } from '@yadoms/domain/plugins';
 import LinkifyText from '../../linkify-text/linkify-text';
+import { FormReturnType } from '../../FormReturnType';
 
 export interface CustomBoolCheckboxProps {
   pluginKey: string;
   field: BooleanField;
-  form: UseFormReturnType<Record<string, unknown>>;
+  form: FormReturnType;
 }
 
 export function CustomBoolCheckbox(props: CustomBoolCheckboxProps) {

libs/pages/plugins/src/lib/ui/custom-plugin-components/custom-checkbox-section/custom-checkbox.section.tsx

@@ -1,14 +1,14 @@
-import { UseFormReturnType } from '@mantine/form';
-import { CheckboxSectionField, PluginForm } from '@yadoms/domain/plugins';
+import { CheckboxSectionField } from '@yadoms/domain/plugins';
 import { Box, Checkbox } from '@mantine/core';
 import React, { useState } from 'react';
 import renderPluginField from '../../render-plugin-field/render-plugin-field';
 import LinkifyText from '../../linkify-text/linkify-text';
+import { FormReturnType } from '../../FormReturnType';
 
 export interface CustomCheckboxSectionProps {
   pluginKey: string;
   field: CheckboxSectionField;
-  form: UseFormReturnType<Record<string, unknown>>;
+  form: FormReturnType;
 }
 
 export function CustomCheckboxSection(props: CustomCheckboxSectionProps) {

libs/pages/plugins/src/lib/ui/custom-plugin-components/custom-combo-section/custom-combo-section.tsx

@@ -1,15 +1,15 @@
-import { UseFormReturnType } from '@mantine/form';
 import { Box, Group, Select, Text } from '@mantine/core';
 import React, { forwardRef, useState } from 'react';
 import { ItemProps } from '../../plugin-configuration-modal/plugin-configuration-modal';
 import renderPluginField from '../../render-plugin-field/render-plugin-field';
-import { ComboSectionField, PluginForm } from '@yadoms/domain/plugins';
+import { ComboSectionField } from '@yadoms/domain/plugins';
 import LinkifyText from '../../linkify-text/linkify-text';
+import { FormReturnType } from '../../FormReturnType';
 
 export interface CustomComboSectionProps {
   pluginKey: string;
   field: ComboSectionField;
-  form: UseFormReturnType<Record<string, unknown>>;
+  form: FormReturnType;
 }
 
 const SelectItem = forwardRef<HTMLDivElement, ItemProps>(

libs/pages/plugins/src/lib/ui/custom-plugin-components/custom-decimal-number/custom-decimal-number.tsx

@@ -1,13 +1,13 @@
-import { UseFormReturnType } from '@mantine/form';
 import { NumberInput } from '@mantine/core';
 import React from 'react';
 import { DecimalField } from '@yadoms/domain/plugins';
 import LinkifyText from '../../linkify-text/linkify-text';
+import { FormReturnType } from '../../FormReturnType';
 
 export interface CustomDecimalNumberProps {
   pluginKey: string;
   field: DecimalField;
-  form: UseFormReturnType<Record<string, unknown>>;
+  form: FormReturnType;
 }
 
 export function CustomDecimalNumber(props: CustomDecimalNumberProps) {

libs/pages/plugins/src/lib/ui/custom-plugin-components/custom-enum-select/custom-enum-select.tsx

@@ -1,14 +1,14 @@
 import { Select } from '@mantine/core';
 import React, { useState } from 'react';
-import { UseFormReturnType } from '@mantine/form';
 import { ItemProps } from '../../plugin-configuration-modal/plugin-configuration-modal';
 import { EnumField } from '@yadoms/domain/plugins';
 import LinkifyText from '../../linkify-text/linkify-text';
+import { FormReturnType } from '../../FormReturnType';
 
 export interface CustomEnumSelectProps {
   pluginKey: string;
   field: EnumField;
-  form: UseFormReturnType<Record<string, unknown>>;
+  form: FormReturnType;
 }
 
 export function CustomEnumSelect(props: CustomEnumSelectProps) {

libs/pages/plugins/src/lib/ui/custom-plugin-components/custom-integer-input/custom-integer-input.tsx

@@ -1,13 +1,13 @@
-import { UseFormReturnType } from '@mantine/form';
 import { NumberInput } from '@mantine/core';
 import React from 'react';
 import { IntegerField } from '@yadoms/domain/plugins';
 import LinkifyText from '../../linkify-text/linkify-text';
+import { FormReturnType } from '../../FormReturnType';
 
 export interface CustomTextInputProps {
   pluginKey: string;
   field: IntegerField;
-  form: UseFormReturnType<Record<string, unknown>>;
+  form: FormReturnType;
 }
 
 export function CustomIntegerInput(props: CustomTextInputProps) {

libs/pages/plugins/src/lib/ui/custom-plugin-components/custom-multi-select-section/custom-multi-select-section.tsx

@@ -1,13 +1,13 @@
 import { MultiSelectSectionField } from '@yadoms/domain/plugins';
-import { UseFormReturnType } from '@mantine/form';
 import { Box, Group, MultiSelect, Text } from '@mantine/core';
 import React, { forwardRef } from 'react';
 import LinkifyText from '../../linkify-text/linkify-text';
+import { FormReturnType } from '../../FormReturnType';
 
 export interface CustomMultiSelectSectionProps {
   pluginKey: string;
   field: MultiSelectSectionField;
-  form: UseFormReturnType<Record<string, unknown>>;
+  form: FormReturnType;
 }
 
 interface ItemProps extends React.ComponentPropsWithoutRef<'div'> {

libs/pages/plugins/src/lib/ui/custom-plugin-components/custom-radio-section/custom-radio-section.tsx

@@ -1,15 +1,15 @@
-import { UseFormReturnType } from '@mantine/form';
 import { Box, Group, Radio } from '@mantine/core';
 import React, { useEffect, useState } from 'react';
 import { ItemProps } from '../../plugin-configuration-modal/plugin-configuration-modal';
 import renderPluginField from '../../render-plugin-field/render-plugin-field';
 import LinkifyText from '../../linkify-text/linkify-text';
-import { PluginForm, RadioSectionField } from '@yadoms/domain/plugins';
+import { RadioSectionField } from '@yadoms/domain/plugins';
+import { FormReturnType } from '../../FormReturnType';
 
 export interface CustomRadioSectionProps {
   pluginKey: string;
   field: RadioSectionField;
-  form: UseFormReturnType<Record<string, unknown>>;
+  form: FormReturnType;
 }
 
 export function CustomRadioSection(props: CustomRadioSectionProps) {

libs/pages/plugins/src/lib/ui/custom-plugin-components/custom-section/custom-section.tsx

@@ -2,13 +2,14 @@ import { UseFormReturnType } from '@mantine/form';
 import { Box, Text } from '@mantine/core';
 import React from 'react';
 import renderPluginField from '../../render-plugin-field/render-plugin-field';
-import { PluginForm, SectionField } from '@yadoms/domain/plugins';
+import { SectionField } from '@yadoms/domain/plugins';
 import LinkifyText from '../../linkify-text/linkify-text';
+import { FormReturnType } from '../../FormReturnType';
 
 export interface CustomSectionProps {
   pluginKey: string;
   field: SectionField;
-  form: UseFormReturnType<Record<string, unknown>>;
+  form: FormReturnType;
 }
 
 export function CustomSection(props: CustomSectionProps) {

libs/pages/plugins/src/lib/ui/custom-plugin-components/custom-string-input/custom-string-input.tsx

@@ -3,11 +3,12 @@ import { TextInput } from '@mantine/core';
 import React from 'react';
 import { StringField } from '@yadoms/domain/plugins';
 import LinkifyText from '../../linkify-text/linkify-text';
+import { FormReturnType } from '../../FormReturnType';
 
 interface CustomTextInputProps {
   pluginKey: string;
   field: StringField;
-  form: UseFormReturnType<Record<string, unknown>>;
+  form: FormReturnType;
 }
 
 export function CustomStringInput(props: CustomTextInputProps) {

libs/pages/plugins/src/lib/ui/custom-plugin-components/custom-time/custom-time.tsx

@@ -1,14 +1,14 @@
 import { CustomTimeField } from '@yadoms/domain/plugins';
-import { UseFormReturnType } from '@mantine/form';
 import { TimeInput } from '@mantine/dates';
 import { IconClock } from '@tabler/icons-react';
 import LinkifyText from '../../linkify-text/linkify-text';
 import React from 'react';
+import { FormReturnType } from '../../FormReturnType';
 
 export interface CustomTimeProps {
   pluginKey: string;
   field: CustomTimeField;
-  form: UseFormReturnType<Record<string, unknown>>;
+  form: FormReturnType;
 }
 
 export function CustomTime(props: CustomTimeProps) {

libs/pages/plugins/src/lib/ui/plugin-configuration-modal/plugin-configuration-modal.tsx

@@ -119,8 +119,8 @@ export function PluginConfigurationModal(props: PluginConfigurationModalProps) {
                 ([key, value]) =>
                   renderPluginField({
                     field: value,
-                    form: form,
                     pluginKey: key,
+                    form: form,
                   })
               )}
               {renderSpacing(6)}

libs/pages/plugins/src/lib/ui/render-plugin-field/render-plugin-field.tsx

@@ -1,10 +1,8 @@
 import {
   PluginConfigurationSchemaField,
   PluginConfigurationSchemaType,
-  PluginForm,
 } from '@yadoms/domain/plugins';
 import React from 'react';
-import { UseFormReturnType } from '@mantine/form';
 import {
   CustomBoolCheckbox,
   CustomCheckboxSection,
@@ -18,10 +16,11 @@ import {
   CustomStringInput,
   CustomTime,
 } from '../custom-plugin-components';
+import { FormReturnType } from '../FormReturnType';
 
 type RenderFieldProps = {
   field: PluginConfigurationSchemaField;
-  form: UseFormReturnType<Record<string, unknown>>;
+  form: FormReturnType;
   pluginKey: string;
 };