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

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";
@@ -348,13 +353,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);