@fctc/widget-logic 2.7.2 → 2.7.4

package/dist/index.js

@@ -5324,7 +5324,6 @@ var many2oneFieldController = (props) => {
     }
   };
   const queryKey = [`data_${relation}`, domainObject];
-  console.log("data", data);
   const {
     data: dataOfSelection,
     refetch,
@@ -5497,8 +5496,7 @@ var many2manyFieldController = (props) => {
     tab,
     setSelectedRowKeys: setSelectedRowKeys2,
     groupByDomain,
-    enabled: enabledCallAPI,
-    actionData
+    enabled: enabledCallAPI
   } = props;
   const { env } = (0, provider_exports.useEnv)();
   const { useGetView: useGetView2, useGetListData: useGetListData2, useGetFormView: useGetFormView2 } = (0, provider_exports.useService)();
@@ -5522,31 +5520,14 @@ var many2manyFieldController = (props) => {
     viewParams,
     enabled: enabledCallAPI
   });
-  const baseModel = (0, import_react17.useMemo)(
-    () => ({
-      name: String(relation),
-      view: viewResponse || {},
-      actContext: contextObject,
-      fields: [
-        ...Object.values(viewResponse?.views?.list?.fields ?? {}),
-        ...tab?.fields ? tab.fields : []
-      ]
-    }),
-    [relation, viewResponse]
-  );
-  const initModel = (0, import_hooks2.useModel)();
-  const modelInstance = (0, import_react17.useMemo)(() => {
-    if (viewResponse) {
-      return initModel.initModel(baseModel);
-    }
-    return null;
-  }, [baseModel, viewResponse]);
-  const specification = (0, import_react17.useMemo)(() => {
-    if (modelInstance) {
-      return modelInstance.getSpecification();
-    }
-    return null;
-  }, [modelInstance]);
+  const { specification } = useGetSpecification({
+    model: String(relation),
+    viewData: viewResponse || {},
+    fields: [
+      ...Object.values(viewResponse?.views?.list?.fields ?? {}),
+      ...tab?.fields ? tab.fields : []
+    ]
+  });
   const default_order = viewResponse && viewResponse?.views?.list?.default_order;
   const optionsObject = tab?.options ? (0, import_utils9.evalJSONContext)(tab?.options) : (options ? (0, import_utils9.evalJSONContext)(options) : {}) || {};
   const fetchData = async () => {
@@ -5672,7 +5653,6 @@ var many2manyTagsController = (props) => {
     enabled: true,
     context: env.context
   };
-  console.log("data", data);
   const { data: dataOfSelection } = useGetSelection3({
     data,
     queryKey: [`data_${relation}`, domainObject],

package/dist/index.mjs

@@ -5405,7 +5405,6 @@ var many2oneFieldController = (props) => {
     }
   };
   const queryKey = [`data_${relation}`, domainObject];
-  console.log("data", data);
   const {
     data: dataOfSelection,
     refetch,
@@ -5567,7 +5566,7 @@ var many2oneButtonController = (props) => {
 };
 
 // src/widget/basic/many2many-field/controller.ts
-import { useEffect as useEffect11, useMemo as useMemo9, useState as useState8 } from "react";
+import { useEffect as useEffect11, useState as useState8 } from "react";
 import {
   evalJSONContext as evalJSONContext4,
   evalJSONDomain as evalJSONDomain4,
@@ -5582,8 +5581,7 @@ var many2manyFieldController = (props) => {
     tab,
     setSelectedRowKeys: setSelectedRowKeys2,
     groupByDomain,
-    enabled: enabledCallAPI,
-    actionData
+    enabled: enabledCallAPI
   } = props;
   const { env } = (0, provider_exports.useEnv)();
   const { useGetView: useGetView2, useGetListData: useGetListData2, useGetFormView: useGetFormView2 } = (0, provider_exports.useService)();
@@ -5607,31 +5605,14 @@ var many2manyFieldController = (props) => {
     viewParams,
     enabled: enabledCallAPI
   });
-  const baseModel = useMemo9(
-    () => ({
-      name: String(relation),
-      view: viewResponse || {},
-      actContext: contextObject,
-      fields: [
-        ...Object.values(viewResponse?.views?.list?.fields ?? {}),
-        ...tab?.fields ? tab.fields : []
-      ]
-    }),
-    [relation, viewResponse]
-  );
-  const initModel = useModel();
-  const modelInstance = useMemo9(() => {
-    if (viewResponse) {
-      return initModel.initModel(baseModel);
-    }
-    return null;
-  }, [baseModel, viewResponse]);
-  const specification = useMemo9(() => {
-    if (modelInstance) {
-      return modelInstance.getSpecification();
-    }
-    return null;
-  }, [modelInstance]);
+  const { specification } = useGetSpecification({
+    model: String(relation),
+    viewData: viewResponse || {},
+    fields: [
+      ...Object.values(viewResponse?.views?.list?.fields ?? {}),
+      ...tab?.fields ? tab.fields : []
+    ]
+  });
   const default_order = viewResponse && viewResponse?.views?.list?.default_order;
   const optionsObject = tab?.options ? evalJSONContext4(tab?.options) : (options ? evalJSONContext4(options) : {}) || {};
   const fetchData = async () => {
@@ -5722,7 +5703,7 @@ var many2manyFieldController = (props) => {
 };
 
 // src/widget/basic/many2many-tags-field/controller.ts
-import { useMemo as useMemo10 } from "react";
+import { useMemo as useMemo9 } from "react";
 import { WIDGETAVATAR, WIDGETCOLOR } from "@fctc/interface-logic/constants";
 import { evalJSONContext as evalJSONContext5, evalJSONDomain as evalJSONDomain5 } from "@fctc/interface-logic/utils";
 var many2manyTagsController = (props) => {
@@ -5740,7 +5721,7 @@ var many2manyTagsController = (props) => {
   const { env } = (0, provider_exports.useEnv)();
   const { useGetSelection: useGetSelection3 } = (0, provider_exports.useService)();
   const addtionalFields = optionsFields ? evalJSONContext5(optionsFields) : null;
-  const domainObject = useMemo10(
+  const domainObject = useMemo9(
     () => evalJSONDomain5(domain, JSON.parse(JSON.stringify(formValues || {}))),
     [domain, formValues]
   );
@@ -5757,7 +5738,6 @@ var many2manyTagsController = (props) => {
     enabled: true,
     context: env.context
   };
-  console.log("data", data);
   const { data: dataOfSelection } = useGetSelection3({
     data,
     queryKey: [`data_${relation}`, domainObject],
@@ -6972,7 +6952,7 @@ var binaryFieldController = (props) => {
 };
 
 // src/widget/advance/table/table-head/controller.ts
-import { useMemo as useMemo11, useRef as useRef5 } from "react";
+import { useMemo as useMemo10, useRef as useRef5 } from "react";
 var tableHeadController = (props) => {
   const {
     typeTable,
@@ -6985,19 +6965,19 @@ var tableHeadController = (props) => {
   const { rowIds: recordIds } = useGetRowIds(tableRef);
   const selectedRowKeysRef = useRef5(recordIds);
   const isGroupTable = typeTable === "group";
-  const recordsCheckedGroup = useMemo11(() => {
+  const recordsCheckedGroup = useMemo10(() => {
     if (!rows || !groupByList) return 0;
     const groupBy = typeof groupByList === "object" ? groupByList?.contexts?.[0]?.group_by : void 0;
     return countSum(rows, groupBy);
   }, [rows, groupByList]);
-  const isAllGroupChecked = useMemo11(() => {
+  const isAllGroupChecked = useMemo10(() => {
     if (!isGroupTable || !selectedRowKeys?.length) return false;
     const selectedLength = selectedRowKeys.filter((id) => id !== -1).length;
     const allRecordsSelected = recordIds.length === selectedRowKeys.length ? recordIds.length === selectedLength : false;
     const allGroupsSelected = recordsCheckedGroup === selectedRowKeys.length;
     return allGroupsSelected || allRecordsSelected;
   }, [isGroupTable, selectedRowKeys, recordIds, recordsCheckedGroup]);
-  const isAllNormalChecked = useMemo11(() => {
+  const isAllNormalChecked = useMemo10(() => {
     if (isGroupTable || !selectedRowKeys?.length || !rows?.length) return false;
     return selectedRowKeys.length === rows.length && selectedRowKeys.every(
       (id) => rows.some((record) => record.id === id)
@@ -7127,7 +7107,7 @@ var tableController = ({ data }) => {
 };
 
 // src/widget/advance/table/table-group/controller.ts
-import { useEffect as useEffect14, useMemo as useMemo12, useState as useState14 } from "react";
+import { useEffect as useEffect14, useMemo as useMemo11, useState as useState14 } from "react";
 import {
   useAppSelector as useAppSelector2,
   selectList
@@ -7155,7 +7135,7 @@ var tableGroupController = (props) => {
     fromEnd: 1
   });
   const domain = row?.__domain;
-  const processedData = useMemo12(() => {
+  const processedData = useMemo11(() => {
     const calculateColSpanEmpty = () => {
       const startIndex = columns.findIndex(
         (col) => col.field.type === "monetary" && typeof row[col.key] === "number" || col.field.aggregator === "sum"
@@ -7170,7 +7150,7 @@ var tableGroupController = (props) => {
     };
     return calculateColSpanEmpty();
   }, [columns, row]);
-  const shouldFetchData = useMemo12(() => {
+  const shouldFetchData = useMemo11(() => {
     return !!isShowGroup;
   }, [isShowGroup]);
   const enabled = shouldFetchData && !!processedData;

package/dist/widget.d.mts

@@ -66,7 +66,6 @@ interface IMany2ManyControllerProps extends IInputFieldProps {
     groupByDomain: any;
     options: any;
     enabled: boolean;
-    actionData: any;
     viewData: any;
 }
 

package/dist/widget.d.ts

@@ -66,7 +66,6 @@ interface IMany2ManyControllerProps extends IInputFieldProps {
     groupByDomain: any;
     options: any;
     enabled: boolean;
-    actionData: any;
     viewData: any;
 }
 

package/dist/widget.js

@@ -4341,6 +4341,34 @@ var import_react10 = require("react");
 
 // src/hooks/core/use-get-specification.ts
 var import_react11 = require("react");
+var useGetSpecification = ({
+  model,
+  viewData,
+  fields
+}) => {
+  const baseModel = (0, import_react11.useMemo)(
+    () => ({
+      name: String(model),
+      view: viewData || {},
+      fields
+    }),
+    [model, viewData]
+  );
+  const initModel = (0, import_hooks3.useModel)();
+  const modelInstance = (0, import_react11.useMemo)(() => {
+    if (viewData) {
+      return initModel.initModel(baseModel);
+    }
+    return null;
+  }, [baseModel, viewData]);
+  const specification = (0, import_react11.useMemo)(() => {
+    if (modelInstance) {
+      return modelInstance.getSpecification();
+    }
+    return null;
+  }, [modelInstance]);
+  return { specification };
+};
 
 // src/hooks/core/use-list-data.ts
 var import_react15 = require("react");
@@ -4480,7 +4508,6 @@ var many2oneFieldController = (props) => {
     }
   };
   const queryKey = [`data_${relation}`, domainObject];
-  console.log("data", data);
   const {
     data: dataOfSelection,
     refetch,
@@ -4653,8 +4680,7 @@ var many2manyFieldController = (props) => {
     tab,
     setSelectedRowKeys: setSelectedRowKeys2,
     groupByDomain,
-    enabled: enabledCallAPI,
-    actionData
+    enabled: enabledCallAPI
   } = props;
   const { env } = (0, provider_exports.useEnv)();
   const { useGetView: useGetView2, useGetListData: useGetListData2, useGetFormView: useGetFormView2 } = (0, provider_exports.useService)();
@@ -4678,31 +4704,14 @@ var many2manyFieldController = (props) => {
     viewParams,
     enabled: enabledCallAPI
   });
-  const baseModel = (0, import_react17.useMemo)(
-    () => ({
-      name: String(relation),
-      view: viewResponse || {},
-      actContext: contextObject,
-      fields: [
-        ...Object.values(viewResponse?.views?.list?.fields ?? {}),
-        ...tab?.fields ? tab.fields : []
-      ]
-    }),
-    [relation, viewResponse]
-  );
-  const initModel = (0, import_hooks3.useModel)();
-  const modelInstance = (0, import_react17.useMemo)(() => {
-    if (viewResponse) {
-      return initModel.initModel(baseModel);
-    }
-    return null;
-  }, [baseModel, viewResponse]);
-  const specification = (0, import_react17.useMemo)(() => {
-    if (modelInstance) {
-      return modelInstance.getSpecification();
-    }
-    return null;
-  }, [modelInstance]);
+  const { specification } = useGetSpecification({
+    model: String(relation),
+    viewData: viewResponse || {},
+    fields: [
+      ...Object.values(viewResponse?.views?.list?.fields ?? {}),
+      ...tab?.fields ? tab.fields : []
+    ]
+  });
   const default_order = viewResponse && viewResponse?.views?.list?.default_order;
   const optionsObject = tab?.options ? (0, import_utils9.evalJSONContext)(tab?.options) : (options ? (0, import_utils9.evalJSONContext)(options) : {}) || {};
   const fetchData = async () => {
@@ -4828,7 +4837,6 @@ var many2manyTagsController = (props) => {
     enabled: true,
     context: env.context
   };
-  console.log("data", data);
   const { data: dataOfSelection } = useGetSelection3({
     data,
     queryKey: [`data_${relation}`, domainObject],

package/dist/widget.mjs

@@ -4394,6 +4394,34 @@ import { useEffect as useEffect6 } from "react";
 
 // src/hooks/core/use-get-specification.ts
 import { useMemo as useMemo6 } from "react";
+var useGetSpecification = ({
+  model,
+  viewData,
+  fields
+}) => {
+  const baseModel = useMemo6(
+    () => ({
+      name: String(model),
+      view: viewData || {},
+      fields
+    }),
+    [model, viewData]
+  );
+  const initModel = useModel();
+  const modelInstance = useMemo6(() => {
+    if (viewData) {
+      return initModel.initModel(baseModel);
+    }
+    return null;
+  }, [baseModel, viewData]);
+  const specification = useMemo6(() => {
+    if (modelInstance) {
+      return modelInstance.getSpecification();
+    }
+    return null;
+  }, [modelInstance]);
+  return { specification };
+};
 
 // src/hooks/core/use-list-data.ts
 import { useMemo as useMemo7, useState as useState6 } from "react";
@@ -4538,7 +4566,6 @@ var many2oneFieldController = (props) => {
     }
   };
   const queryKey = [`data_${relation}`, domainObject];
-  console.log("data", data);
   const {
     data: dataOfSelection,
     refetch,
@@ -4700,7 +4727,7 @@ var many2oneButtonController = (props) => {
 };
 
 // src/widget/basic/many2many-field/controller.ts
-import { useEffect as useEffect11, useMemo as useMemo9, useState as useState8 } from "react";
+import { useEffect as useEffect11, useState as useState8 } from "react";
 import {
   evalJSONContext as evalJSONContext4,
   evalJSONDomain as evalJSONDomain4,
@@ -4715,8 +4742,7 @@ var many2manyFieldController = (props) => {
     tab,
     setSelectedRowKeys: setSelectedRowKeys2,
     groupByDomain,
-    enabled: enabledCallAPI,
-    actionData
+    enabled: enabledCallAPI
   } = props;
   const { env } = (0, provider_exports.useEnv)();
   const { useGetView: useGetView2, useGetListData: useGetListData2, useGetFormView: useGetFormView2 } = (0, provider_exports.useService)();
@@ -4740,31 +4766,14 @@ var many2manyFieldController = (props) => {
     viewParams,
     enabled: enabledCallAPI
   });
-  const baseModel = useMemo9(
-    () => ({
-      name: String(relation),
-      view: viewResponse || {},
-      actContext: contextObject,
-      fields: [
-        ...Object.values(viewResponse?.views?.list?.fields ?? {}),
-        ...tab?.fields ? tab.fields : []
-      ]
-    }),
-    [relation, viewResponse]
-  );
-  const initModel = useModel();
-  const modelInstance = useMemo9(() => {
-    if (viewResponse) {
-      return initModel.initModel(baseModel);
-    }
-    return null;
-  }, [baseModel, viewResponse]);
-  const specification = useMemo9(() => {
-    if (modelInstance) {
-      return modelInstance.getSpecification();
-    }
-    return null;
-  }, [modelInstance]);
+  const { specification } = useGetSpecification({
+    model: String(relation),
+    viewData: viewResponse || {},
+    fields: [
+      ...Object.values(viewResponse?.views?.list?.fields ?? {}),
+      ...tab?.fields ? tab.fields : []
+    ]
+  });
   const default_order = viewResponse && viewResponse?.views?.list?.default_order;
   const optionsObject = tab?.options ? evalJSONContext4(tab?.options) : (options ? evalJSONContext4(options) : {}) || {};
   const fetchData = async () => {
@@ -4855,7 +4864,7 @@ var many2manyFieldController = (props) => {
 };
 
 // src/widget/basic/many2many-tags-field/controller.ts
-import { useMemo as useMemo10 } from "react";
+import { useMemo as useMemo9 } from "react";
 import { WIDGETAVATAR, WIDGETCOLOR } from "@fctc/interface-logic/constants";
 import { evalJSONContext as evalJSONContext5, evalJSONDomain as evalJSONDomain5 } from "@fctc/interface-logic/utils";
 var many2manyTagsController = (props) => {
@@ -4873,7 +4882,7 @@ var many2manyTagsController = (props) => {
   const { env } = (0, provider_exports.useEnv)();
   const { useGetSelection: useGetSelection3 } = (0, provider_exports.useService)();
   const addtionalFields = optionsFields ? evalJSONContext5(optionsFields) : null;
-  const domainObject = useMemo10(
+  const domainObject = useMemo9(
     () => evalJSONDomain5(domain, JSON.parse(JSON.stringify(formValues || {}))),
     [domain, formValues]
   );
@@ -4890,7 +4899,6 @@ var many2manyTagsController = (props) => {
     enabled: true,
     context: env.context
   };
-  console.log("data", data);
   const { data: dataOfSelection } = useGetSelection3({
     data,
     queryKey: [`data_${relation}`, domainObject],
@@ -6105,7 +6113,7 @@ var binaryFieldController = (props) => {
 };
 
 // src/widget/advance/table/table-head/controller.ts
-import { useMemo as useMemo11, useRef as useRef5 } from "react";
+import { useMemo as useMemo10, useRef as useRef5 } from "react";
 var tableHeadController = (props) => {
   const {
     typeTable,
@@ -6118,19 +6126,19 @@ var tableHeadController = (props) => {
   const { rowIds: recordIds } = useGetRowIds(tableRef);
   const selectedRowKeysRef = useRef5(recordIds);
   const isGroupTable = typeTable === "group";
-  const recordsCheckedGroup = useMemo11(() => {
+  const recordsCheckedGroup = useMemo10(() => {
     if (!rows || !groupByList) return 0;
     const groupBy = typeof groupByList === "object" ? groupByList?.contexts?.[0]?.group_by : void 0;
     return countSum(rows, groupBy);
   }, [rows, groupByList]);
-  const isAllGroupChecked = useMemo11(() => {
+  const isAllGroupChecked = useMemo10(() => {
     if (!isGroupTable || !selectedRowKeys?.length) return false;
     const selectedLength = selectedRowKeys.filter((id) => id !== -1).length;
     const allRecordsSelected = recordIds.length === selectedRowKeys.length ? recordIds.length === selectedLength : false;
     const allGroupsSelected = recordsCheckedGroup === selectedRowKeys.length;
     return allGroupsSelected || allRecordsSelected;
   }, [isGroupTable, selectedRowKeys, recordIds, recordsCheckedGroup]);
-  const isAllNormalChecked = useMemo11(() => {
+  const isAllNormalChecked = useMemo10(() => {
     if (isGroupTable || !selectedRowKeys?.length || !rows?.length) return false;
     return selectedRowKeys.length === rows.length && selectedRowKeys.every(
       (id) => rows.some((record) => record.id === id)
@@ -6260,7 +6268,7 @@ var tableController = ({ data }) => {
 };
 
 // src/widget/advance/table/table-group/controller.ts
-import { useEffect as useEffect14, useMemo as useMemo12, useState as useState14 } from "react";
+import { useEffect as useEffect14, useMemo as useMemo11, useState as useState14 } from "react";
 import {
   useAppSelector as useAppSelector2,
   selectList
@@ -6288,7 +6296,7 @@ var tableGroupController = (props) => {
     fromEnd: 1
   });
   const domain = row?.__domain;
-  const processedData = useMemo12(() => {
+  const processedData = useMemo11(() => {
     const calculateColSpanEmpty = () => {
       const startIndex = columns.findIndex(
         (col) => col.field.type === "monetary" && typeof row[col.key] === "number" || col.field.aggregator === "sum"
@@ -6303,7 +6311,7 @@ var tableGroupController = (props) => {
     };
     return calculateColSpanEmpty();
   }, [columns, row]);
-  const shouldFetchData = useMemo12(() => {
+  const shouldFetchData = useMemo11(() => {
     return !!isShowGroup;
   }, [isShowGroup]);
   const enabled = shouldFetchData && !!processedData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fctc/widget-logic",
-  "version": "2.7.2",
+  "version": "2.7.4",
   "types": "dist/index.d.ts",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",