@gisce/react-ooui 1.0.20 → 1.1.1

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

@@ -1,5 +1,5 @@
-import React, { useState } from "react";
-import { Form, Row, Col } from "antd";
+import React, { useEffect, useState } from "react";
+import { Form, Row, Col, Alert } from "antd";
 import useDeepCompareEffect from "use-deep-compare-effect";
 
 import {
@@ -13,7 +13,8 @@ import { SearchBottomBar } from "./SearchBottomBar";
 import { SearchFields } from "@/types";
 import { SearchParams } from "./SearchParams";
 
-import { getParamsForFields } from "@/helpers/searchFilterHelper";
+import { getParamsForFields } from "@/helpers/searchHelper";
+import Measure from "react-measure";
 
 type Props = {
   fields: any;
@@ -24,6 +25,10 @@ type Props = {
   limit: number;
   offset: number;
   onLimitChange?: (limit: number) => void;
+  searchVisible?: boolean;
+  setSearchFilterHeight?: (height: number) => void;
+  searchError?: string;
+  searchValues?: any;
 };
 
 function SearchFilter(props: Props) {
@@ -36,6 +41,10 @@ function SearchFilter(props: Props) {
     offset,
     limit,
     onLimitChange,
+    searchVisible,
+    setSearchFilterHeight,
+    searchError,
+    searchValues,
   } = props;
 
   const [simpleSearchFields, setSimpleSearchFields] = useState<Container>();
@@ -44,6 +53,10 @@ function SearchFilter(props: Props) {
 
   const [form] = Form.useForm();
 
+  useEffect(() => {
+    form.setFieldsValue(searchValues);
+  }, [searchValues]);
+
   const getRowsAndCols = () => {
     if (!advancedSearchFields) {
       return;
@@ -83,30 +96,52 @@ function SearchFilter(props: Props) {
     delete values.limit;
     const newParams = getParamsForFields(values, fields);
 
-    onSubmit({ params: newParams, offset, limit });
+    onSubmit({ params: newParams, offset, limit, searchValues: values });
   };
 
   return (
-    <Form
-      className="bg-gray-50 rounded p-3 shadow-md"
-      form={form}
-      onFinish={onFinish}
-      initialValues={{ offset, limit }}
+    <Measure
+      bounds
+      onResize={(contentRect) => {
+        setSearchFilterHeight?.(contentRect.bounds?.height!);
+      }}
     >
-      {rows}
-      {advancedFilter && <SearchParams onLimitChange={onLimitChange}/>}
-      <SearchBottomBar
-        advancedFilter={advancedFilter}
-        onAdvancedFilterToggle={() => {
-          setAdvancedFilter(!advancedFilter);
-        }}
-        onClear={() => {
-          form.resetFields();
-          onClear();
-        }}
-        isSearching={isSearching}
-      />
-    </Form>
+      {({ measureRef }) => (
+        <div ref={measureRef}>
+          <div style={{ display: searchVisible ? "block" : "none" }}>
+            <Form
+              className="p-3 rounded shadow-md bg-gray-50"
+              form={form}
+              onFinish={onFinish}
+              initialValues={{ offset, limit }}
+            >
+              {rows}
+              {advancedFilter && <SearchParams onLimitChange={onLimitChange} />}
+              <SearchBottomBar
+                advancedFilter={advancedFilter}
+                onAdvancedFilterToggle={() => {
+                  setAdvancedFilter(!advancedFilter);
+                }}
+                onClear={() => {
+                  form.resetFields();
+                  onClear();
+                }}
+                isSearching={isSearching}
+              />
+            </Form>
+            {searchError && (
+              <Alert
+                className="mt-10"
+                message={searchError}
+                type="error"
+                banner
+              />
+            )}
+            <div className="pb-5" />
+          </div>
+        </div>
+      )}
+    </Measure>
   );
 }
 

package/dist/helpers/searchFilterHelper.d.ts

@@ -1,5 +0,0 @@
-declare const getParamsForFields: (values: any, fields: any) => any[];
-declare const groupDateTimeValuesIfNeeded: (values: any) => any;
-declare const removeUndefinedFields: (values: any) => any;
-export { removeUndefinedFields, groupDateTimeValuesIfNeeded, getParamsForFields, };
-//# sourceMappingURL=searchFilterHelper.d.ts.map

package/dist/helpers/searchFilterHelper.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"searchFilterHelper.d.ts","sourceRoot":"","sources":["searchFilterHelper.ts"],"names":[],"mappings":"AAOA,QAAA,MAAM,kBAAkB,WAAY,GAAG,UAAU,GAAG,UAoBnD,CAAC;AA+DF,QAAA,MAAM,2BAA2B,WAAY,GAAG,QAqC/C,CAAC;AAuBF,QAAA,MAAM,qBAAqB,WAAY,GAAG,QAUzC,CAAC;AAEF,OAAO,EACL,qBAAqB,EACrB,2BAA2B,EAC3B,kBAAkB,GACnB,CAAC"}

package/dist/widgets/views/Dashboard/Dashboard.types.d.ts

@@ -1,8 +0,0 @@
-import { ShortcutApi } from '../../../ui/FavouriteButton';
-export declare type DashboardProps = {
-    model: string;
-    id: number;
-    context?: any;
-    configAction?: ShortcutApi;
-};
-//# sourceMappingURL=Dashboard.types.d.ts.map

package/dist/widgets/views/Dashboard/Dashboard.types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Dashboard.types.d.ts","sourceRoot":"","sources":["Dashboard.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,oBAAY,cAAc,GAAG;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,YAAY,CAAC,EAAE,WAAW,CAAC;CAC5B,CAAC"}

package/src/widgets/views/Dashboard/Dashboard.types.ts

@@ -1,8 +0,0 @@
-import { ShortcutApi } from "@/ui/FavouriteButton";
-
-export type DashboardProps = {
-  model: string;
-  id: number;
-  context?: any;
-  configAction?: ShortcutApi;
-};