@gisce/react-ooui 1.1.2-rc.0 → 1.1.2-rc.2

package/src/widgets/views/SearchTree.tsx

@@ -34,7 +34,6 @@ type OnRowClickedData = {
 };
 
 type Props = {
-  action?: string;
   model?: string;
   formView?: FormView;
   treeView?: TreeView;
@@ -50,7 +49,6 @@ type Props = {
 
 function SearchTree(props: Props, ref: any) {
   const {
-    action,
     model,
     formView: formViewProps,
     treeView: treeViewProps,
@@ -68,18 +66,13 @@ function SearchTree(props: Props, ref: any) {
   const [initialFetchDone, setInitialFetchDone] = useState<boolean>(false);
 
   const searchNameGetDoneRef = useRef(false);
-  const internalLimit = useRef(80);
 
   const [currentModel, setCurrentModel] = useState<string>();
   const [treeView, setTreeView] = useState<TreeView>();
   const [formView, setFormView] = useState<FormView>();
 
-  const [limitFromAction, setLimitFromAction] = useState<number>();
-  const [limit, setLimit] = useState<number>(DEFAULT_SEARCH_LIMIT);
-
   const [initialError, setInitialError] = useState<string>();
 
-  const actionDomain = useRef<any>([]);
   const [searchFilterHeight, setSearchFilterHeight] = useState<number>(200);
 
   const expandableClickActionData = useRef<any>();
@@ -112,6 +105,8 @@ function SearchTree(props: Props, ref: any) {
     setTreeIsLoading = undefined,
     searchValues = {},
     setSearchValues = undefined,
+    limit = DEFAULT_SEARCH_LIMIT,
+    setLimit = undefined,
   } = (rootTree ? actionViewContext : {}) || {};
 
   const {
@@ -151,9 +146,8 @@ function SearchTree(props: Props, ref: any) {
     domain,
     currentId,
     setActionViewTotalItems,
-    limitFromAction,
-    setLimit,
     limit,
+    setLimit,
   });
 
   useImperativeHandle(ref, () => ({
@@ -172,20 +166,16 @@ function SearchTree(props: Props, ref: any) {
       searchNameGetDoneRef.current = false;
       fetchResults();
     }
-  }, [page, limit, offset, initialFetchDone, visible, nameSearch]);
+  }, [page, 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);
@@ -195,20 +185,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);
 
@@ -234,20 +210,14 @@ function SearchTree(props: Props, ref: any) {
 
     setFormView(_formView as FormView);
     setTreeView(_treeView as TreeView);
-    setLimitFromAction(undefined);
-    setLimit(DEFAULT_SEARCH_LIMIT);
   };
 
   useEffect(() => {
-    if (action) {
-      fetchData("action");
-    } else if (model) {
-      fetchData("model");
-    }
-  }, [action, model]);
+    fetchData();
+  }, [model]);
 
   const onSearchTreeLimitChange = (newLimit: number) => {
-    internalLimit.current = newLimit;
+    setLimit?.(newLimit);
   };
 
   const treeButOpen = async (record: any) => {

package/src/widgets/views/Tree.tsx

@@ -119,6 +119,7 @@ function Tree(props: Props): React.ReactElement {
   const treeOoui = useRef<any>(null);
 
   const { t } = useContext(LocaleContext) as LocaleContextType;
+  const internalLimit = useRef(limit);
 
   useEffect(() => {
     treeOoui.current = getTree(treeView);
@@ -143,9 +144,10 @@ function Tree(props: Props): React.ReactElement {
     errorInParseColors.current = false;
     const items = getTableItems(treeOoui.current, results);
     setItems(items);
+    internalLimit.current = limit;
   }, [results]);
 
-  const from = (page - 1) * limit + 1;
+  const from = (page - 1) * internalLimit.current + 1;
   const to = from - 1 + items.length;
   const summary =
     total === undefined
@@ -169,7 +171,7 @@ function Tree(props: Props): React.ReactElement {
         <Col span={12}>
           <Pagination
             total={total}
-            pageSize={limit}
+            pageSize={internalLimit.current}
             current={page}
             showSizeChanger={false}
             onChange={onRequestPageChange}

package/src/.eslintcache

@@ -1 +0,0 @@
-[{"/Users/marc/development/react-ooui/src/stories/Button.stories.js":"1","/Users/marc/development/react-ooui/src/stories/Char.stories.js":"2","/Users/marc/development/react-ooui/src/stories/Selection.stories.js":"3","/Users/marc/development/react-ooui/src/stories/ManyToOne.stories.js":"4","/Users/marc/development/react-ooui/src/stories/Checkbox.stories.js":"5","/Users/marc/development/react-ooui/src/widgets/Checkbox.tsx":"6","/Users/marc/development/react-ooui/src/widgets/ManyToOne.tsx":"7","/Users/marc/development/react-ooui/src/widgets/Selection.tsx":"8","/Users/marc/development/react-ooui/src/widgets/Button.tsx":"9","/Users/marc/development/react-ooui/src/widgets/Char.tsx":"10","/Users/marc/development/react-ooui/src/index.ts":"11","/Users/marc/development/react-ooui/src/helpers/TreeHelper.ts":"12","/Users/marc/development/react-ooui/src/widgets/Tree.tsx":"13","/Users/marc/development/react-ooui/src/stories/Tree.stories.js":"14"},{"size":721,"mtime":1611223665948,"results":"15","hashOfConfig":"16"},{"size":432,"mtime":1611223665949,"results":"17","hashOfConfig":"16"},{"size":539,"mtime":1611223665952,"results":"18","hashOfConfig":"16"},{"size":599,"mtime":1611223665950,"results":"19","hashOfConfig":"16"},{"size":464,"mtime":1611223665949,"results":"20","hashOfConfig":"16"},{"size":671,"mtime":1611223665953,"results":"21","hashOfConfig":"16"},{"size":1308,"mtime":1611223665954,"results":"22","hashOfConfig":"16"},{"size":706,"mtime":1611223665954,"results":"23","hashOfConfig":"16"},{"size":639,"mtime":1611223665953,"results":"24","hashOfConfig":"16"},{"size":741,"mtime":1611223665953,"results":"25","hashOfConfig":"16"},{"size":385,"mtime":1611227468105,"results":"26","hashOfConfig":"16"},{"size":1966,"mtime":1611306565063,"results":"27","hashOfConfig":"16"},{"size":1681,"mtime":1611227447728,"results":"28","hashOfConfig":"16"},{"size":3152,"mtime":1611308351200,"results":"29","hashOfConfig":"16"},{"filePath":"30","messages":"31","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},"i1ix4w",{"filePath":"33","messages":"34","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"35","messages":"36","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"37","messages":"38","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"39","messages":"40","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"41","messages":"42","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"43","messages":"44","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"45","messages":"46","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"47","messages":"48","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"49"},{"filePath":"50","messages":"51","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"52","messages":"53","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"54","messages":"55","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"56","messages":"57","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"58","messages":"59","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},"/Users/marc/development/react-ooui/src/stories/Button.stories.js",[],[],"/Users/marc/development/react-ooui/src/stories/Char.stories.js",[],"/Users/marc/development/react-ooui/src/stories/Selection.stories.js",[],"/Users/marc/development/react-ooui/src/stories/ManyToOne.stories.js",[],"/Users/marc/development/react-ooui/src/stories/Checkbox.stories.js",[],"/Users/marc/development/react-ooui/src/widgets/Checkbox.tsx",[],"/Users/marc/development/react-ooui/src/widgets/ManyToOne.tsx",[],"/Users/marc/development/react-ooui/src/widgets/Selection.tsx",[],"/Users/marc/development/react-ooui/src/widgets/Button.tsx",[],[],"/Users/marc/development/react-ooui/src/widgets/Char.tsx",[],"/Users/marc/development/react-ooui/src/index.ts",[],"/Users/marc/development/react-ooui/src/helpers/TreeHelper.ts",[],"/Users/marc/development/react-ooui/src/widgets/Tree.tsx",[],"/Users/marc/development/react-ooui/src/stories/Tree.stories.js",[]]