@gisce/react-ooui 1.0.21 → 1.0.22-rc.0

package/dist/views/ActionView.d.ts

@@ -15,6 +15,7 @@ declare type Props = {
     action_id: number;
     action_type: string;
     treeExpandable?: boolean;
+    limit?: number;
 };
 export declare type View = {
     id: number;

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,EAAsB,QAAQ,EAAE,MAAM,eAAe,CAAC;AAsB7D,aAAK,KAAK,GAAG;IACX,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,GAAG,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAChC,WAAW,EAAE,IAAI,CAAC;IAClB,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;CAC1B,CAAC;AAEF,oBAAY,IAAI,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,QAAQ,CAAC;CAChB,CAAC;;AAuZF,wBAAsC"}
+{"version":3,"file":"ActionView.d.ts","sourceRoot":"","sources":["ActionView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAON,MAAM,OAAO,CAAC;AAIf,OAAO,EAAsB,QAAQ,EAAE,MAAM,eAAe,CAAC;AAsB7D,aAAK,KAAK,GAAG;IACX,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,GAAG,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAChC,WAAW,EAAE,IAAI,CAAC;IAClB,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;AAEF,oBAAY,IAAI,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,QAAQ,CAAC;CAChB,CAAC;;AAyZF,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;;AA+cF,wBAAoC"}
+{"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;;AAwdF,wBAAoC"}

package/dist/widgets/views/SearchTree.d.ts

@@ -7,7 +7,6 @@ declare type OnRowClickedData = {
     treeView: TreeView;
 };
 declare type Props = {
-    action?: string;
     model?: string;
     formView?: FormView;
     treeView?: TreeView;
@@ -19,6 +18,7 @@ declare type Props = {
     rootTree?: boolean;
     parentContext?: any;
     onChangeSelectedRowKeys?: (selectedRowKeys: any) => void;
+    limit?: number;
 };
 declare const _default: React.ForwardRefExoticComponent<Props & React.RefAttributes<unknown>>;
 export default _default;

package/dist/widgets/views/SearchTree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SearchTree.d.ts","sourceRoot":"","sources":["SearchTree.tsx"],"names":[],"mappings":"AAAA,OAAO,KAQN,MAAM,OAAO,CAAC;AAKf,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAwBnD,aAAK,gBAAgB,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;AAEF,aAAK,KAAK,GAAG;IACX,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,YAAY,EAAE,CAAC,IAAI,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAC/C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,uBAAuB,CAAC,EAAE,CAAC,eAAe,EAAE,GAAG,KAAK,IAAI,CAAC;CAC1D,CAAC;;AAwjBF,wBAAsC"}
+{"version":3,"file":"SearchTree.d.ts","sourceRoot":"","sources":["SearchTree.tsx"],"names":[],"mappings":"AAAA,OAAO,KAQN,MAAM,OAAO,CAAC;AAKf,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAwBnD,aAAK,gBAAgB,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;AAEF,aAAK,KAAK,GAAG;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,YAAY,EAAE,CAAC,IAAI,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAC/C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,uBAAuB,CAAC,EAAE,CAAC,eAAe,EAAE,GAAG,KAAK,IAAI,CAAC;IACzD,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;;AA8hBF,wBAAsC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "1.0.21",
+  "version": "1.0.22-rc.0",
   "files": [
     "dist",
     "src",

package/src/views/ActionView.tsx

@@ -46,6 +46,7 @@ type Props = {
   action_id: number;
   action_type: string;
   treeExpandable?: boolean;
+  limit?: number;
 };
 
 export type View = {
@@ -69,6 +70,7 @@ function ActionView(props: Props, ref: any) {
     action_id,
     action_type,
     treeExpandable = false,
+    limit
   } = props;
   const [currentView, setCurrentViewInternal] = useState<View>();
   const [availableViews, setAvailableViews] = useState<View[]>([]);
@@ -341,6 +343,7 @@ function ActionView(props: Props, ref: any) {
           ref={searchTreeRef}
           rootTree={true}
           model={model}
+          limit={limit}
           parentContext={context}
           nameSearch={searchTreeNameSearch}
           formView={formView}

package/src/views/RootView.tsx

@@ -122,6 +122,7 @@ function RootView(props: RootViewProps, ref: any) {
       name: title,
       target,
       view_type,
+      limit,
     } = dataForAction;
 
     const treeExpandable = view_type === "tree";
@@ -174,6 +175,7 @@ function RootView(props: RootViewProps, ref: any) {
       forced_values,
       res_id,
       treeExpandable,
+      limit,
     });
   }
 
@@ -228,6 +230,7 @@ function RootView(props: RootViewProps, ref: any) {
       views,
       target,
       string: title,
+      limit,
     } = relateData;
 
     const [id, type] = views[0];
@@ -257,6 +260,7 @@ function RootView(props: RootViewProps, ref: any) {
       initialView,
       action_id,
       action_type,
+      limit,
     });
   }
 
@@ -288,6 +292,7 @@ function RootView(props: RootViewProps, ref: any) {
       name: title,
       target,
       view_type,
+      limit,
     } = dataForAction;
     const treeExpandable = view_type === "tree";
 
@@ -343,6 +348,7 @@ function RootView(props: RootViewProps, ref: any) {
       action_type,
       res_id,
       treeExpandable,
+      limit,
     });
   }
 
@@ -388,6 +394,7 @@ function RootView(props: RootViewProps, ref: any) {
     values,
     forced_values,
     treeExpandable = false,
+    limit,
   }: {
     domain: any;
     context: any;
@@ -402,6 +409,7 @@ function RootView(props: RootViewProps, ref: any) {
     values?: any;
     forced_values?: any;
     treeExpandable?: boolean;
+    limit?: number;
   }) {
     const key = uuidv4();
 
@@ -448,6 +456,7 @@ function RootView(props: RootViewProps, ref: any) {
             formDefaultValues={values}
             formForcedValues={forced_values}
             treeExpandable={treeExpandable}
+            limit={limit}
           />
         ),
         key,

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

@@ -86,11 +86,11 @@ export const Many2oneInput: React.FC<Many2oneInputProps> = (
   const transformedDomain = useRef<any[]>([]);
   const [searchDomain, setSearchDomain] = useState<any>([]);
 
-  const id = value && value[0];
+  const id = (value && value[0]) || undefined;
   const text = (value && value[1]) || "";
 
   useEffect(() => {
-    if (!Array.isArray(value) && !isNaN(value as any)) {
+    if (!Array.isArray(value) && value) {
       fetchNameAndUpdate(value as any);
     }
   }, [value]);

package/src/widgets/views/SearchTree.tsx

@@ -43,7 +43,6 @@ type OnRowClickedData = {
 };
 
 type Props = {
-  action?: string;
   model?: string;
   formView?: FormView;
   treeView?: TreeView;
@@ -55,11 +54,11 @@ type Props = {
   rootTree?: boolean;
   parentContext?: any;
   onChangeSelectedRowKeys?: (selectedRowKeys: any) => void;
+  limit?: number;
 };
 
 function SearchTree(props: Props, ref: any) {
   const {
-    action,
     model,
     formView: formViewProps,
     treeView: treeViewProps,
@@ -71,13 +70,14 @@ function SearchTree(props: Props, ref: any) {
     rootTree = false,
     parentContext = {},
     onChangeSelectedRowKeys,
+    limit: limitFromAction,
   } = props;
 
   const [isLoading, setIsLoading] = useState<boolean>(false);
   const [initialFetchDone, setInitialFetchDone] = useState<boolean>(false);
 
   const searchNameGetDoneRef = useRef(false);
-  const internalLimit = useRef(80);
+  const internalLimit = useRef(limitFromAction || DEFAULT_SEARCH_LIMIT);
 
   const [currentModel, setCurrentModel] = useState<string>();
   const [treeView, setTreeView] = useState<TreeView>();
@@ -85,8 +85,9 @@ function SearchTree(props: Props, ref: any) {
 
   const [page, setPage] = useState<number>(1);
   const [offset, setOffset] = useState<number>(0);
-  const [limit, setLimit] = useState<number>(DEFAULT_SEARCH_LIMIT);
-  const [limitFromAction, setLimitFromAction] = useState<number>();
+  const [limit, setLimit] = useState<number>(
+    limitFromAction || DEFAULT_SEARCH_LIMIT
+  );
 
   const paramsRef = useRef<Array<any>>([]);
 
@@ -94,9 +95,8 @@ function SearchTree(props: Props, ref: any) {
   const [resultsInternal, setResultsInternal] = useState<any>([]);
   const [colorsForResults, setColorsForResults] = useState<any>(undefined);
 
-  const [searchFilterLoading, setSearchFilterLoading] = useState<boolean>(
-    false
-  );
+  const [searchFilterLoading, setSearchFilterLoading] =
+    useState<boolean>(false);
   const [searchError, setSearchError] = useState<string>();
   const [initialError, setInitialError] = useState<string>();
 
@@ -179,8 +179,8 @@ function SearchTree(props: Props, ref: any) {
 
       const { colors } = getTree(treeView!);
 
-      const resultsWithData = await ConnectionProvider.getHandler().readEvalUiObjects(
-        {
+      const resultsWithData =
+        await ConnectionProvider.getHandler().readEvalUiObjects({
           model: currentModel!,
           ids: resultsIds,
           arch: treeView?.arch!,
@@ -191,8 +191,7 @@ function SearchTree(props: Props, ref: any) {
           attrs: colors && {
             colors,
           },
-        }
-      );
+        });
       const resultsData = resultsWithData[0];
 
       originalResults.current = [...resultsData];
@@ -359,18 +358,14 @@ function SearchTree(props: Props, ref: any) {
     }
   }, [page, limit, offset, initialFetchDone, visible, nameSearch]);
 
-  const fetchData = async (type: "action" | "model") => {
+  const fetchData = async () => {
     setInitialFetchDone(false);
     setIsLoading(true);
     setInitialError(undefined);
     setTreeIsLoading?.(true);
 
     try {
-      if (type === "action") {
-        await fetchActionData();
-      } else {
-        await fetchModelData();
-      }
+      await fetchModelData();
       setInitialFetchDone(true);
     } catch (error) {
       setInitialError(error);
@@ -380,21 +375,6 @@ function SearchTree(props: Props, ref: any) {
     }
   };
 
-  const fetchActionData = async () => {
-    const dataForAction = await ConnectionProvider.getHandler().getViewsForAction(
-      {
-        action: action!,
-        context: parentContext,
-      }
-    );
-    actionDomain.current = dataForAction.domain;
-    setFormView(dataForAction.views.get("form"));
-    setTreeView(dataForAction.views.get("tree"));
-    setCurrentModel(dataForAction.model);
-    setLimitFromAction(dataForAction.limit);
-    setLimit(dataForAction.limit);
-  };
-
   const fetchModelData = async () => {
     setCurrentModel(model);
 
@@ -420,17 +400,12 @@ function SearchTree(props: Props, ref: any) {
 
     setFormView(_formView as FormView);
     setTreeView(_treeView as TreeView);
-    setLimitFromAction(undefined);
-    setLimit(DEFAULT_SEARCH_LIMIT);
+    setLimit(limitFromAction || DEFAULT_SEARCH_LIMIT);
   };
 
   useEffect(() => {
-    if (action) {
-      fetchData("action");
-    } else if (model) {
-      fetchData("model");
-    }
-  }, [action, model]);
+    fetchData();
+  }, [model]);
 
   const onClear = () => {
     if (tableRefreshing) return;
@@ -474,13 +449,12 @@ function SearchTree(props: Props, ref: any) {
     const { id } = record;
 
     if (!expandableClickActionData.current) {
-      expandableClickActionData.current = await ConnectionProvider.getHandler().treeButOpen(
-        {
+      expandableClickActionData.current =
+        await ConnectionProvider.getHandler().treeButOpen({
           id: treeView!.view_id,
           model: currentModel!,
           context: parentContext,
-        }
-      );
+        });
     }
 
     const actionData: any = expandableClickActionData.current[0][2];