Merge pull request #346 from gisce/fix/searchfilter_widgets_adjustment

Use new widget property in fields and ditch form parsing in search fields
gisce · Sep 5, 2023 · 2a5ad3a · 2a5ad3a
2 parents 1608f4d + c7c9ca4
commit 2a5ad3a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 17 deletions.
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "1.4.7",
+  "version": "1.4.8",
   "files": [
     "dist",
     "src",
@@ -33,7 +33,7 @@
   "dependencies": {
     "@ant-design/plots": "^1.0.9",
     "@gisce/fiber-diagram": "^1.1.0-rc.3",
-    "@gisce/ooui": "^0.22.1",
+    "@gisce/ooui": "^0.22.2",
     "@gisce/react-formiga-components": "^1.0.9-rc.21",
     "@gisce/react-formiga-table": "^0.8.4",
     "@monaco-editor/react": "^4.4.5",

diff --git a/src/views/actionViews/GraphActionView.tsx b/src/views/actionViews/GraphActionView.tsx
@@ -113,7 +113,6 @@ export const GraphActionView = (props: GraphActionViewProps) => {
           formView.search_fields,
           treeView.search_fields,
         ])}
-        formXml={formView.arch}
         limit={limit!}
         onClear={clear}
         offset={offset}

diff --git a/src/widgets/views/SearchTree.tsx b/src/widgets/views/SearchTree.tsx
@@ -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}

diff --git a/src/widgets/views/searchFilter/SearchFilter.tsx b/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);