@gisce/react-ooui 1.2.0-rc.4 → 1.2.0-rc.6

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;;AAkbF,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;AAkBvB,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;;AA4bF,wBAAsC"}

package/dist/widgets/modals/ExportModal.d.ts

@@ -8,7 +8,6 @@ export declare type ExportModalProps = {
     model: string;
     domain: any[];
     limit?: number;
-    treeFields?: any;
     context?: any;
 };
 export declare const ExportModal: (props: ExportModalProps) => JSX.Element;

package/dist/widgets/modals/ExportModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExportModal.d.ts","sourceRoot":"","sources":["ExportModal.tsx"],"names":[],"mappings":";AAWA,oBAAY,gBAAgB,GAAG;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,OAAO,CAAC,EAAE,GAAG,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,WAAW,UAAW,gBAAgB,gBA6FlD,CAAC"}
+{"version":3,"file":"ExportModal.d.ts","sourceRoot":"","sources":["ExportModal.tsx"],"names":[],"mappings":";AAWA,oBAAY,gBAAgB,GAAG;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,GAAG,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,WAAW,UAAW,gBAAgB,gBAgGlD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "1.2.0-rc.4",
+  "version": "1.2.0-rc.6",
   "files": [
     "dist",
     "src",
@@ -37,7 +37,7 @@
   "dependencies": {
     "@ant-design/plots": "^1.0.9",
     "@gisce/ooui": "^0.17.7",
-    "@gisce/react-formiga-components": "^1.0.9-rc.8",
+    "@gisce/react-formiga-components": "^1.0.9-rc.9",
     "@gisce/react-formiga-table": "^0.5.0",
     "@monaco-editor/react": "^4.4.5",
     "@tabler/icons": "^1.96.0",

package/src/actionbar/TreeActionBar.tsx

@@ -61,7 +61,6 @@ function TreeActionBar(props: Props) {
     previousView,
     results,
     limit,
-    totalItems,
   } = useContext(ActionViewContext) as ActionViewContextType;
 
   const { parentContext = {}, treeExpandable, toolbar } = props;
@@ -73,6 +72,10 @@ function TreeActionBar(props: Props) {
   const { processAction } = contentRootContext || {};
   const [exportModalVisible, setExportModalVisible] = useState(false);
 
+  const hasNameSearch: boolean =
+    searchTreeNameSearch !== undefined &&
+    searchTreeNameSearch.trim().length > 0;
+
   function tryDelete() {
     showConfirmDialog({
       confirmMessage: t("confirmRemove"),
@@ -239,6 +242,43 @@ function TreeActionBar(props: Props) {
         </>
       )}
       {separator()}
+      <DropdownButton
+        icon={<ThunderboltOutlined />}
+        disabled={
+          !(selectedRowItems && selectedRowItems?.length > 0) || treeIsLoading
+        }
+        tooltip={t("actions")}
+        items={toolbar?.action}
+        onItemClick={(action: any) => {
+          if (!action) {
+            return;
+          }
+
+          runAction(action);
+        }}
+      />
+      <DropdownButton
+        icon={<PrinterOutlined />}
+        disabled={
+          !(selectedRowItems && selectedRowItems?.length > 0) || treeIsLoading
+        }
+        tooltip={t("reports")}
+        items={toolbar?.print}
+        onItemClick={(report: any) => {
+          if (!report) {
+            return;
+          }
+
+          runAction({
+            ...report,
+            datas: {
+              ...(report.datas || {}),
+              ids: selectedRowItems!.map((item) => item.id),
+            },
+          });
+        }}
+      />
+      {separator()}
       <DropdownButton
         icon={
           <Icon
@@ -246,12 +286,12 @@ function TreeActionBar(props: Props) {
               <svg
                 xmlns="http://www.w3.org/2000/svg"
                 className="icon icon-tabler icon-tabler-database-export"
-                width="18"
-                height="18"
+                width="1em"
+                height="1em"
                 viewBox="0 0 24 24"
                 stroke-width="1.5"
-                stroke="#2c3e50"
                 fill="none"
+                stroke="currentColor"
                 stroke-linecap="round"
                 stroke-linejoin="round"
               >
@@ -267,74 +307,56 @@ function TreeActionBar(props: Props) {
         items={[
           {
             id: "print_screen",
-            name: "Imprimir pantalla",
+            name: t("printScreen"),
           },
           {
             id: "export",
-            name: "Exportación avanzada",
+            name: t("advancedExport"),
           },
         ]}
-        onItemClick={(action: any) => {
-          if (!action) {
-            return;
-          }
+        onItemClick={(itemClicked: any) => {
+          if (itemClicked.id === "print_screen") {
+            let idsToExport = selectedRowItems?.map((item) => item.id) || [];
 
-          runAction(action);
-        }}
-        disabled={duplicatingItem || removingItem || treeIsLoading}
-      />
-      {separator()}
-      <DropdownButton
-        icon={<ThunderboltOutlined />}
-        disabled={
-          !(selectedRowItems && selectedRowItems?.length > 0) || treeIsLoading
-        }
-        tooltip={t("actions")}
-        items={toolbar?.action}
-        onItemClick={(action: any) => {
-          if (!action) {
+            if (idsToExport.length === 0) {
+              idsToExport = results?.map((item) => item.id) || [];
+            }
+
+            runAction({
+              id: -1,
+              model: currentModel,
+              report_name: "printscreen.list",
+              type: "ir.actions.report.xml",
+              datas: {
+                model: currentModel,
+                ids: idsToExport,
+              },
+            });
             return;
           }
 
-          runAction(action);
+          setExportModalVisible(true);
         }}
-      />
-      <DropdownButton
-        icon={<PrinterOutlined />}
         disabled={
-          !(selectedRowItems && selectedRowItems?.length > 0) || treeIsLoading
+          duplicatingItem || removingItem || treeIsLoading || hasNameSearch
         }
-        tooltip={t("reports")}
-        items={toolbar?.print}
-        onItemClick={(report: any) => {
-          if (!report) {
-            return;
-          }
-
-          runAction({
-            ...report,
-            datas: {
-              ...(report.datas || {}),
-              ids: selectedRowItems!.map((item) => item.id),
-            },
-          });
-        }}
       />
       <ExportModal
         visible={exportModalVisible}
         locale={lang}
         onClose={() => setExportModalVisible(false)}
         model={currentModel!}
-        treeFields={searchTreeRef?.current?.getFields()}
         domain={mergeParams(
           searchTreeRef?.current?.getDomain() || [],
           searchParams || []
         )}
         limit={limit}
-        totalRegisters={totalItems}
+        totalRegisters={results?.length || 0}
         selectedRegistersToExport={
-          results && results.length && results.length > 0
-            ? results.length
+          selectedRowItems &&
+          selectedRowItems.length &&
+          selectedRowItems.length > 0
+            ? selectedRowItems.length
             : undefined
         }
         context={parentContext}

package/src/locales/ca_ES.tsx

@@ -86,4 +86,6 @@ export default {
   totalRegisters: "Registres totals:",
   export: "Exportar",
   selectAtLeastOneField: "Selecciona almenys un camp per a l'exportació",
+  printScreen: "Imprimir pantalla",
+  advancedExport: "Exportació avançada",
 };

package/src/locales/en_US.tsx

@@ -83,4 +83,6 @@ export default {
   totalRegisters: "Total registers:",
   export: "Export",
   selectAtLeastOneField: "Select at least one field for the export",
+  printScreen: "Print screen",
+  advancedExport: "Advanced export",
 };

package/src/locales/es_ES.tsx

@@ -87,4 +87,6 @@ export default {
   totalRegisters: "Registros totales:",
   export: "Exportar",
   selectAtLeastOneField: "Selecciona al menos un campo para la exportación",
+  printScreen: "Imprimir pantalla",
+  advancedExport: "Exportación avanzada",
 };

package/src/views/ActionView.tsx

@@ -28,6 +28,7 @@ import {
 import { useHotkeys } from "react-hotkeys-hook";
 import { GoToResourceModal } from "@/ui/GoToResourceModal";
 import showInfo from "@/ui/InfoDialog";
+import showErrorDialog from "@/ui/ActionErrorDialog";
 import { LocaleContext, LocaleContextType } from "@/context/LocaleContext";
 import { GraphActionView } from "@/views/actionViews/GraphActionView";
 import { FormActionView } from "./actionViews/FormActionView";
@@ -191,6 +192,7 @@ function ActionView(props: Props, ref: any) {
         case "form": {
           viewDataRetrieved.push({
             ...(viewInfo as FormView),
+            type: viewType,
           });
           break;
         }
@@ -198,12 +200,14 @@ function ActionView(props: Props, ref: any) {
           viewDataRetrieved.push({
             ...(viewInfo as TreeView),
             isExpandable: treeExpandable,
+            type: viewType,
           });
           break;
         }
         case "graph": {
           viewDataRetrieved.push({
             ...(viewInfo as GraphView),
+            type: viewType,
           });
           break;
         }
@@ -211,18 +215,18 @@ function ActionView(props: Props, ref: any) {
           break;
       }
     }
+    let currentViewToAssign = undefined;
 
     if (!initialView && viewDataRetrieved.find((v) => v.type === "tree")) {
       const treeView: TreeView = viewDataRetrieved.find(
         (v) => v.type === "tree"
       ) as TreeView;
-      setCurrentView(treeView);
+      currentViewToAssign = treeView;
     } else if (!initialView) {
       const formView: TreeView = viewDataRetrieved.find(
         (v) => v.type === "form"
       ) as TreeView;
-
-      setCurrentView(formView);
+      currentViewToAssign = formView;
     } else {
       const view = viewDataRetrieved.find((v) => {
         if (!initialView.id) {
@@ -231,9 +235,16 @@ function ActionView(props: Props, ref: any) {
           return v.type === initialView.type && v.view_id === initialView.id;
         }
       });
-      setCurrentView(view);
+      currentViewToAssign = view;
+    }
+
+    if (!currentViewToAssign) {
+      showErrorDialog(
+        "Error determining the first view to show.\nPlease, make sure the view ids on the fields_view_get responses are the same as the ones defined in the action"
+      );
     }
 
+    setCurrentView(currentViewToAssign);
     setAvailableViews(viewDataRetrieved);
     setIsLoading(false);
   };

package/src/widgets/modals/ExportModal.tsx

@@ -18,7 +18,6 @@ export type ExportModalProps = {
   model: string;
   domain: any[];
   limit?: number;
-  treeFields?: any;
   context?: any;
 };
 
@@ -29,7 +28,6 @@ export const ExportModal = (props: ExportModalProps) => {
     onClose,
     model,
     context,
-    treeFields,
     selectedRegistersToExport,
     totalRegisters,
     domain,
@@ -77,13 +75,18 @@ export const ExportModal = (props: ExportModalProps) => {
     async ({ key, title }: any) => {
       let fieldDefinition;
 
-      if (key.indexOf("/") === -1) {
+      const sanitizedKey =
+        key.split("/")[key.split("/").length - 1] === "id"
+          ? key.split("/").slice(0, -1).join("/")
+          : key;
+
+      if (sanitizedKey.indexOf("/") === -1) {
         fieldDefinition = fields.current["/"];
       } else {
-        fieldDefinition = fields.current[getParentKey(key)];
+        fieldDefinition = fields.current[getParentKey(sanitizedKey)];
       }
 
-      const optsForField = fieldDefinition[getChildKey(key)];
+      const optsForField = fieldDefinition[getChildKey(sanitizedKey)];
       const relation = optsForField.relation;
       const viewData = await ConnectionProvider.getHandler().getFields({
         model: relation,
@@ -91,12 +94,12 @@ export const ExportModal = (props: ExportModalProps) => {
         fields: [],
       });
 
-      fields.current[key] = viewData;
+      fields.current[sanitizedKey] = viewData;
 
       return convertToExportField({
         fields: viewData,
         parentTitle: title,
-        parentKey: key,
+        parentKey: sanitizedKey,
       });
     },
     [fields, model, context]
@@ -112,7 +115,6 @@ export const ExportModal = (props: ExportModalProps) => {
       totalRegisters={totalRegisters}
       onGetFieldChilds={onGetFieldChilds}
       onGetFields={onGetFields}
-      selectedKeys={treeFields ? Object.keys(treeFields) : undefined}
     />
   );
 };
@@ -130,13 +132,24 @@ const convertToExportField = ({
 
   for (const key of Object.keys(fields)) {
     const valuesForField = fields[key];
+
+    if (valuesForField.relation && valuesForField.is_function === true) {
+      continue;
+    }
+    
     const relationField =
       valuesForField.type === "many2one" ||
       valuesForField.type === "one2many" ||
       valuesForField.type === "many2many";
 
+    let newKey = `${parentKey ? parentKey + "/" : ""}${key}`;
+
+    if (relationField) {
+      newKey += "/id";
+    }
+
     exportFields.push({
-      key: `${parentKey ? parentKey + "/" : ""}${key}`,
+      key: newKey,
       title: `${parentTitle ? parentTitle + "/" : ""}${valuesForField.string}`,
       tooltip: valuesForField.help,
       required: valuesForField.required,