@m4l/components 0.0.37 → 0.0.40

package/dist/components/DataGrid/index.js

@@ -11,7 +11,6 @@ import { P as Pager, g as getPagerComponentsDictionary, d as defaultPagerDiction
 import { I as IconButton } from "../mui_extended/IconButton/index.js";
 import { u as useModal } from "../../hooks/useModal/index.js";
 import { useResponsiveDesktop } from "@m4l/graphics";
-import "date-fns";
 import { g as getModalDialogComponentsDictionary, d as defaultModalDialogDictionary } from "../ModalDialog/index.js";
 const WrapperGrid$1 = styled("div")(() => ({
   display: "flex",

package/dist/components/DynamicFilter/components/fieldstypes/validations.d.ts

@@ -1,5 +1,6 @@
 import { InitialFilterFieldApply } from '../../types';
 export declare function isValidDate(d: any): any;
 export declare const verifyStringFilter: (filter: InitialFilterFieldApply) => boolean;
+export declare const verifyNumberFilter: (filter: InitialFilterFieldApply) => boolean;
 export declare const verifyBooleanFilter: (filter: InitialFilterFieldApply) => boolean;
 export declare const verifyDateTime: (filter: InitialFilterFieldApply) => boolean;

package/dist/components/DynamicFilter/index.js

@@ -1,6 +1,6 @@
 import { S as ScrollBar } from "../ScrollBar/index.js";
 import { styled, alpha } from "@mui/material/styles";
-import { useRef, useState, useMemo, useCallback, useEffect, createContext, useContext } from "react";
+import require$$0, { useRef, useState, useMemo, useCallback, useEffect, createContext, useContext } from "react";
 import { useModuleDictionary, useEnvironment, voidFunction, useHostTools, useFlagsPresent } from "@m4l/core";
 import * as Yup from "yup";
 import { useFormContext, useWatch } from "react-hook-form";
@@ -61,7 +61,7 @@ const ALL_FIELDS = {
   urlIcon: "https://s3.amazonaws.com/static.made4labs/environments/d1/frontend/components/icon/assets/icons/default.svg",
   type: "string",
   multiple: true,
-  fixed: false
+  presence: "optional"
 };
 const WrapperStringFilter$1 = styled("div")(({
   theme
@@ -82,20 +82,20 @@ const getDefaultStringFilter = (field, fixed, getLabel) => {
   const dfop1 = field.defaultOperand1;
   const defaultFilter = {
     id: 0,
-    fieldName: field.name,
+    n: field.name,
     fixed,
     isSetted: false,
-    operator: "c",
+    o: "c",
     labelOperator: "",
-    operand1: "",
-    operand2: "",
+    o1: "",
+    o2: "",
     labelOperands: ""
   };
   if (dfop1 !== void 0 && typeof dfop1 === "string") {
-    defaultFilter.operand1 = dfop1;
+    defaultFilter.o1 = dfop1;
   }
-  defaultFilter.labelOperands = defaultFilter.operand1 + "";
-  defaultFilter.labelOperator = getLabel(`dynamic_filter.operator_${defaultFilter.operator}`);
+  defaultFilter.labelOperands = defaultFilter.o1 + "";
+  defaultFilter.labelOperator = getLabel(`dynamic_filter.operator_${defaultFilter.o}`);
   return defaultFilter;
 };
 function StringFilter() {
@@ -125,12 +125,12 @@ function StringFilter() {
       return void 0;
     const newFilter = {
       id: filter.id,
-      fieldName: field.name,
+      n: field.name,
       fixed: filter.fixed,
       isSetted: true,
-      operator: data.valueOperator.id,
+      o: data.valueOperator.id,
       labelOperator: data.valueOperator.label,
-      operand1: data.valueOperand1,
+      o1: data.valueOperand1,
       labelOperands: data.valueOperand1
     };
     return newFilter;
@@ -144,7 +144,7 @@ function StringFilter() {
     }
     setTransformFunctionFormValuesToValues(transformFunctionFormValuesToValues);
     if (filter && field) {
-      setValue("valueOperand1", filter.operand1, {
+      setValue("valueOperand1", filter.o1, {
         shouldTouch: false,
         shouldValidate: false
       });
@@ -194,20 +194,20 @@ const getDefaultBooleanFilter = (field, fixed, getLabel) => {
   const dfop1 = field.defaultOperand1;
   const defaultFilter = {
     id: 0,
-    fieldName: field.name,
+    n: field.name,
     fixed,
     isSetted: true,
-    operator: "e",
+    o: "e",
     labelOperator: "",
-    operand1: true,
-    operand2: "",
+    o1: true,
+    o2: "",
     labelOperands: ""
   };
-  defaultFilter.labelOperator = getLabel(`dynamic_filter.operator_${defaultFilter.operator}`);
+  defaultFilter.labelOperator = getLabel(`dynamic_filter.operator_${defaultFilter.o}`);
   if (dfop1 !== void 0 && typeof dfop1 === "boolean") {
-    defaultFilter.operand1 = dfop1;
+    defaultFilter.o1 = dfop1;
   }
-  defaultFilter.labelOperands = getLabel(`dynamic_filter.operand_${defaultFilter.operand1}`);
+  defaultFilter.labelOperands = getLabel(`dynamic_filter.operand_${defaultFilter.o1}`);
   return defaultFilter;
 };
 function BooleanFilter() {
@@ -245,12 +245,12 @@ function BooleanFilter() {
       return void 0;
     const newFilter = {
       id: filter.id,
-      fieldName: field.name,
+      n: field.name,
       fixed: filter.fixed,
       isSetted: true,
-      operator: data.valueOperator.id,
+      o: data.valueOperator.id,
       labelOperator: data.valueOperator.label,
-      operand1: data.valueOperand1.value,
+      o1: data.valueOperand1.value,
       labelOperands: data.valueOperand1.label
     };
     return newFilter;
@@ -258,15 +258,15 @@ function BooleanFilter() {
   useEffect(() => {
     if (!isLoaded) {
       setPoupEditValidationSchema({
-        valueOperator: Yup.object().nullable().required(getLabel(`operator_required`)),
-        valueOperand1: Yup.object().nullable().required(getLabel(`operand_required`))
+        valueOperator: Yup.object().nullable().required(getLabel(`error_operator_required`)),
+        valueOperand1: Yup.object().nullable().required(getLabel(`error_operand_required`))
       });
     }
     setTransformFunctionFormValuesToValues(transformFunctionFormValuesToValues);
     if (filter && field) {
       setValue("valueOperand1", {
-        value: filter.operand1,
-        label: getLabel(`dynamic_filter.operand_${filter.operand1}`)
+        value: filter.o1,
+        label: getLabel(`dynamic_filter.operand_${filter.o1}`)
       }, {
         shouldTouch: false,
         shouldValidate: false
@@ -318,40 +318,55 @@ function isValidDate(d) {
   return d && d instanceof Date;
 }
 const verifyStringFilter = (filter) => {
-  if (typeof filter.operator !== "string") {
+  if (typeof filter.o !== "string") {
+    return false;
+  }
+  if (STRING_OPERATORS.findIndex((f) => f === filter.o) === -1) {
+    return false;
+  }
+  if (typeof filter.o1 !== "string") {
+    return false;
+  }
+  return true;
+};
+const verifyNumberFilter = (filter) => {
+  if (typeof filter.o !== "number") {
+    return false;
+  }
+  if (NUMBER_OPERATORS.findIndex((f) => f === filter.o) === -1) {
     return false;
   }
-  if (STRING_OPERATORS.findIndex((f) => f === filter.operator) === -1) {
+  if (typeof filter.o1 !== "number") {
     return false;
   }
-  if (typeof filter.operand1 !== "string") {
+  if (filter.o === "b" && typeof filter.o2 !== "number") {
     return false;
   }
   return true;
 };
 const verifyBooleanFilter = (filter) => {
-  if (typeof filter.operator !== "string") {
+  if (typeof filter.o !== "string") {
     return false;
   }
-  if (BOOLEAN_OPERATORS.findIndex((f) => f === filter.operator) === -1) {
+  if (BOOLEAN_OPERATORS.findIndex((f) => f === filter.o) === -1) {
     return false;
   }
-  if (typeof filter.operand1 !== "boolean") {
+  if (typeof filter.o1 !== "boolean") {
     return false;
   }
   return true;
 };
 const verifyDateTime = (filter) => {
-  if (typeof filter.operator !== "string") {
+  if (typeof filter.o !== "string") {
     return false;
   }
-  if (DATE_TIME_OPERATORS.findIndex((f) => f === filter.operator) === -1) {
+  if (DATE_TIME_OPERATORS.findIndex((f) => f === filter.o) === -1) {
     return false;
   }
-  if (typeof filter.operand1 !== "string") {
+  if (typeof filter.o1 !== "string") {
     return false;
   }
-  if (filter.operator === "b" && typeof filter.operand2 !== "string") {
+  if (filter.o === "b" && typeof filter.o2 !== "string") {
     return false;
   }
   return true;
@@ -363,13 +378,13 @@ const getDefaultDateTimeFilter = (field, fixed, getLabel) => {
   let dfop2 = field.defaultOperand2;
   const defaultFilter = {
     id: 0,
-    fieldName: field.name,
+    n: field.name,
     fixed,
     isSetted: true,
-    operator: "b",
+    o: "b",
     labelOperator: "",
-    operand1: dfop1,
-    operand2: dfop2,
+    o1: dfop1,
+    o2: dfop2,
     labelOperands: ""
   };
   if (dfop1) {
@@ -392,10 +407,10 @@ const getDefaultDateTimeFilter = (field, fixed, getLabel) => {
   if (dfop2 === void 0) {
     defaultEndDate.setHours(23, 59, 59, 999);
   }
-  defaultFilter.operand1 = defaultStartDate.toISOString();
-  defaultFilter.operand2 = defaultEndDate.toISOString();
+  defaultFilter.o1 = defaultStartDate.toISOString();
+  defaultFilter.o2 = defaultEndDate.toISOString();
   defaultFilter.labelOperands = `${format(defaultStartDate, "yyyy-MM-dd HH:mm:ss")} - ${format(defaultEndDate, "yyyy-MM-dd HH:mm:ss")}`;
-  defaultFilter.labelOperator = getLabel(`dynamic_filter.operator_${defaultFilter.operator}`);
+  defaultFilter.labelOperator = getLabel(`dynamic_filter.operator_${defaultFilter.o}`);
   return defaultFilter;
 };
 function DateTimeFilter() {
@@ -436,45 +451,45 @@ function DateTimeFilter() {
       return void 0;
     const newFilter = {
       id: filter.id,
-      fieldName: field.name,
+      n: field.name,
       fixed: filter.fixed,
       isSetted: true,
-      operator: data.valueOperator.id,
-      operand1: data.valueOperand1.toISOString(),
+      o: data.valueOperator.id,
+      o1: data.valueOperand1.toISOString(),
       labelOperator: data.valueOperator.label,
       labelOperands: ""
     };
     if (data.valueOperator.id === "b") {
-      newFilter.operand2 = data.valueOperand2.toISOString();
+      newFilter.o2 = data.valueOperand2.toISOString();
       newFilter.labelOperands = `${format(data.valueOperand1, datetime_format)} - ${format(data.valueOperand2, datetime_format)}`;
     } else {
-      newFilter.operand2 = newFilter.operand2 ? newFilter.operand2 : newFilter.operand1;
+      newFilter.o2 = newFilter.o2 ? newFilter.o2 : newFilter.o1;
       newFilter.labelOperands = format(data.valueOperand1, datetime_format);
     }
     return newFilter;
   }, []);
   useEffect(() => {
-    console.debug("useEffect Datetime", isLoaded, filter?.operand1, filter?.operand2);
+    console.debug("useEffect Datetime", isLoaded, filter?.o1, filter?.o2);
     if (!isLoaded) {
       setPoupEditValidationSchema({
         valueOperator: Yup.object().nullable().required(getLabel(`operator_required`)),
-        valueOperand1: Yup.date().test("valueOperand1", getLabel(`dynamic_filter.error_invalid_date1`), (value) => {
+        valueOperand1: Yup.date().test("valueOperand1", getLabel(`dynamic_filter.error_invalid_date`), (value) => {
           return Boolean(value);
         }),
         valueOperand2: Yup.date().when(["valueOperator.id"], {
           is: "b",
-          then: Yup.date().test("DOB", getLabel(`dynamic_filter.error_invalid_date2`), (value) => {
+          then: Yup.date().test("DOB", getLabel(`dynamic_filter.error_invalid_date`), (value) => {
             return Boolean(value);
           })
         })
       });
     }
     if (filter && field) {
-      setValue("valueOperand1", new Date(filter.operand1), {
+      setValue("valueOperand1", new Date(filter.o1), {
         shouldTouch: false,
         shouldValidate: false
       });
-      setValue("valueOperand2", new Date(filter.operand2), {
+      setValue("valueOperand2", new Date(filter.o2), {
         shouldTouch: false,
         shouldValidate: false
       });
@@ -526,23 +541,23 @@ const getDefaultNumberFilter = (field, fixed, getLabel) => {
   const dfop2 = field.defaultOperand2;
   const defaultFilter = {
     id: 0,
-    fieldName: field.name,
+    n: field.name,
     fixed,
     isSetted: false,
-    operator: "e",
+    o: "e",
     labelOperator: "",
-    operand1: "",
-    operand2: "",
+    o1: "",
+    o2: "",
     labelOperands: ""
   };
   if (dfop1 !== void 0 && typeof dfop1 === "number") {
-    defaultFilter.operand1 = dfop1;
-    defaultFilter.labelOperands = defaultFilter.operand1;
+    defaultFilter.o1 = dfop1;
+    defaultFilter.labelOperands = defaultFilter.o1;
   }
   if (dfop2 !== void 0 && typeof dfop2 === "number") {
-    defaultFilter.operand2 = dfop2;
+    defaultFilter.o2 = dfop2;
   }
-  defaultFilter.labelOperator = getLabel(`dynamic_filter.operator_${defaultFilter.operator}`);
+  defaultFilter.labelOperator = getLabel(`dynamic_filter.operator_${defaultFilter.o}`);
   return defaultFilter;
 };
 function NumberFilter() {
@@ -577,34 +592,34 @@ function NumberFilter() {
       return void 0;
     const newFilter = {
       id: filter.id,
-      fieldName: field.name,
+      n: field.name,
       fixed: filter.fixed,
       isSetted: true,
-      operator: data.valueOperator.id,
-      operand1: Number(data.valueOperand1),
-      operand2: data.valueOperand2,
+      o: data.valueOperator.id,
+      o1: Number(data.valueOperand1),
+      o2: data.valueOperand2,
       labelOperator: data.valueOperator.label,
       labelOperands: data.valueOperand1
     };
     if (data.valueOperator.id === "b") {
       newFilter.labelOperands = `${data.valueOperand1} - ${data.valueOperand2}`;
-      newFilter.operand2 = Number(data.valueOperand2);
+      newFilter.o2 = Number(data.valueOperand2);
     } else {
-      newFilter.operand2 = void 0;
+      newFilter.o2 = void 0;
     }
     return newFilter;
   }, []);
   useEffect(() => {
     if (!isLoaded) {
       setPoupEditValidationSchema({
-        valueOperator: Yup.object().nullable().required(getLabel(`dynamic_filter.operator_required`)),
-        valueOperand1: Yup.number().typeError(getLabel(`dynamic_filter.operand_mustbe_number`)),
+        valueOperator: Yup.object().nullable().required(getLabel(`dynamic_filter.error_operator_required`)),
+        valueOperand1: Yup.number().typeError(getLabel(`dynamic_filter.error_operand_mustbe_number`)),
         valueOperand2: Yup.string().when("valueOperator", {
           is: (o) => {
             console.log("valueOperand2", o);
             return o.id === "b";
           },
-          then: Yup.string().test("DOB", getLabel(`dynamic_filter.operand_mustbe_number`), (value) => {
+          then: Yup.string().test("DOB", getLabel(`dynamic_filter.error_operand_mustbe_number`), (value) => {
             console.log("imprimir", value);
             if (value === "")
               return false;
@@ -615,11 +630,11 @@ function NumberFilter() {
     }
     setTransformFunctionFormValuesToValues(transformFunctionFormValuesToValues);
     if (filter && field) {
-      setValue("valueOperand1", filter.operand1, {
+      setValue("valueOperand1", filter.o1, {
         shouldTouch: false,
         shouldValidate: false
       });
-      setValue("valueOperand2", filter.operand2, {
+      setValue("valueOperand2", filter.o2, {
         shouldTouch: false,
         shouldValidate: false
       });
@@ -652,40 +667,35 @@ function NumberFilter() {
     })
   });
 }
-const getDefaultFilterValues = (field, fixed, getLabel) => {
-  switch (field.type) {
-    case "string":
-      return getDefaultStringFilter(field, fixed, getLabel);
-    case "number":
-      return getDefaultNumberFilter(field, fixed, getLabel);
-    case "boolean":
-      return getDefaultBooleanFilter(field, fixed, getLabel);
-    case "time":
-    case "date":
-    case "datetime":
-      return getDefaultDateTimeFilter(field, fixed, getLabel);
+const strategiesDefaultFilterValues = {
+  string: getDefaultStringFilter,
+  number: getDefaultNumberFilter,
+  boolean: getDefaultBooleanFilter,
+  datetime: getDefaultDateTimeFilter,
+  __default__: () => {
+    throw new Error("Type no defined");
   }
-  throw new Error("Type no defined");
+};
+const getDefaultFilterValues = (field, fixed, getLabel) => {
+  const transformer = strategiesDefaultFilterValues[field.type] ?? strategiesDefaultFilterValues.__default__;
+  return transformer(field, fixed, getLabel);
+};
+const strategiesEditFilterComponent = {
+  string: StringFilter,
+  number: NumberFilter,
+  boolean: BooleanFilter,
+  datetime: DateTimeFilter,
+  __default__: require$$0.Fragment
 };
 const PopupEditFilterComponent = (props) => {
   const {
     getFieldByName
   } = useBase();
-  const field = getFieldByName(props.filter.fieldName);
+  const field = getFieldByName(props.filter.n);
   if (!field)
     return /* @__PURE__ */ jsx(Fragment, {});
-  switch (field.type) {
-    case "string":
-      return /* @__PURE__ */ jsx(StringFilter, {});
-    case "number":
-      return /* @__PURE__ */ jsx(NumberFilter, {});
-    case "boolean":
-      return /* @__PURE__ */ jsx(BooleanFilter, {});
-    case "datetime":
-      return /* @__PURE__ */ jsx(DateTimeFilter, {});
-    default:
-      return /* @__PURE__ */ jsx(Fragment, {});
-  }
+  const Component = strategiesEditFilterComponent[field.type] ?? strategiesEditFilterComponent.__default__;
+  return /* @__PURE__ */ jsx(Component, {});
 };
 const initialState = {
   fields: [],
@@ -729,12 +739,21 @@ const getMaxId = (applyedFilters) => {
 const getFilterById = (id, applyedFilters) => {
   return applyedFilters.findIndex((f) => f.id === id);
 };
-const getRawFilter = (applyedFilter) => {
+const formatToInitialFilters = (applyedFilter) => {
   return applyedFilter.map((af) => ({
-    n: af.fieldName,
-    o: af.operator,
-    o1: af.operand1,
-    o2: af.operand2
+    n: af.n,
+    o: af.o,
+    labelOperands: af.labelOperands,
+    o1: af.o1,
+    o2: af.o2
+  }));
+};
+const formatToRawFilter = (applyedFilter) => {
+  return applyedFilter.map((af) => ({
+    n: af.n,
+    o: af.o,
+    o1: af.o1,
+    o2: af.o2
   }));
 };
 const getInitialFilters = (fields, filters, getFieldByName, getLabel) => {
@@ -746,15 +765,19 @@ const getInitialFilters = (fields, filters, getFieldByName, getLabel) => {
       ...filters[index],
       id: 0,
       isSetted: true,
-      fixed: false
+      fixed: false,
+      labelOperator: ""
     };
-    const field = getFieldByName(filter.fieldName);
+    const field = getFieldByName(filter.n);
     if (!field)
       continue;
     switch (field.type) {
       case "string":
         add = verifyStringFilter(filter);
         break;
+      case "number":
+        add = verifyNumberFilter(filter);
+        break;
       case "boolean":
         add = verifyBooleanFilter(filter);
         break;
@@ -765,7 +788,7 @@ const getInitialFilters = (fields, filters, getFieldByName, getLabel) => {
         add = false;
     }
     if (add) {
-      if (field.fixed) {
+      if (field.presence === "fixed") {
         if (fixedFields.findIndex((f) => f === field.name) === -1) {
           filter.fixed = true;
           fixedFields.push(field.name);
@@ -775,14 +798,15 @@ const getInitialFilters = (fields, filters, getFieldByName, getLabel) => {
       }
       filter.isSetted = true;
       filter.id = newFilters.length + 1;
+      filter.labelOperator = getLabel(`dynamic_filter.operator_${filter.o}`);
       newFilters.push(filter);
     }
   }
   for (let index = 0; index < fields.length; index++) {
     const field = fields[index];
-    if (field.fixed) {
-      if (!filters.find((f) => f.fieldName === field.name)) {
-        const newFilter = getDefaultFilterValues(field, true, getLabel);
+    if (field.presence === "initialized" || field.presence === "fixed") {
+      if (!filters.find((f) => f.n === field.name)) {
+        const newFilter = getDefaultFilterValues(field, field.presence === "fixed", getLabel);
         newFilter.id = newFilters.length + 1;
         newFilters.push(newFilter);
       }
@@ -844,7 +868,7 @@ function BaseProvider(props) {
       const field = fields[index];
       add = true;
       if (field.multiple !== void 0 && field.multiple === false) {
-        const fIndx = applyedFilters.findIndex((f) => f.fieldName === field.name);
+        const fIndx = applyedFilters.findIndex((f) => f.n === field.name);
         if (fIndx > -1) {
           add = false;
         }
@@ -859,7 +883,7 @@ function BaseProvider(props) {
     if (isValid) {
       if (!automatic)
         setIsDirty(false);
-      onChangeFilter(applyedFilters, getRawFilter(applyedFilters));
+      onChangeFilter(formatToInitialFilters(applyedFilters), formatToRawFilter(applyedFilters));
     } else {
       toast(getLabel("dynamic_filter.error_filters_no_setted"), {
         type: "error",
@@ -880,7 +904,7 @@ function BaseProvider(props) {
     }
     if (!NoValid) {
       setIsDirty(false);
-      onChangeFilter(applyedFilters, getRawFilter(applyedFilters));
+      onChangeFilter(formatToInitialFilters(applyedFilters), formatToRawFilter(applyedFilters));
     }
   }, [applyedFilters]);
   const addFilter = useCallback((newFilter) => {
@@ -889,7 +913,7 @@ function BaseProvider(props) {
       const newFilterFull = {
         ...newFilter,
         id: getMaxId(lastApplyedFilters) + 1,
-        labelOperator: getLabelOperator(newFilter.operator)
+        labelOperator: getLabelOperator(newFilter.o)
       };
       newArray.push(newFilterFull);
       return newArray;
@@ -902,7 +926,7 @@ function BaseProvider(props) {
       if (findedFilter > -1) {
         newArray.splice(findedFilter, 1, {
           ...newFilter,
-          labelOperator: getLabelOperator(newFilter.operator)
+          labelOperator: getLabelOperator(newFilter.o)
         });
       }
       return newArray;
@@ -952,7 +976,7 @@ function BaseProvider(props) {
     setPopupData({
       popupAnchorEl: anchorEl,
       filter: filterToEdit,
-      field: getFieldByName(filterToEdit.fieldName)
+      field: getFieldByName(filterToEdit.n)
     });
     setInEdition(true);
   }, []);
@@ -1060,7 +1084,7 @@ const ContainerOperands = styled("span")(({
 }));
 function ApplyedFilter(props) {
   const {
-    fieldName,
+    n: fieldName,
     id,
     isSetted,
     fixed,
@@ -1358,11 +1382,11 @@ function InputFilter() {
     }
     if (withAllField) {
       addFilter({
-        fieldName: ALL_FIELDS.name,
+        n: ALL_FIELDS.name,
         isSetted: true,
         fixed: false,
-        operator: "c",
-        operand1: valueFilter,
+        o: "c",
+        o1: valueFilter,
         labelOperands: valueFilter
       });
       setValueFilter("");
@@ -1471,8 +1495,8 @@ const PopupEditFilter = () => {
     const valuesFilter = {
       ...filter,
       valueOperator: {
-        id: filter.operator,
-        label: getLabelOperator(filter.operator)
+        id: filter.o,
+        label: getLabelOperator(filter.o)
       }
     };
     return valuesFilter;

package/dist/components/DynamicFilter/types.d.ts

@@ -1,5 +1,5 @@
 import { Maybe } from '@m4l/core';
-export declare type FieldType = 'number' | 'string' | 'boolean' | 'date' | 'datetime' | 'time' | 'select' | 'in';
+export declare type FieldType = 'number' | 'string' | 'boolean' | 'datetime';
 export declare type OperandType = number | string | boolean | Date | [] | object;
 export declare type Operator = 'b' | 'e' | 'ne' | 'gt' | 'gte' | 'lt' | 'lte' | 'c' | 'nc';
 export declare const OPERATORS: Array<Operator>;
@@ -11,12 +11,13 @@ export declare type BooleanOperator = 'e' | 'ne';
 export declare const BOOLEAN_OPERATORS: Array<BooleanOperator>;
 export declare type DateTimeOperator = 'b' | 'e' | 'ne' | 'gt' | 'gte' | 'lt' | 'lte';
 export declare const DATE_TIME_OPERATORS: Array<DateTimeOperator>;
+export declare type FieldPresence = 'initialized' | 'fixed' | 'optional';
 export interface Field {
     name: string;
     label: string;
     type: FieldType;
     multiple?: boolean;
-    fixed?: boolean;
+    presence?: FieldPresence;
     urlIcon: string;
     defaultOperand1?: Maybe<OperandType>;
     defaultOperand2?: Maybe<OperandType>;
@@ -27,16 +28,16 @@ export interface OptionOperator<T> {
 }
 export interface BaseApplyFilter {
     id: number;
-    fieldName: string;
+    n: string;
     isSetted: boolean;
     fixed: boolean;
 }
 export interface ValuesFilter {
-    operator: Operator;
+    o: Operator;
     labelOperator: string;
     labelOperands: string | number;
-    operand1?: Maybe<OperandType>;
-    operand2?: Maybe<OperandType>;
+    o1?: Maybe<OperandType>;
+    o2?: Maybe<OperandType>;
 }
 export interface FormValuesFilter<T> {
     valueOperator?: Maybe<OptionOperator<T>>;
@@ -49,9 +50,8 @@ export interface RawFilterFieldApply {
     o1: Maybe<OperandType>;
     o2: Maybe<OperandType>;
 }
-export interface FilterFieldApply extends BaseApplyFilter, ValuesFilter {
-}
-export declare type InitialFilterFieldApply = Omit<FilterFieldApply, 'id' | 'fixed' | 'isSetted'>;
+export declare type FilterFieldApply = BaseApplyFilter & ValuesFilter;
+export declare type InitialFilterFieldApply = Omit<FilterFieldApply, 'id' | 'fixed' | 'isSetted' | 'labelOperator'>;
 export declare type FilterToAddApply = Omit<FilterFieldApply, 'id' | 'labelOperator'>;
 export declare type FilterToEditApply = Omit<FilterFieldApply, 'labelOperator'>;
 export interface FilterFormFieldApply extends BaseApplyFilter, ValuesFilter, FormValuesFilter<Operator> {
@@ -63,5 +63,5 @@ export interface DynamicFilterProps {
     withAllField?: boolean;
     fields: Array<Field>;
     initialFilters?: Array<InitialFilterFieldApply>;
-    onChangeFilter: (newFilters: Array<FilterFieldApply>, rawFilters: Array<RawFilterFieldApply>) => void;
+    onChangeFilter: (initialFilters: Array<InitialFilterFieldApply>, rawFilters: Array<RawFilterFieldApply>) => void;
 }