@gisce/react-ooui 1.4.10-rc.0 → 1.4.11-rc.0

package/dist/widgets/base/many2one/Many2oneSuffix.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Many2oneSuffix.d.ts","sourceRoot":"","sources":["Many2oneSuffix.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAuB/D,aAAK,KAAK,GAAG;IACX,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,GAAG,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,cAAc,UAAW,KAAK,6BAmL1C,CAAC"}
+{"version":3,"file":"Many2oneSuffix.d.ts","sourceRoot":"","sources":["Many2oneSuffix.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAwB/D,aAAK,KAAK,GAAG;IACX,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,GAAG,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,cAAc,UAAW,KAAK,6BAiM1C,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "1.4.10-rc.0",
+  "version": "1.4.11-rc.0",
   "files": [
     "dist",
     "src",
@@ -33,9 +33,9 @@
   "dependencies": {
     "@ant-design/plots": "^1.0.9",
     "@gisce/fiber-diagram": "^1.1.0-rc.3",
-    "@gisce/ooui": "^0.22.2",
+    "@gisce/ooui": "^0.22.3-rc.0",
     "@gisce/react-formiga-components": "^1.0.9-rc.21",
-    "@gisce/react-formiga-table": "^0.8.5-rc.0",
+    "@gisce/react-formiga-table": "^0.8.5",
     "@monaco-editor/react": "^4.4.5",
     "@tabler/icons-react": "^2.11.0",
     "antd": "^5.5.2",

package/src/widgets/base/many2one/Many2oneSuffix.tsx

@@ -20,6 +20,7 @@ import ConnectionProvider from "@/ConnectionProvider";
 import { processValues } from "@/helpers/formHelper";
 import showErrorDialog from "@/ui/ActionErrorDialog";
 import { LocaleContext, LocaleContextType } from "@/context/LocaleContext";
+import { parseContextFields, parseDomainFields } from "@gisce/ooui";
 
 type Props = {
   id: number;
@@ -60,18 +61,30 @@ export const Many2oneSuffix = (props: Props) => {
         context,
       }) as FormView;
       setFormView(formView);
-      const { fields, arch } = formView;
-
-      const values = (
-        await ConnectionProvider.getHandler().readObjects({
-          model,
-          ids: [id],
-          fields,
-          context,
-        })
-      )[0];
-
-      setTargetValues({ ...processValues(values, fields), active_id: id });
+      let fields: string[] = [];
+      const { toolbar } = formView;
+      toolbar.action?.filter((item: any) => item.hasOwnProperty('context')).map((item: any) => fields.push(...parseContextFields(item.context)));
+      toolbar.action?.filter((item: any) => item.hasOwnProperty('domain')).map((item: any) => fields.push(...parseDomainFields(item.domain)));
+      toolbar.relate?.filter((item: any) => item.hasOwnProperty('context')).map((item: any) => fields.push(...parseContextFields(item.context)));
+      toolbar.relate?.filter((item: any) => item.hasOwnProperty('domain')).map((item: any) => fields.push(...parseDomainFields(item.domain)));
+      toolbar.print?.filter((item: any) => item.hasOwnProperty('context')).map((item: any) => fields.push(...parseContextFields(item.context)));
+      fields = fields.filter((i) => Object.keys(formView.fields).indexOf(i) > -1)
+
+      let values = {}
+
+      if (fields.length > 0) {
+        values = (
+          await ConnectionProvider.getHandler().readObjects({
+            model,
+            ids: [id],
+            fieldsToRetrieve: fields,
+            context,
+          })
+        )[0];
+      }
+      values = { ...processValues(values, fields), active_id: id };
+      setTargetValues(values);
+      console.log('Values', targetValues, values);
 
       setIsLoading(false);
     } catch (err) {
@@ -149,6 +162,8 @@ export const Many2oneSuffix = (props: Props) => {
         return;
       }
 
+      console.log(targetValues);
+
       openRelate({
         relateData: relateItemClicked,
         values: targetValues,