@gisce/react-ooui 1.2.0-rc.8 → 1.2.0-rc.82

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

@@ -8,27 +8,13 @@ import { PairFields } from "./PairFields";
 
 import { LocaleContext, LocaleContextType } from "@/context/LocaleContext";
 
-import { Field, Selection as SelectionOoui } from "@gisce/ooui";
+import { Field, SearchFieldTypes, Selection as SelectionOoui } from "@gisce/ooui";
 import { MultiSelection } from "@/widgets/base/MultiSelection";
 
 type Props = {
   field: Field;
 };
 
-const types = {
-  text: "text",
-  many2one: "many2one",
-  char: "char",
-  boolean: "boolean",
-  selection: "selection",
-  float: "float",
-  float_time: "float_time",
-  progressbar: "progressbar",
-  integer: "integer",
-  date: "date",
-  datetime: "datetime",
-};
-
 export function SearchField(props: Props) {
   const { field } = props;
   field.readOnly = false;
@@ -39,7 +25,7 @@ export function SearchField(props: Props) {
   const widgetType = field.type;
 
   switch (widgetType) {
-    case types.boolean: {
+    case SearchFieldTypes.boolean: {
       const ooui = new SelectionOoui({
         name: field._id,
         string: field.label,
@@ -51,19 +37,19 @@ export function SearchField(props: Props) {
 
       return <Selection layout="vertical" ooui={ooui} showLabel />;
     }
-    case types.float:
-    case types.progressbar:
-    case types.float_time:
-    case types.integer: {
+    case SearchFieldTypes.float:
+    case SearchFieldTypes.progressbar:
+    case SearchFieldTypes.float_time:
+    case SearchFieldTypes.integer: {
       return <PairFields ooui={field} showLabel />;
     }
-    case types.date: {
+    case SearchFieldTypes.date: {
       return <DateRangePicker ooui={field} layout="vertical" showLabel />;
     }
-    case types.datetime: {
+    case SearchFieldTypes.datetime: {
       return <DateTimeRangePicker ooui={field} layout="vertical" showLabel />;
     }
-    case types.selection: {
+    case SearchFieldTypes.selection: {
       return <MultiSelection layout="vertical" ooui={field} showLabel />;
     }
     default: {

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

@@ -1,5 +1,5 @@
-import React, { useEffect, useState } from "react";
-import { Form, Row, Col, Alert } from "antd";
+import React, { useEffect, useRef, useState } from "react";
+import { Form, Row, Col, Alert, theme } from "antd";
 import useDeepCompareEffect from "use-deep-compare-effect";
 
 import {
@@ -15,6 +15,7 @@ import { SearchParams } from "./SearchParams";
 
 import { getParamsForFields } from "@/helpers/searchHelper";
 import Measure from "react-measure";
+const { useToken } = theme;
 
 type Props = {
   fields: any;
@@ -30,6 +31,7 @@ type Props = {
   searchError?: string;
   searchValues?: any;
   showLimitOptions?: boolean;
+  formXml: string;
 };
 
 function SearchFilter(props: Props) {
@@ -47,11 +49,14 @@ function SearchFilter(props: Props) {
     searchError,
     searchValues,
     showLimitOptions = true,
+    formXml,
   } = props;
 
   const [simpleSearchFields, setSimpleSearchFields] = useState<Container>();
   const [advancedSearchFields, setAdvancedSearchFields] = useState<Container>();
   const [advancedFilter, setAdvancedFilter] = useState(false);
+  const sfo = useRef<SearchFilterOoui>();
+  const { token } = useToken();
 
   const [form] = Form.useForm();
 
@@ -84,10 +89,10 @@ function SearchFilter(props: Props) {
 
   useDeepCompareEffect(() => {
     setAdvancedFilter(false);
-    const sfo = new SearchFilterOoui(searchFields, fields);
-    sfo.parse();
-    setSimpleSearchFields(sfo._simpleSearchContainer);
-    setAdvancedSearchFields(sfo._advancedSearchContainer);
+    sfo.current = new SearchFilterOoui(searchFields, fields, formXml);
+    sfo.current.parse();
+    setSimpleSearchFields(sfo.current._simpleSearchContainer);
+    setAdvancedSearchFields(sfo.current._advancedSearchContainer);
   }, [fields, searchFields]);
 
   const rows = getRowsAndCols();
@@ -96,7 +101,10 @@ function SearchFilter(props: Props) {
     const { limit, offset } = values;
     delete values.offset;
     delete values.limit;
-    const newParams = getParamsForFields(values, fields);
+    const newParams = getParamsForFields(
+      values,
+      sfo.current?._advancedSearchContainer
+    );
 
     onSubmit({ params: newParams, offset, limit, searchValues: values });
   };
@@ -112,7 +120,8 @@ function SearchFilter(props: Props) {
         <div ref={measureRef}>
           <div style={{ display: searchVisible ? "block" : "none" }}>
             <Form
-              className="p-3 rounded shadow-md bg-gray-50"
+              className="p-3 shadow-md"
+              style={{ borderRadius: token.borderRadius }}
               form={form}
               onFinish={onFinish}
               initialValues={{ offset, limit }}

package/dist/Config.d.ts

@@ -1,6 +0,0 @@
-declare const _default: {
-    requiredClass: string;
-    requiredColor: string;
-};
-export default _default;
-//# sourceMappingURL=Config.d.ts.map

package/dist/Config.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["Config.ts"],"names":[],"mappings":";;;;AAAA,wBAGE"}

package/dist/helpers/icons/antd_icons.d.ts

@@ -1,4 +0,0 @@
-export declare const AntIcons: {
-    [key: string]: any;
-};
-//# sourceMappingURL=antd_icons.d.ts.map

package/dist/helpers/icons/antd_icons.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"antd_icons.d.ts","sourceRoot":"","sources":["antd_icons.ts"],"names":[],"mappings":"AAwxBA,eAAO,MAAM,QAAQ,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAsxB1C,CAAC"}

package/dist/helpers/icons/tabler_icons.d.ts

@@ -1,4 +0,0 @@
-export declare const TablerIcons: {
-    [key: string]: any;
-};
-//# sourceMappingURL=tabler_icons.d.ts.map

package/dist/helpers/icons/tabler_icons.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"tabler_icons.d.ts","sourceRoot":"","sources":["tabler_icons.ts"],"names":[],"mappings":"AA4nFA,eAAO,MAAM,WAAW,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CA0nF7C,CAAC"}

package/dist/ui/Fieldset.d.ts

@@ -1,8 +0,0 @@
-import React from "react";
-declare type Props = {
-    label: string;
-    children: any;
-};
-declare const Fieldset: (props: Props) => React.ReactElement;
-export default Fieldset;
-//# sourceMappingURL=Fieldset.d.ts.map

package/dist/ui/Fieldset.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Fieldset.d.ts","sourceRoot":"","sources":["Fieldset.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,aAAK,KAAK,GAAG;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,GAAG,CAAC;CACf,CAAC;AAEF,QAAA,MAAM,QAAQ,UAAW,KAAK,KAAG,MAAM,YAqBtC,CAAC;AAEF,eAAe,QAAQ,CAAC"}

package/src/Config.ts

@@ -1,4 +0,0 @@
-export default {
-  requiredClass: "bg-blue-100",
-  requiredColor: "#DBEAFE",
-};