@gisce/react-ooui 1.1.2-rc.1 → 1.1.2-rc.3

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

@@ -1 +1 @@
-{"version":3,"file":"ActionView.d.ts","sourceRoot":"","sources":["ActionView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAON,MAAM,OAAO,CAAC;AAIf,OAAO,EAIL,eAAe,EAGf,QAAQ,EACT,MAAM,eAAe,CAAC;AAiBvB,aAAK,KAAK,GAAG;IACX,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,GAAG,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAChC,WAAW,EAAE,eAAe,CAAC;IAC7B,iBAAiB,CAAC,EAAE,GAAG,CAAC;IACxB,gBAAgB,CAAC,EAAE,GAAG,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;;AA2aF,wBAAsC"}
+{"version":3,"file":"ActionView.d.ts","sourceRoot":"","sources":["ActionView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAON,MAAM,OAAO,CAAC;AAIf,OAAO,EAIL,eAAe,EAGf,QAAQ,EACT,MAAM,eAAe,CAAC;AAiBvB,aAAK,KAAK,GAAG;IACX,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,GAAG,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAChC,WAAW,EAAE,eAAe,CAAC;IAC7B,iBAAiB,CAAC,EAAE,GAAG,CAAC;IACxB,gBAAgB,CAAC,EAAE,GAAG,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;;AA0aF,wBAAsC"}

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;;AAudF,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;;AA0dF,wBAAoC"}

package/dist/widgets/base/Binary.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Binary.d.ts","sourceRoot":"","sources":["Binary.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,aAAa,CAAC;AAmBnD,aAAK,KAAK,GAAG;IACX,IAAI,EAAE,UAAU,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,MAAM,UAAW,KAAK,gBASlC,CAAC;AAEF,UAAU,gBAAgB;IACxB,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;CAChD;AAED,eAAO,MAAM,WAAW,UAAW,gBAAgB,gBAiGlD,CAAC"}
+{"version":3,"file":"Binary.d.ts","sourceRoot":"","sources":["Binary.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,aAAa,CAAC;AAmBnD,aAAK,KAAK,GAAG;IACX,IAAI,EAAE,UAAU,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,MAAM,UAAW,KAAK,gBASlC,CAAC;AAEF,UAAU,gBAAgB;IACxB,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;CAChD;AAED,eAAO,MAAM,WAAW,UAAW,gBAAgB,gBAkGlD,CAAC"}

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,EAAY,MAAM,SAAS,CAAC;AAiB1C,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,CA2kB/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,EAAY,MAAM,SAAS,CAAC;AAkB1C,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.1.2-rc.1",
+  "version": "1.1.2-rc.3",
   "files": [
     "dist",
     "src",
@@ -23,7 +23,10 @@
     "access": "public"
   },
   "scripts": {
+    "preminor": "npm version preminor --preid rc",
     "prerelease": "npm version prerelease --preid rc",
+    "prepatch": "npm version prepatch --preid rc",
+    "premajor": "npm version premajor --preid rc",
     "start": "while :; do vite build --watch --force; done",
     "build:tailwind": "postcss src/tailwind.css -o src/tailwind.generated.css",
     "build": "vite build",
@@ -33,7 +36,7 @@
   },
   "dependencies": {
     "@ant-design/plots": "^1.0.9",
-    "@gisce/ooui": "^0.17.6",
+    "@gisce/ooui": "^0.17.7",
     "@gisce/react-formiga-table": "^0.5.0",
     "@monaco-editor/react": "^4.4.5",
     "@tabler/icons": "^1.96.0",

package/src/context/ActionViewContext.tsx

@@ -128,6 +128,17 @@ const ActionViewProvider = (props: ActionViewProviderProps): any => {
     }
   }, [availableViews]);
 
+  useEffect(() => {
+    if (
+      previousView?.view_id === currentView.view_id &&
+      availableViews.length > 1
+    ) {
+      setPreviousView(
+        availableViews.filter((view) => view.view_id !== currentView.view_id)[0]
+      );
+    }
+  }, [currentView]);
+
   const callOnFormSave = () => {
     (formRef.current as any)?.submitForm();
   };

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: ({
@@ -95,9 +96,9 @@ const ContentRootProvider = (
       return;
     }
 
-    const { ids, ...datasource } = datas || {};
+    const { ids } = datas || {};
 
-    let idsToExecute = ids;
+    let idsToExecute = ids || [];
 
     const reportContextParsed =
       typeof reportContext === "string"
@@ -108,23 +109,6 @@ const ContentRootProvider = (
           })
         : reportContext;
 
-    if (!idsToExecute) {
-      const results = await ConnectionProvider.getHandler().searchAllIds({
-        params: [],
-        model: datasource.model || model,
-        totalItems: 1,
-        context: { ...context, ...reportContextParsed },
-      });
-
-      if (results.length === 0) {
-        showErrorDialog("Nothing to print");
-        return;
-      }
-
-      idsToExecute = results;
-      datas.id = results[0];
-    }
-
     try {
       const newReportId = await ConnectionProvider.getHandler().createReport({
         model,
@@ -242,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/helpers/treeHelper.ts

@@ -160,22 +160,6 @@ function sortResults({
   return resultsToSort.sort(sortFn);
 }
 
-function sortResultsWithOrder(results: any[], order: number[]) {
-  if (!order) {
-    const sortResultsById = results.sort((a: any, b: any) => {
-      return a.id - b.id;
-    });
-    return sortResultsById;
-  }
-
-  const sortedResults = results.sort((a: any, b: any) => {
-    const aIndex = order.indexOf(a.id);
-    const bIndex = order.indexOf(b.id);
-    return aIndex - bIndex;
-  });
-  return sortedResults;
-}
-
 export {
   getTableColumns,
   getTableItems,
@@ -184,5 +168,4 @@ export {
   itemHasBooleans,
   getColorMap,
   sortResults,
-  sortResultsWithOrder,
 };

package/src/stories/mocks/models/cups.ts

@@ -49,8 +49,7 @@ export default {
     tv: false,
   },
   form: {
-    arch:
-      '<form string="CUPS">\n                    <notebook colspan="4">\n                       <page string="Corbes">                         <group colspan="4">                             <group string="Validada" colspan="2">                                 <field name="bq" string="Última corba"/>                                 <field name="bq" string="Format"/>                             </group>                             <group string="Facturada" colspan="2">                                 <field name="bq" string="Última corba"/>                                 <field name="bq" string="Format"/>                             </group>                             <group string="Autoconsumida" colspan="2">                                 <field name="bq" string="Última corba"/>                                 <field name="bq" string="Format"/>                             </group>                             <group string="Generada Neta" colspan="2">                                 <field name="bq" string="Última corba"/>                                 <field name="bq" string="Format"/>                             </group>                             <group string="Quart-Horària" colspan="2">                                 <field name="bq" string="Última corba"/>                                 <field name="bq" string="Format"/>                             </group>                        </group>                    </page> <page string="General">\n                            <field name="name" select="1" size="25"/>\n                            <field name="active" select="1"/>\n                            <field name="distribuidora_id" domain="[(\'supplier\',\'=\',True)]" context="{\'task\': \'test\'}" required="1" select="1"/>\n                <field name="id_municipi" select="1"/>\n                            <field name="id_provincia"/>\n                            <field name="id_poblacio" select="1" domain="[(\'municipi_id.id\', \'=\', id_municipi)]"/>\n                            <field name="dp"/>\n                            <field name="direccio" select="1" colspan="4"/>\n                            <field name="polissa_polissa" select="1"/>\n                    <field name="polissa_comptador" select="1"/>\n                <field name="polissa_potencia"/>\n                <field name="potencia_adscrita" attrs="{\'readonly\':[(\'force_potencia_adscrita\',\'=\',0)]}"/>\n                    <field name="force_potencia_adscrita"/>\n                <group colspan="4" string="Adreces">\n                                <notebook colspan="4">\n                                    <page string="Principal">\n                                        <separator string="Zona urbana" colspan="4"/>\n                                        <field name="tv"/>\n                                        <field name="nv" select="1"/>\n                                        <field name="pnp" select="1"/>\n                                        <field name="bq" select="1"/>\n                                        <field name="es" select="1"/>\n                                        <field name="pt" select="1"/>\n                                        <field name="pu" select="1"/>\n                                        <field name="aclarador" colspan="4" select="1"/>\n                                        <separator string="Zona industrial" colspan="4"/>\n                                        <field name="cpo" select="1"/>\n                                        <field name="cpa" select="1"/>\n                                    </page>\n                                    <page string="Cadastre">\n                                        <separator string="Zona urbana" colspan="4"/>\n                                        <field name="catas_np"/>\n                                        <field name="catas_nm"/>\n                                        <field name="ref_catastral" select="1"/>\n                                        <button type="object" name="update_dir_from_ref" string="Obtenir del Cadastre"/>\n                                        <button type="object" name="delete_dir_ref" string="Eliminar dades del Cadastre" confirm="Està segur que vol eliminar les dades que s\'han obtingut del cadastre?"/>\n                                        <field name="catas_ldt" colspan="4"/>\n                                        <field name="catas_tv"/>\n                                        <field name="catas_nv"/>\n                                        <field name="catas_pnp"/>\n                                        <field name="catas_bq"/>\n                                        <field name="catas_es"/>\n                                        <field name="catas_pt"/>\n                                        <field name="catas_pu"/>\n                                        <field name="catas_dp"/>\n                                        <separator string="Zona industrial" colspan="4"/>\n                                        <field name="catas_cpo"/>\n                                        <field name="catas_cpa"/>\n                                        <separator string="Sincronització amb el cadastre" colspan="4"/>\n                                        <label colspan="2" string="Si disposa de la referencia cadastral pot copiar les dades del cadastre a l\'adreça principal mitjançant aquest botó"/>\n                                        <button type="object" name="copy_to_alternative" string="Copiar a la principal"/>\n                                    </page>\n                                    <page string="Notes">\n                                    <field name="notes" colspan="4" nolabel="1"/>\n                                    </page>\n                                </notebook>\n                            </group>\n                        </page>\n                    <page string="Autoconsum">\n                        <field name="autoconsum_id" readonly="1" colspan="4"/>\n                        <field name="coef_repartiment" readonly="1" colspan="4"/>\n                    </page>\n                <page string="Butlletins">\n                        <field name="butlletins" colspan="4" nolabel="1" context="{\'cups_id\': active_id}"/>\n                    </page>\n                <page string="Històric d\'autoconsums">\n                        <field name="hist_autoconsum" nolabel="1" context="{\'default_cups_id\': active_id}" readonly="1"/>\n                    </page>\n                <page string="Històric de pòlisses">\n                        <field name="polisses" nolabel="1" colspan="4">\n                            </field>\n                    </page>\n                </notebook>\n                </form>',
+    arch: '<form string="CUPS">\n                    <notebook colspan="4">\n                       <page string="Corbes">                         <group colspan="4">                             <group string="Validada" colspan="2">                                 <field name="bq" string="Última corba"/>                                 <field name="bq" string="Format"/>                             </group>                             <group string="Facturada" colspan="2">                                 <field name="bq" string="Última corba"/>                                 <field name="bq" string="Format"/>                             </group>                             <group string="Autoconsumida" colspan="2">                                 <field name="bq" string="Última corba"/>                                 <field name="bq" string="Format"/>                             </group>                             <group string="Generada Neta" colspan="2">                                 <field name="bq" string="Última corba"/>                                 <field name="bq" string="Format"/>                             </group>                             <group string="Quart-Horària" colspan="2">                                 <field name="bq" string="Última corba"/>                                 <field name="bq" string="Format"/>                             </group>                        </group>                    </page> <page string="General">\n                            <field name="name" select="1" size="25"/>\n                            <field name="active" select="1"/>\n                            <field name="distribuidora_id" domain="[(\'supplier\',\'=\',True)]" context="{\'task\': \'test\'}" required="1" select="1"/>\n                <field name="id_municipi" select="1"/>\n                            <field name="id_provincia"/>\n                            <field name="id_poblacio" select="1" domain="[(\'municipi_id.id\', \'=\', id_municipi)]"/>\n                            <field name="dp"/>\n                            <field name="direccio" select="1" colspan="4"/>\n                            <field name="polissa_polissa" select="1"/>\n                    <field name="polissa_comptador" select="1"/>\n                <field name="polissa_potencia"/>\n                <field name="potencia_adscrita" attrs="{\'readonly\':[(\'force_potencia_adscrita\',\'=\',0)]}"/>\n                    <field name="force_potencia_adscrita"/>\n                <group colspan="4" string="Adreces">\n                                <notebook colspan="4">\n                                    <page string="Principal">\n                                        <separator string="Zona urbana" colspan="4"/>\n                                        <field name="tv"/>\n                                        <field name="nv" select="1"/>\n                                        <field name="pnp" select="1"/>\n                                        <field name="bq" select="1"/>\n                                        <field name="es" select="1"/>\n                                        <field name="pt" select="1"/>\n                                        <field name="pu" select="1"/>\n                                        <field name="aclarador" colspan="4" select="1"/>\n                                        <separator string="Zona industrial" colspan="4"/>\n                                        <field name="cpo" select="1"/>\n                                        <field name="cpa" select="1"/>\n                                    </page>\n                                    <page string="Cadastre">\n                                        <separator string="Zona urbana" colspan="4"/>\n                                        <field name="catas_np"/>\n                                        <field name="catas_nm"/>\n                                        <field name="ref_catastral" select="1"/>\n                                        <button type="object" name="update_dir_from_ref" string="Obtenir del Cadastre"/>\n                                        <button type="object" name="delete_dir_ref" string="Eliminar dades del Cadastre" confirm="Està segur que vol eliminar les dades que s\'han obtingut del cadastre?"/>\n                                        <field name="catas_ldt" colspan="4"/>\n                                        <field name="catas_tv"/>\n                                        <field name="catas_nv"/>\n                                        <field name="catas_pnp"/>\n                                        <field name="catas_bq"/>\n                                        <field name="catas_es"/>\n                                        <field name="catas_pt"/>\n                                        <field name="catas_pu"/>\n                                        <field name="catas_dp"/>\n                                        <separator string="Zona industrial" colspan="4"/>\n                                        <field name="catas_cpo"/>\n                                        <field name="catas_cpa"/>\n                                        <separator string="Sincronització amb el cadastre" colspan="4"/>\n                                        <label colspan="2" string="Si disposa de la referencia cadastral pot copiar les dades del cadastre a l\'adreça principal mitjançant aquest botó"/>\n                                        <button type="object" name="copy_to_alternative" string="Copiar a la principal"/>\n                                    </page>\n                                    <page string="Notes">\n                                    <field name="notes" colspan="4" nolabel="1"/>\n                                    </page>\n                                </notebook>\n                            </group>\n                        </page>\n                    <page string="Autoconsum">\n                        <field name="autoconsum_id" readonly="1" colspan="4"/>\n                        <field name="coef_repartiment" readonly="1" colspan="4"/>\n                    </page>\n                <page string="Butlletins">\n                        <field name="butlletins" colspan="4" nolabel="1" context="{\'cups_id\': active_id}"/>\n                    </page>\n                <page string="Històric d\'autoconsums">\n                        <field name="hist_autoconsum" nolabel="1" context="{\'default_cups_id\': active_id}" readonly="1"/>\n                    </page>\n                <page string="Històric de pòlisses">\n                        <field name="polisses" nolabel="1" colspan="4">\n                            </field>\n                    </page>\n                </notebook>\n                </form>',
     field_parent: false,
     fields: {
       aclarador: {
@@ -113,7 +112,7 @@ export default {
         readonly: true,
         size: 5,
         string: "Codi Postal (c)",
-        type: "char",
+        type: "integer",
         views: {},
       },
       catas_es: {
@@ -218,7 +217,7 @@ export default {
       dp: {
         size: 5,
         string: "Codi Postal",
-        type: "char",
+        type: "float",
         views: {},
       },
       es: {
@@ -332,8 +331,7 @@ export default {
         type: "one2many",
         views: {
           tree: {
-            arch:
-              '<tree string="Modificacions contractuals">\n                                <field name="polissa_id"/>\n                                <field name="comptadors_periode"/>\n                <field name="titular"/>\n                                <field name="tarifa"/>\n                                <field name="potencia"/>\n                                <field name="tensio_normalitzada"/>\n                                <field name="name"/>\n                                <field name="tipus"/>\n                                <field name="data_inici"/>\n                                <field name="data_final"/>\n                                <field name="state"/>\n                            </tree>\n                        ',
+            arch: '<tree string="Modificacions contractuals">\n                                <field name="polissa_id"/>\n                                <field name="comptadors_periode"/>\n                <field name="titular"/>\n                                <field name="tarifa"/>\n                                <field name="potencia"/>\n                                <field name="tensio_normalitzada"/>\n                                <field name="name"/>\n                                <field name="tipus"/>\n                                <field name="data_inici"/>\n                                <field name="data_final"/>\n                                <field name="state"/>\n                            </tree>\n                        ',
             fields: {
               comptadors_periode: {
                 digits: [16, 2],
@@ -667,8 +665,7 @@ export default {
     view_id: 458,
   },
   tree: {
-    arch:
-      '<tree string="CUPS">\n                    <field name="distribuidora_id"/>\n                <field name="name"/>\n                    <field name="polissa_polissa"/>\n                    <field name="polissa_comptador"/>\n                <field name="polissa_potencia" sum="Potència contractada (kW)"/>\n                <field name="active"/>\n                    <field name="direccio"/>\n                    <field name="id_municipi"/>\n                </tree>',
+    arch: '<tree string="CUPS">\n                    <field name="distribuidora_id"/>\n                <field name="name"/>\n                    <field name="polissa_polissa"/>\n                    <field name="polissa_comptador"/>\n                <field name="polissa_potencia" sum="Potència contractada (kW)"/>\n                <field name="active"/>\n                    <field name="direccio"/>\n                    <field name="id_municipi"/>\n                </tree>',
     field_parent: false,
     fields: {
       active: {

package/src/views/ActionView.tsx

@@ -401,7 +401,6 @@ function ActionView(props: Props, ref: any) {
               formView={
                 availableViews.find((v) => v.type === "form") as FormView
               }
-              limit={limit}
             />
           );
         }

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 { InitialViewData, 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/Binary.tsx

@@ -62,9 +62,10 @@ export const BinaryInput = (props: BinaryInputProps) => {
     const linkSource = `data:${fileType?.mime};base64,${value}`;
     const downloadLink = document.createElement("a");
     const fileName = getFieldValue(filenameField);
+    const name = getFieldValue("name");
 
     downloadLink.href = linkSource;
-    downloadLink.download = fileName;
+    downloadLink.download = fileName || name;
     downloadLink.click();
   }
 

package/src/widgets/base/Integer.tsx

@@ -24,7 +24,7 @@ export const Integer = (props: IntegerProps) => {
         className={"w-full " + requiredClass}
         disabled={readOnly}
         formatter={(value) => {
-          return `${value}`.replace(/[^0-9]+/g, "");
+          return `${value}`.replace(/[^0-9\-]+/g, "");
         }}
         onChange={(newValue: any) => {
           const newNumber = newValue as number;

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

@@ -25,7 +25,8 @@ import { One2manyTopBar } from "@/widgets/base/one2many/One2manyTopBar";
 import { readObjectValues, getNextPendingId } from "@/helpers/one2manyHelper";
 import { SearchModal } from "@/widgets/modals/SearchModal";
 import { LocaleContext, LocaleContextType } from "@/context/LocaleContext";
-import { sortResults, sortResultsWithOrder } from "@/helpers/treeHelper";
+import { sortResults } from "@/helpers/treeHelper";
+import { transformPlainMany2Ones } from "@/helpers/formHelper";
 
 type One2manyValue = {
   fields?: any;
@@ -78,7 +79,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();
@@ -162,7 +164,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,
@@ -546,10 +551,7 @@ const One2manyInput: React.FC<One2manyInputProps> = (
             ...(views.get("form")?.fields || {}),
           },
         })
-      : sortResultsWithOrder(
-          itemsToShow.map((item) => item.treeValues),
-          originalSortItemIds.current!
-        );
+      : itemsToShow.map((item) => item.treeValues);
 
     if (currentView === "tree") {
       return (

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>
     </>
   );
-  
+
 };

package/src/.eslintcache

@@ -1 +0,0 @@
-[{"/Users/marc/development/react-ooui/src/stories/Button.stories.js":"1","/Users/marc/development/react-ooui/src/stories/Char.stories.js":"2","/Users/marc/development/react-ooui/src/stories/Selection.stories.js":"3","/Users/marc/development/react-ooui/src/stories/ManyToOne.stories.js":"4","/Users/marc/development/react-ooui/src/stories/Checkbox.stories.js":"5","/Users/marc/development/react-ooui/src/widgets/Checkbox.tsx":"6","/Users/marc/development/react-ooui/src/widgets/ManyToOne.tsx":"7","/Users/marc/development/react-ooui/src/widgets/Selection.tsx":"8","/Users/marc/development/react-ooui/src/widgets/Button.tsx":"9","/Users/marc/development/react-ooui/src/widgets/Char.tsx":"10","/Users/marc/development/react-ooui/src/index.ts":"11","/Users/marc/development/react-ooui/src/helpers/TreeHelper.ts":"12","/Users/marc/development/react-ooui/src/widgets/Tree.tsx":"13","/Users/marc/development/react-ooui/src/stories/Tree.stories.js":"14"},{"size":721,"mtime":1611223665948,"results":"15","hashOfConfig":"16"},{"size":432,"mtime":1611223665949,"results":"17","hashOfConfig":"16"},{"size":539,"mtime":1611223665952,"results":"18","hashOfConfig":"16"},{"size":599,"mtime":1611223665950,"results":"19","hashOfConfig":"16"},{"size":464,"mtime":1611223665949,"results":"20","hashOfConfig":"16"},{"size":671,"mtime":1611223665953,"results":"21","hashOfConfig":"16"},{"size":1308,"mtime":1611223665954,"results":"22","hashOfConfig":"16"},{"size":706,"mtime":1611223665954,"results":"23","hashOfConfig":"16"},{"size":639,"mtime":1611223665953,"results":"24","hashOfConfig":"16"},{"size":741,"mtime":1611223665953,"results":"25","hashOfConfig":"16"},{"size":385,"mtime":1611227468105,"results":"26","hashOfConfig":"16"},{"size":1966,"mtime":1611306565063,"results":"27","hashOfConfig":"16"},{"size":1681,"mtime":1611227447728,"results":"28","hashOfConfig":"16"},{"size":3152,"mtime":1611308351200,"results":"29","hashOfConfig":"16"},{"filePath":"30","messages":"31","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},"i1ix4w",{"filePath":"33","messages":"34","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"35","messages":"36","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"37","messages":"38","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"39","messages":"40","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"41","messages":"42","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"43","messages":"44","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"45","messages":"46","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"47","messages":"48","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"49"},{"filePath":"50","messages":"51","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"52","messages":"53","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"54","messages":"55","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"56","messages":"57","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"58","messages":"59","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},"/Users/marc/development/react-ooui/src/stories/Button.stories.js",[],[],"/Users/marc/development/react-ooui/src/stories/Char.stories.js",[],"/Users/marc/development/react-ooui/src/stories/Selection.stories.js",[],"/Users/marc/development/react-ooui/src/stories/ManyToOne.stories.js",[],"/Users/marc/development/react-ooui/src/stories/Checkbox.stories.js",[],"/Users/marc/development/react-ooui/src/widgets/Checkbox.tsx",[],"/Users/marc/development/react-ooui/src/widgets/ManyToOne.tsx",[],"/Users/marc/development/react-ooui/src/widgets/Selection.tsx",[],"/Users/marc/development/react-ooui/src/widgets/Button.tsx",[],[],"/Users/marc/development/react-ooui/src/widgets/Char.tsx",[],"/Users/marc/development/react-ooui/src/index.ts",[],"/Users/marc/development/react-ooui/src/helpers/TreeHelper.ts",[],"/Users/marc/development/react-ooui/src/widgets/Tree.tsx",[],"/Users/marc/development/react-ooui/src/stories/Tree.stories.js",[]]