@gisce/react-ooui 1.0.27 → 1.0.28

package/dist/views/RootView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RootView.d.ts","sourceRoot":"","sources":["RootView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAKN,MAAM,OAAO,CAAC;AAaf,aAAK,aAAa,GAAG;IACnB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,oBAAY,UAAU,GAAG;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;;AAwdF,wBAAoC"}
+{"version":3,"file":"RootView.d.ts","sourceRoot":"","sources":["RootView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAKN,MAAM,OAAO,CAAC;AAcf,aAAK,aAAa,GAAG;IACnB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,oBAAY,UAAU,GAAG;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;;AA2dF,wBAAoC"}

package/dist/widgets/base/one2many/One2manyInput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"One2manyInput.d.ts","sourceRoot":"","sources":["One2manyInput.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkD,MAAM,OAAO,CAAC;AACvE,OAAO,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,aAAa,CAAC;AAWvD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAkBhC,aAAK,aAAa,GAAG;IACnB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;CAC5B,CAAC;AAQF,aAAK,YAAY,GAAG;IAClB,SAAS,CAAC,EACN,UAAU,GACV,eAAe,GACf,eAAe,GACf,eAAe,GACf,aAAa,CAAC;IAClB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,aAAa,CAAC,EAAE,GAAG,CAAC;CACrB,CAAC;AAEF,UAAU,kBAAkB;IAC1B,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAC1C,KAAK,EAAE,KAAK,CAAC;CACd;AAWD,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAwkB/C,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC"}
+{"version":3,"file":"One2manyInput.d.ts","sourceRoot":"","sources":["One2manyInput.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkD,MAAM,OAAO,CAAC;AACvE,OAAO,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,aAAa,CAAC;AAWvD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAmBhC,aAAK,aAAa,GAAG;IACnB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;CAC5B,CAAC;AAQF,aAAK,YAAY,GAAG;IAClB,SAAS,CAAC,EACN,UAAU,GACV,eAAe,GACf,eAAe,GACf,eAAe,GACf,aAAa,CAAC;IAClB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,aAAa,CAAC,EAAE,GAAG,CAAC;CACrB,CAAC;AAEF,UAAU,kBAAkB;IAC1B,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAC1C,KAAK,EAAE,KAAK,CAAC;CACd;AAWD,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CA4kB/C,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC"}

package/dist/widgets/custom/MultiCheckbox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MultiCheckbox.d.ts","sourceRoot":"","sources":["MultiCheckbox.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,aAAa,IAAI,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEjE,OAAO,EAAgB,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAM7E,aAAK,kBAAkB,GAAG;IACxB,IAAI,EAAE,iBAAiB,CAAC;CACzB,CAAC;AAEF,aAAK,uBAAuB,GAAG,kBAAkB,GAAG;IAClD,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;CAC3C,CAAC;AAEF,eAAO,MAAM,aAAa,UAAW,kBAAkB,gBAQtD,CAAC;AAEF,eAAO,MAAM,kBAAkB,UAAW,uBAAuB,gBA4HhE,CAAC"}
+{"version":3,"file":"MultiCheckbox.d.ts","sourceRoot":"","sources":["MultiCheckbox.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,aAAa,IAAI,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEjE,OAAO,EAAgB,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAO7E,aAAK,kBAAkB,GAAG;IACxB,IAAI,EAAE,iBAAiB,CAAC;CACzB,CAAC;AAEF,aAAK,uBAAuB,GAAG,kBAAkB,GAAG;IAClD,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;CAC3C,CAAC;AAEF,eAAO,MAAM,aAAa,UAAW,kBAAkB,gBAQtD,CAAC;AAEF,eAAO,MAAM,kBAAkB,UAAW,uBAAuB,gBAsIhE,CAAC"}

package/dist/widgets/custom/Tags.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Tags.d.ts","sourceRoot":"","sources":["Tags.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAgB,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAO7E,aAAK,SAAS,GAAG,WAAW,GAAG;IAC7B,IAAI,EAAE,QAAQ,CAAC;CAChB,CAAC;AAEF,aAAK,cAAc,GAAG,SAAS,GAAG;IAChC,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;CAC3C,CAAC;AAEF,eAAO,MAAM,IAAI,UAAW,SAAS,gBAQpC,CAAC;AAEF,eAAO,MAAM,SAAS,UAAW,cAAc,gBAiI9C,CAAC"}
+{"version":3,"file":"Tags.d.ts","sourceRoot":"","sources":["Tags.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAgB,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAO7E,aAAK,SAAS,GAAG,WAAW,GAAG;IAC7B,IAAI,EAAE,QAAQ,CAAC;CAChB,CAAC;AAEF,aAAK,cAAc,GAAG,SAAS,GAAG;IAChC,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;CAC3C,CAAC;AAEF,eAAO,MAAM,IAAI,UAAW,SAAS,gBAQpC,CAAC;AAEF,eAAO,MAAM,SAAS,UAAW,cAAc,gBAoI9C,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "1.0.27",
+  "version": "1.0.28",
   "files": [
     "dist",
     "src",

package/src/context/ContentRootContext.tsx

@@ -17,6 +17,7 @@ import {
 } from "@/context/TabManagerContext";
 import { FormModal } from "@/widgets/modals/FormModal";
 import { LocaleContext, LocaleContextType } from "@/context/LocaleContext";
+import { transformPlainMany2Ones } from "@/helpers/formHelper";
 
 export type ContentRootContextType = {
   processAction: ({
@@ -225,7 +226,10 @@ const ContentRootProvider = (
     if (actionData.domain) {
       parsedDomain = await ConnectionProvider.getHandler().evalDomain({
         domain: actionData.domain,
-        values: { ...values, ...globalValues },
+        values: transformPlainMany2Ones({
+          fields,
+          values: { ...values, ...globalValues },
+        }),
         context: mergedContext,
       });
     }

package/src/views/RootView.tsx

@@ -15,6 +15,7 @@ import { tForLang } from "@/context/LocaleContext";
 import { ShortcutApi } from "@/ui/FavouriteButton";
 import showErrorDialog from "@/ui/ActionErrorDialog";
 import { ViewType } from "@/types";
+import { transformPlainMany2Ones } from "@/helpers/formHelper";
 
 type RootViewProps = {
   children: React.ReactNode;
@@ -245,7 +246,10 @@ function RootView(props: RootViewProps, ref: any) {
     const parsedDomain = domain
       ? await ConnectionProvider.getHandler().evalDomain({
           domain: domain,
-          values: { ...values, ...globalValues },
+          values: transformPlainMany2Ones({
+            fields,
+            values: { ...values, ...globalValues },
+          }),
           context: { ...rootContext, ...parsedContext },
         })
       : [];

package/src/widgets/base/one2many/One2manyInput.tsx

@@ -27,6 +27,7 @@ import { SearchModal } from "@/widgets/modals/SearchModal";
 import { LocaleContext, LocaleContextType } from "@/context/LocaleContext";
 import { ViewModes } from "@/widgets/base/one2many/One2many";
 import { sortResults } from "@/helpers/treeHelper";
+import { transformPlainMany2Ones } from "@/helpers/formHelper";
 
 type One2manyValue = {
   fields?: any;
@@ -79,7 +80,8 @@ const One2manyInput: React.FC<One2manyInputProps> = (
   ) as One2manyContextType;
 
   const formContext = useContext(FormContext) as FormContextType;
-  const { activeId, getValues, getContext, domain } = formContext || {};
+  const { activeId, getFields, getValues, getContext, domain } =
+    formContext || {};
   const { lang, t } = useContext(LocaleContext) as LocaleContextType;
 
   const formRef = useRef();
@@ -163,7 +165,10 @@ const One2manyInput: React.FC<One2manyInputProps> = (
       transformedDomain.current = transformDomainForChildWidget({
         domain: await ConnectionProvider.getHandler().evalDomain({
           domain: widgetDomain,
-          values: getValues(),
+          values: transformPlainMany2Ones({
+            fields: getFields(),
+            values: getValues(),
+          }),
           context: getContext(),
         }),
         widgetFieldName: fieldName,

package/src/widgets/custom/MultiCheckbox.tsx

@@ -4,8 +4,9 @@ import Field from "@/common/Field";
 import { One2manyItem, One2manyValue } from "../base/one2many/One2manyInput";
 import useDeepCompareEffect from "use-deep-compare-effect";
 import { FormContext, FormContextType } from "@/context/FormContext";
-import { Alert, Checkbox, Spin, Col, Row, Button, Space  } from "antd";
+import { Alert, Checkbox, Spin, Col, Row, Button, Space } from "antd";
 import ConnectionProvider from "@/ConnectionProvider";
+import { transformPlainMany2Ones } from "@/helpers/formHelper";
 
 type MultiCheckboxProps = {
   ooui: MultiCheckboxOoui;
@@ -21,7 +22,7 @@ export const MultiCheckbox = (props: MultiCheckboxProps) => {
 
   return (
     <Field type={"array"} {...props}>
-      <MultiCheckboxInput ooui={ooui}  />
+      <MultiCheckboxInput ooui={ooui} />
     </Field>
   );
 };
@@ -29,16 +30,15 @@ export const MultiCheckbox = (props: MultiCheckboxProps) => {
 export const MultiCheckboxInput = (props: MultiCheckboxInputProps) => {
   const { value, ooui, onChange } = props;
   const { items = [] } = value || {};
-  const itemsToShow = items.filter(
-    (item) => item.operation !== "pendingRemove"
-  ).map((item) => item.id) as number[];
+  const itemsToShow = items
+    .filter((item) => item.operation !== "pendingRemove")
+    .map((item) => item.id) as number[];
 
   const [options, setOptions] = useState<any[]>([]);
   const [error, setError] = useState<string>();
   const [isLoadingOptions, setIsLoadingOptions] = useState<boolean>(false);
   const { relation, context, readOnly, field, columns } = ooui;
 
-
   const formContext = useContext(FormContext) as FormContextType;
   const { getContext } = formContext || {};
 
@@ -56,13 +56,14 @@ export const MultiCheckboxInput = (props: MultiCheckboxInputProps) => {
     setIsLoadingOptions(true);
     let params: any = [];
     if (ooui.domain) {
-      const evaluatedDomain = await ConnectionProvider.getHandler().evalDomain(
-        {
-          domain: ooui.domain,
+      const evaluatedDomain = await ConnectionProvider.getHandler().evalDomain({
+        domain: ooui.domain,
+        values: transformPlainMany2Ones({
+          fields: formContext?.getFields(),
           values: formContext.getPlainValues(),
-          context: formContext.getContext(),
-        }
-      );
+        }),
+        context: formContext.getContext(),
+      });
       params = [...params, ...evaluatedDomain];
     }
     try {
@@ -72,35 +73,32 @@ export const MultiCheckboxInput = (props: MultiCheckboxInputProps) => {
         fields: [field],
         context: { ...getContext?.(), ...context },
       });
-      const options = optionsRead.map((item:any) => {
+      const options = optionsRead.map((item: any) => {
         const value = item[field];
         let formattedValue = value;
         if (Array.isArray(value)) {
           formattedValue = value[1];
         }
-        return {label: formattedValue, value: item.id}
+        return { label: formattedValue, value: item.id };
       });
       setOptions(options);
-      
     } catch (err) {
-      setError(err as any)
+      setError(err as any);
     } finally {
       setIsLoadingOptions(false);
     }
     if (error) {
       return <Alert className="mt-10" message={error} type="error" banner />;
     }
-
-
-  };
+  }
 
   const checkAll = () => {
-    onChangeSelected(options.map(option => option.value));
-  }
+    onChangeSelected(options.map((option) => option.value));
+  };
 
   const uncheckAll = () => {
     onChangeSelected([]);
-  }
+  };
 
   const onChangeSelected = (ids: any[]) => {
     const newItems: One2manyItem[] = items.map((item) => {
@@ -108,46 +106,59 @@ export const MultiCheckboxInput = (props: MultiCheckboxInputProps) => {
         if (item.operation == "pendingRemove") {
           return {
             ...item,
-            operation: "original"
-          }
+            operation: "original",
+          };
         } else {
-          return item
+          return item;
         }
       } else {
-        return {id: item.id, operation: 'pendingRemove'}
+        return { id: item.id, operation: "pendingRemove" };
       }
-    })
-    const currentIds = newItems.map(item => item.id)
-    ids.filter(id => !currentIds.includes(id)).map((id) => {
-      newItems.push({id, operation: 'pendingLink'});
     });
+    const currentIds = newItems.map((item) => item.id);
+    ids
+      .filter((id) => !currentIds.includes(id))
+      .map((id) => {
+        newItems.push({ id, operation: "pendingLink" });
+      });
     triggerChange(newItems);
   };
 
   if (isLoadingOptions && options.length === 0) {
-    return <Spin />
+    return <Spin />;
   }
-  
+
   return (
     <>
       <div className="flex flex-row">
-        <Checkbox.Group value={options.length ? itemsToShow : []} disabled={readOnly} onChange={onChangeSelected} style={{width: '100%'}}>
+        <Checkbox.Group
+          value={options.length ? itemsToShow : []}
+          disabled={readOnly}
+          onChange={onChangeSelected}
+          style={{ width: "100%" }}
+        >
           <Row>
-          {options.map((option) => (
-            <Col span={Math.floor(24 / columns)}>
-              <Checkbox value={option.value}>{option.label}</Checkbox>
-            </Col>
-          ))}
+            {options.map((option) => (
+              <Col span={Math.floor(24 / columns)}>
+                <Checkbox value={option.value}>{option.label}</Checkbox>
+              </Col>
+            ))}
           </Row>
         </Checkbox.Group>
-        {!readOnly &&
+        {!readOnly && (
           <Space>
-            <Button onClick={checkAll} disabled={itemsToShow.length == options.length}>Check all</Button>
-            <Button onClick={uncheckAll} disabled={itemsToShow.length === 0}>Uncheck all</Button>
+            <Button
+              onClick={checkAll}
+              disabled={itemsToShow.length == options.length}
+            >
+              Check all
+            </Button>
+            <Button onClick={uncheckAll} disabled={itemsToShow.length === 0}>
+              Uncheck all
+            </Button>
           </Space>
-        }
+        )}
       </div>
     </>
   );
-  
 };

package/src/widgets/custom/Tags.tsx

@@ -6,7 +6,7 @@ import { One2manyItem, One2manyValue } from "../base/one2many/One2manyInput";
 import useDeepCompareEffect from "use-deep-compare-effect";
 import { FormContext, FormContextType } from "@/context/FormContext";
 import { Alert, Tag as AntTag, Select } from "antd";
-import { colorFromString } from "@/helpers/formHelper";
+import { colorFromString, transformPlainMany2Ones } from "@/helpers/formHelper";
 import ConnectionProvider from "@/ConnectionProvider";
 
 type TagsProps = WidgetProps & {
@@ -65,8 +65,11 @@ export const TagsInput = (props: TagsInputProps) => {
         const evaluatedDomain = await ConnectionProvider.getHandler().evalDomain(
           {
             domain: ooui.domain,
-            values: formContext.getPlainValues(),
-            context: formContext.getContext(),
+            values: transformPlainMany2Ones({
+              fields: formContext?.getFields(),
+              values: formContext.getPlainValues(),
+            }),
+                context: formContext.getContext(),
           }
         );
         params = [...params, ...evaluatedDomain];
@@ -87,7 +90,7 @@ export const TagsInput = (props: TagsInputProps) => {
         return {label: formattedValue, value: item.id}
       });
       setOptions(options);
-      
+
     } catch (err) {
       setError(err as any)
     } finally {
@@ -156,5 +159,5 @@ export const TagsInput = (props: TagsInputProps) => {
       </div>
     </>
   );
-  
+
 };