rez-table-listing-mui 1.3.32 → 1.3.34

package/src/listing/components/filter/components/forms/utils/filter-date-input-resolver.tsx

@@ -4,37 +4,20 @@ import FormTextfield from "../components/Textfield";
 import FormDatePicker from "../components/Date";
 import FormMultiSelect from "../components/Multi-Select";
 
-export type DateOperator =
-  | "equal"
-  | "before"
-  | "after"
-  | "between"
-  | "is"
-  | "today"
-  | "is_day_before"
-  | "is_day_after"
-  | "is_month_before"
-  | "is_month_after"
-  | "is_before"
-  | "is_after"
-  | "is_on_or_before"
-  | "is_on_or_after";
-
-export const DATE_ALLOWED_OPERATORS: DateOperator[] = [
+// Operators that should show a Date Picker
+const dateAllowedOperators = [
   "equal",
   "before",
   "after",
   "between",
   "is",
   "today",
-  "is_day_before",
-  "is_day_after",
-  "is_month_before",
-  "is_month_after",
   "is_before",
   "is_after",
   "is_on_or_before",
   "is_on_or_after",
+  "empty",
+  "not_empty",
 ];
 
 export const resolveFilterInput = ({
@@ -50,20 +33,10 @@ export const resolveFilterInput = ({
   dropdownData: any;
   updateFiltersFromForm: () => void;
 }) => {
-  const isDateType = filter.filter_attribute_data_type === "date";
-
-  const showDatePicker =
-    isDateType && operator && DATE_ALLOWED_OPERATORS.includes(operator as any);
+  const dataType = filter?.filter_attribute_data_type;
 
-  const showTextInsteadOfDate =
-    isDateType &&
-    (!operator || !DATE_ALLOWED_OPERATORS.includes(operator as any));
-
-  // TEXT / NUMBER -> Always TextField
-  if (
-    filter?.filter_attribute_data_type === "text" ||
-    filter?.filter_attribute_data_type === "number"
-  ) {
+  // TEXT / NUMBER → always textfield
+  if (dataType === "text" || dataType === "number") {
     return (
       <FormTextfield
         filter={filter}
@@ -73,8 +46,8 @@ export const resolveFilterInput = ({
     );
   }
 
-  // YEAR
-  if (filter?.filter_attribute_data_type === "year") {
+  // YEAR → DatePicker (Year mode)
+  if (dataType === "year") {
     return (
       <FormDatePicker
         filter={filter}
@@ -85,18 +58,21 @@ export const resolveFilterInput = ({
     );
   }
 
-  // DATE LOGIC
-  if (showDatePicker) {
-    return (
-      <FormDatePicker
-        filter={filter}
-        control={control}
-        onValueChange={updateFiltersFromForm}
-      />
-    );
-  }
+  // DATE FIELD
+  if (dataType === "date") {
+    const showDatePicker = operator && dateAllowedOperators.includes(operator);
+
+    if (showDatePicker) {
+      // Date Picker
+      return (
+        <FormDatePicker
+          filter={filter}
+          control={control}
+          onValueChange={updateFiltersFromForm}
+        />
+      );
+    }
 
-  if (showTextInsteadOfDate) {
     return (
       <FormTextfield
         filter={filter}
@@ -106,7 +82,7 @@ export const resolveFilterInput = ({
     );
   }
 
-  // MULTISELECT / SELECT / RADIO / CHECKBOX
+  // SELECT / MULTISELECT / RADIO / CHECKBOX
   if (
     filter?.filter_attribute_data_type !== undefined &&
     ["select", "multiselect", "radio", "checkbox"].includes(