rez-table-listing-mui 1.3.21 → 1.3.23

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

@@ -4,33 +4,14 @@ 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_before"
-  | "is_after"
-  | "is_on_or_before"
-  | "is_on_or_after"
-  | "empty"
-  | "not_empty";
-
-export const DATE_ALLOWED_OPERATORS: DateOperator[] = [
-  "equal",
-  "before",
-  "after",
-  "between",
-  "is",
-  "today",
-  "is_before",
-  "is_after",
-  "is_on_or_before",
-  "is_on_or_after",
-  "empty",
-  "not_empty",
+// Operators that SHOULD use TextField when applied on date fields
+export const NON_DATE_OPERATORS = [
+  "is_day_before",
+  "is_day_after",
+  "is_month_before",
+  "is_month_after",
+  "is_before_bussiness_days",
+  "is_after_bussiness_days",
 ];
 
 export const resolveFilterInput = ({
@@ -46,20 +27,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}
@@ -69,8 +40,8 @@ export const resolveFilterInput = ({
     );
   }
 
-  // YEAR
-  if (filter?.filter_attribute_data_type === "year") {
+  // YEAR → DatePicker (Year mode)
+  if (dataType === "year") {
     return (
       <FormDatePicker
         filter={filter}
@@ -81,20 +52,24 @@ export const resolveFilterInput = ({
     );
   }
 
-  // DATE LOGIC
-  if (showDatePicker) {
-    return (
-      <FormDatePicker
-        filter={filter}
-        control={control}
-        onValueChange={updateFiltersFromForm}
-      />
-    );
-  }
+  // DATE FIELD LOGIC
+  if (dataType === "date") {
+    const isNonDateOperator = operator && NON_DATE_OPERATORS.includes(operator);
+
+    if (isNonDateOperator) {
+      // Non-date operator → show TEXT FIELD
+      return (
+        <FormTextfield
+          filter={filter}
+          control={control}
+          onValueChange={updateFiltersFromForm}
+        />
+      );
+    }
 
-  if (showTextInsteadOfDate) {
+    // Default for all other operators → Date Picker
     return (
-      <FormTextfield
+      <FormDatePicker
         filter={filter}
         control={control}
         onValueChange={updateFiltersFromForm}
@@ -102,7 +77,7 @@ export const resolveFilterInput = ({
     );
   }
 
-  // MULTISELECT / SELECT / RADIO / CHECKBOX
+  // SELECT / MULTISELECT / RADIO / CHECKBOX
   if (
     filter?.filter_attribute_data_type !== undefined &&
     ["select", "multiselect", "radio", "checkbox"].includes(

package/src/listing/components/login/index.tsx

@@ -7,7 +7,8 @@ const LoginButton = () => {
 
   const handleLogin = async () => {
     setLoading(true);
-    const api_url = "https://api.eth-qa.rezolut.in/api/admin/auth";
+    // const api_url = "https://api.eth-qa.rezolut.in/api/admin/auth";
+    const api_url = "http://localhost:4011/api";
     const email_id = "kartik.shetty@rezolut.in";
     const email_otp = "123456";
     const sub_domain = "nair";
@@ -15,7 +16,7 @@ const LoginButton = () => {
     setLoading(true);
 
     await axios
-      .post(`${api_url}/sso/check-email`, {
+      .post(`${api_url}/admin/auth/sso/check-email`, {
         email_id: email_id,
         subdomain: sub_domain,
       })