@gisce/react-ooui 2.0.0-rc.3 → 2.0.0-rc.5

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,29 @@ 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);
 
       setIsLoading(false);
     } catch (err) {

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

@@ -437,11 +437,19 @@ const One2manyInput: React.FC<One2manyInputProps> = (
   const onFormModalSubmitSucceed = (
     id: number | undefined,
     _: any,
-    values: any
+    values: any,
+    x2manyPendingLink: boolean = false
   ) => {
     let updatedItems: One2manyItem[];
 
-    if (id) {
+    if (x2manyPendingLink) {
+      updatedItems = items.concat({
+        id,
+        operation: "pendingLink",
+        values: { ...values, id },
+        treeValues: { ...values, id },
+      });
+    } else if (id) {
       updatedItems = items.map((item: One2manyItem) => {
         if (item.id === id) {
           return {
@@ -683,7 +691,7 @@ const One2manyInput: React.FC<One2manyInputProps> = (
         formView={views.get("form")}
         model={relation}
         id={modalItem?.id}
-        submitMode={"values"}
+        submitMode={"2many"}
         values={modalItem?.values}
         defaultValues={modalItem?.defaultValues}
         visible={showFormModal}

package/src/widgets/views/Form.tsx

@@ -67,8 +67,13 @@ export type FormProps = {
   showFooter?: boolean;
   getDataFromAction?: boolean;
   mustClearAfterSave?: boolean;
-  submitMode?: "api" | "values";
-  onSubmitSucceed?: (id?: number, values?: any, formValues?: any) => void;
+  submitMode?: "api" | "values" | "2many";
+  onSubmitSucceed?: (
+    id?: number,
+    values?: any,
+    formValues?: any,
+    x2manyPendingLink?: boolean
+  ) => void;
   onSubmitError?: (error: any) => void;
   onCancel?: () => void;
   onFieldsChange?: (values: any) => void;
@@ -127,6 +132,7 @@ function Form(props: FormProps, ref: any) {
   const lastAssignedValues = useRef<any>({});
   const warningIsShown = useRef<boolean>(false);
   const formSubmitting = useRef<boolean>(false);
+  const x2manyPendingLink = useRef<boolean>(false);
 
   const widthToEvaluate =
     parentWidth !== undefined ? parentWidth : containerWidth;
@@ -203,10 +209,15 @@ function Form(props: FormProps, ref: any) {
     }
   }, [defaultGetCalled]);
 
-  const onSubmitSucceed = (id?: number, values?: any, formValues?: any) => {
+  const onSubmitSucceed = (
+    id?: number,
+    values?: any,
+    formValues?: any,
+    x2manyPendingLink?: boolean
+  ) => {
     setFormHasChanges?.(false);
     setFormIsSaving?.(false);
-    propsOnSubmitSucceed?.(id, values, formValues);
+    propsOnSubmitSucceed?.(id, values, formValues, x2manyPendingLink);
     setCurrentId?.(id);
   };
 
@@ -294,6 +305,15 @@ function Form(props: FormProps, ref: any) {
     return { ...parentContext, ...formOoui?.context };
   }
 
+  function getActiveIdsContext() {
+    const currentId = getCurrentId()!;
+
+    if (!currentId) {
+      return {};
+    }
+    return { active_id: getCurrentId()!, active_ids: [getCurrentId()!] };
+  }
+
   function getAdditionalValues() {
     return {
       id: getCurrentId()!,
@@ -608,6 +628,32 @@ function Form(props: FormProps, ref: any) {
     formSubmitting.current = true;
 
     setError(undefined);
+
+    if (
+      x2manyPendingLink.current &&
+      !formHasChanges() &&
+      getCurrentId()! &&
+      callOnSubmitSucceed
+    ) {
+      formSubmitting.current = false;
+      setFormHasChanges?.(false);
+      onSubmitSucceed?.(
+        getCurrentId(),
+        getValues(),
+        getFormValues(),
+        x2manyPendingLink.current
+      );
+      x2manyPendingLink.current = false;
+      const currentId = getCurrentId()!;
+
+      if (mustClearAfterSave) {
+        createdId.current = undefined;
+        assignNewValuesToForm({ values: {}, fields, reset: true });
+      }
+
+      return { succeed: true, id: currentId };
+    }
+
     if (!formHasChanges() && getCurrentId()! && callOnSubmitSucceed) {
       formSubmitting.current = false;
       setFormHasChanges?.(false);
@@ -833,9 +879,9 @@ function Form(props: FormProps, ref: any) {
       action,
       payload: [getCurrentId()!],
       context: {
-        ...context,
         ...formOoui?.context,
         ...parentContext,
+        ...context,
       },
     });
 
@@ -957,15 +1003,26 @@ function Form(props: FormProps, ref: any) {
 
     try {
       if (formHasChanges() || getCurrentId() === undefined) {
-        await submitForm({ callOnSubmitSucceed: false });
+        if (submitMode === "2many") {
+          await submitApi({ callOnSubmitSucceed: false });
+          x2manyPendingLink.current = true;
+        } else {
+          await submitForm({ callOnSubmitSucceed: false });
+        }
       }
 
+      const additionalContext = x2manyPendingLink.current
+        ? getActiveIdsContext()
+        : {};
+
+      const updatedContext = { ...context, ...additionalContext };
+
       if (type === "object") {
-        await runObjectButton({ action, context });
+        await runObjectButton({ action, context: updatedContext });
       } else if (type === "workflow") {
         await runWorkflowButton({ action });
       } else if (type === "action") {
-        await runActionButton({ action, context });
+        await runActionButton({ action, context: updatedContext });
       }
     } catch (err) {
       showErrorDialog(err);

package/src/widgets/views/SearchTree.tsx

@@ -128,7 +128,7 @@ function SearchTree(props: Props, ref: any) {
   } = useSearch({
     model: currentModel!,
     setSearchTreeNameSearch,
-    setSelectedRowItems,
+    setSelectedRowItems: changeSelectedRowKeys,
     setSearchParams,
     setSearchValues,
     searchParams,
@@ -291,12 +291,11 @@ function SearchTree(props: Props, ref: any) {
     return (
       <>
         <SearchFilter
-          fields={{ ...treeView.fields, ...formView.fields }}
+          fields={{ ...formView.fields, ...treeView.fields }}
           searchFields={mergeSearchFields([
             formView.search_fields,
             treeView.search_fields,
           ])}
-          formXml={formView.arch}
           onClear={clear}
           limit={limit}
           offset={offset}

package/src/widgets/views/Tree.tsx

@@ -1,6 +1,11 @@
 import React, { useContext, useEffect, useRef, useState } from "react";
 import { Pagination, Checkbox, Space, Row, Col, Spin, Tag, Badge } from "antd";
-import { getTree, getTableColumns, getTableItems } from "@/helpers/treeHelper";
+import {
+  getTree,
+  getTableColumns,
+  getTableItems,
+  hasActualValues,
+} from "@/helpers/treeHelper";
 import { Tree as TreeOoui } from "@gisce/ooui";
 
 import { TreeView, Column } from "@/types";
@@ -331,7 +336,9 @@ function Tree(props: Props): React.ReactElement {
     }
   }
 
-  return treeOoui.current === null ? (
+  return treeOoui.current === null ||
+    !dataTable ||
+    dataTable.columns?.length === 0 ? (
     <Spin style={{ padding: "2rem" }} />
   ) : (
     <div>
@@ -348,13 +355,18 @@ function Tree(props: Props): React.ReactElement {
           }
           return undefined;
         }}
-        onRowStatus={(record: any) => {
-          if (statusForResults![record.id]) {
-            return <Badge color={statusForResults[record.id]} />;
-          }
-          return undefined;
-        }}
+        onRowStatus={
+          hasActualValues(statusForResults)
+            ? (record: any) => {
+                if (statusForResults![record.id]) {
+                  return <Badge color={statusForResults[record.id]} />;
+                }
+                return undefined;
+              }
+            : undefined
+        }
         onRowDoubleClick={onRowClicked}
+        selectionRowKeys={rowSelection?.selectedRowKeys}
         onRowSelectionChange={rowSelection?.onChange}
         onChangeSort={onChangeSort}
         sorter={sorter}

package/src/widgets/views/searchFilter/SearchFilter.tsx

@@ -31,7 +31,6 @@ type Props = {
   searchError?: string;
   searchValues?: any;
   showLimitOptions?: boolean;
-  formXml: string;
 };
 
 function SearchFilter(props: Props) {
@@ -49,7 +48,6 @@ function SearchFilter(props: Props) {
     searchError,
     searchValues,
     showLimitOptions = true,
-    formXml,
   } = props;
 
   const [simpleSearchFields, setSimpleSearchFields] = useState<Container>();
@@ -89,7 +87,7 @@ function SearchFilter(props: Props) {
 
   useDeepCompareEffect(() => {
     setAdvancedFilter(false);
-    sfo.current = new SearchFilterOoui(searchFields, fields, formXml);
+    sfo.current = new SearchFilterOoui(searchFields, fields);
     sfo.current.parse();
     setSimpleSearchFields(sfo.current._simpleSearchContainer);
     setAdvancedSearchFields(sfo.current._advancedSearchContainer);