rez-table-listing-mui 1.3.29 → 1.3.31

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

@@ -4,14 +4,37 @@ import FormTextfield from "../components/Textfield";
 import FormDatePicker from "../components/Date";
 import FormMultiSelect from "../components/Multi-Select";
 
-// Operators that SHOULD use TextField when applied on date fields
-export const NON_DATE_OPERATORS = [
+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[] = [
+  "equal",
+  "before",
+  "after",
+  "between",
+  "is",
+  "today",
   "is_day_before",
   "is_day_after",
   "is_month_before",
   "is_month_after",
-  "is_before_bussiness_days",
-  "is_after_bussiness_days",
+  "is_before",
+  "is_after",
+  "is_on_or_before",
+  "is_on_or_after",
 ];
 
 export const resolveFilterInput = ({
@@ -27,10 +50,20 @@ export const resolveFilterInput = ({
   dropdownData: any;
   updateFiltersFromForm: () => void;
 }) => {
-  const dataType = filter?.filter_attribute_data_type;
+  const isDateType = filter.filter_attribute_data_type === "date";
+
+  const showDatePicker =
+    isDateType && operator && DATE_ALLOWED_OPERATORS.includes(operator as any);
 
-  // TEXT / NUMBER → always textfield
-  if (dataType === "text" || dataType === "number") {
+  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"
+  ) {
     return (
       <FormTextfield
         filter={filter}
@@ -40,8 +73,8 @@ export const resolveFilterInput = ({
     );
   }
 
-  // YEAR → DatePicker (Year mode)
-  if (dataType === "year") {
+  // YEAR
+  if (filter?.filter_attribute_data_type === "year") {
     return (
       <FormDatePicker
         filter={filter}
@@ -52,22 +85,8 @@ export const resolveFilterInput = ({
     );
   }
 
-  // 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}
-        />
-      );
-    }
-
-    // Default for all other operators → Date Picker
+  // DATE LOGIC
+  if (showDatePicker) {
     return (
       <FormDatePicker
         filter={filter}
@@ -77,7 +96,17 @@ export const resolveFilterInput = ({
     );
   }
 
-  // SELECT / MULTISELECT / RADIO / CHECKBOX
+  if (showTextInsteadOfDate) {
+    return (
+      <FormTextfield
+        filter={filter}
+        control={control}
+        onValueChange={updateFiltersFromForm}
+      />
+    );
+  }
+
+  // MULTISELECT / SELECT / RADIO / CHECKBOX
   if (
     filter?.filter_attribute_data_type !== undefined &&
     ["select", "multiselect", "radio", "checkbox"].includes(

package/src/listing/components/filter/components/main-filter.tsx

@@ -11,7 +11,7 @@ const MainFilter = ({
   columnsData,
   dropdownData,
   tableStates,
-  setSavedFilterModalOpen,
+  onSaveFilterButtonClick,
   onChangeFunction,
   filterComponentOptions,
 }: FilterFormComponentProps) => {
@@ -22,10 +22,10 @@ const MainFilter = ({
   useEffect(() => {
     setFilterMaster(
       (prev) =>
-        ({
-          ...prev,
-          activeFilterTabIndex: 0,
-        } as FilterMasterStateProps)
+      ({
+        ...prev,
+        activeFilterTabIndex: 0,
+      } as FilterMasterStateProps)
     );
   }, []);
 
@@ -61,7 +61,7 @@ const MainFilter = ({
         setSearchTerm={setSearchTerm}
         handleRemoveFilter={handleRemoveFilter}
         tableStates={tableStates}
-        setSavedFilterModalOpen={setSavedFilterModalOpen}
+        onSaveFilterButtonClick={onSaveFilterButtonClick}
         dropdownData={dropdownData}
         onChangeFunction={onChangeFunction}
         filterComponentOptions={filterComponentOptions}

package/src/listing/components/filter/components/saved-edit-filter.tsx

@@ -18,7 +18,7 @@ const SavedFilterEditComponent = ({
   setEditMode,
   searchTerm,
   setSearchTerm,
-  setSavedFilterModalOpen,
+  onSaveFilterButtonClick,
   setDeleteFilterModalOpen,
   onChangeFunction,
   filterComponentOptions,
@@ -30,7 +30,7 @@ const SavedFilterEditComponent = ({
   setEditMode?: React.Dispatch<React.SetStateAction<boolean>>;
   searchTerm?: string;
   setSearchTerm: React.Dispatch<React.SetStateAction<string>>;
-  setSavedFilterModalOpen?: React.Dispatch<React.SetStateAction<boolean>>;
+  onSaveFilterButtonClick?: () => void;
   setDeleteFilterModalOpen?: React.Dispatch<React.SetStateAction<boolean>>;
   onChangeFunction: ({
     updatedFilters,
@@ -62,6 +62,8 @@ const SavedFilterEditComponent = ({
             selectedId: "",
             selectedName: "",
             selectedCode: "",
+            shareWithTeam: false,
+            allowTeamEdit: false,
           },
           activeFilterTabIndex: -1,
         } as FilterMasterStateProps)
@@ -99,7 +101,7 @@ const SavedFilterEditComponent = ({
         dropdownData={dropdownData}
         searchTerm={searchTerm}
         setSearchTerm={setSearchTerm}
-        setSavedFilterModalOpen={setSavedFilterModalOpen}
+        onSaveFilterButtonClick={onSaveFilterButtonClick}
         setDeleteFilterModalOpen={setDeleteFilterModalOpen}
         onChangeFunction={onChangeFunction}
         filterComponentOptions={filterComponentOptions}

package/src/listing/components/filter/components/saved-filter.tsx

@@ -5,7 +5,11 @@ import {
   FilterOperationListProps,
 } from "../../../types/filter";
 import {
+  Accordion,
+  AccordionDetails,
+  AccordionSummary,
   Box,
+  Divider,
   IconButton,
   List,
   ListItem,
@@ -15,8 +19,9 @@ import {
 import CustomSearch from "./search";
 import { DeleteIcon, EditIcon } from "../../../../assets/svg";
 import SavedFilterEditComponent from "./saved-edit-filter";
-import { filterStyles } from "../style";
+// import { filterStyles } from "../style";
 import { CheckBox } from "../../../../assets/svg";
+import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
 
 const SavedFilter = ({
   columnsData,
@@ -25,31 +30,60 @@ const SavedFilter = ({
   editMode,
   setEditMode,
   setDeleteFilterModalOpen,
-  setSavedFilterModalOpen,
+  onSaveFilterButtonClick,
   tabValue,
   onChangeFunction,
   filterComponentOptions,
 }: FilterFormComponentProps) => {
   const { filters, filterMaster, setFilterMaster, setFilterToDelete } =
     tableStates;
+
   const [searchTerm, setSearchTerm] = useState<string>("");
 
-  // reset savedFilterEditValue when component unmounts
+  const normalizeFilter = (f: any): FilterOperationListProps => {
+    const prefs =
+      f.sharedPreferences || f.preferences || f.meta || f.shared_meta || {};
+
+    return {
+      label: f.name || f.label || "Unnamed Filter",
+      value: f.id || f.value,
+      code: f.code ?? "",
+      is_shared: f.is_shared ?? prefs.is_shared ?? false,
+
+      // 🔥 STRING ko BOOLEAN banaya
+      is_editable:
+        f.is_editable === true ||
+        f.is_editable === "true" ||
+        prefs.is_editable === true ||
+        prefs.is_editable === "true",
+    };
+  };
+
+  const mappedSavedFilter: FilterOperationListProps[] =
+    columnsData?.saved_filter?.map(normalizeFilter) ?? [];
+
+  const mappedSharedFilter: FilterOperationListProps[] =
+    columnsData?.shared_filter?.map(normalizeFilter) ?? [];
+
+  // Reset on unmount
   useEffect(() => {
     return () => {
-      const editModeFromTabOptions =
+      const editModeFromTab =
         filterComponentOptions?.tabOptions?.savedFilter?.editMode;
-      if (!editModeFromTabOptions) {
+
+      if (!editModeFromTab) {
         setEditMode && setEditMode(false);
         setFilterMaster(
           (prev) =>
             ({
               ...prev,
               saved_filters: {
-                ...prev?.attributes,
+                ...(prev?.saved_filters ?? {}),
                 selectedId: "",
                 selectedName: "",
                 selectedCode: "",
+                shareWithTeam: undefined,
+                allowTeamEdit: undefined,
               },
             } as FilterMasterStateProps)
         );
@@ -57,14 +91,16 @@ const SavedFilter = ({
     };
   }, []);
 
-  const handleListItemClick = (filter: FilterOperationListProps) => {
-    const newFilterMasterState = {
+  const applyFilterStates = (filter: FilterOperationListProps) => {
+    const newFilterMaster = {
       ...filterMaster,
       saved_filters: {
-        ...filterMaster?.attributes,
-        selectedId: filter?.value,
-        selectedName: filter?.label,
-        selectedCode: filter?.code,
+        ...(filterMaster?.saved_filters ?? {}),
+        selectedId: filter.value,
+        selectedName: filter.label,
+        selectedCode: filter.code,
+        shareWithTeam: filter.is_shared,
+        allowTeamEdit: filter.is_editable,
       },
       attributes: {
         ...filterMaster?.attributes,
@@ -73,125 +109,109 @@ const SavedFilter = ({
       activeFilterTabIndex: tabValue,
     } as FilterMasterStateProps;
 
-    setFilterMaster(newFilterMasterState);
-
-    const newState = {
-      filterMaster: newFilterMasterState,
-      filters: filters,
-    };
+    setFilterMaster(newFilterMaster);
 
-    onChangeFunction && onChangeFunction(newState);
+    onChangeFunction &&
+      onChangeFunction({
+        filterMaster: newFilterMaster,
+        filters,
+      });
+  };
 
-    // setEditfilter state on edit icon click
+  const handleListItemClick = (filter: FilterOperationListProps) => {
+    applyFilterStates(filter);
     setEditMode && setEditMode(true);
     setFilterToDelete(filter);
   };
 
-  const handleAppyFilter = (filter: FilterOperationListProps) => {
-    const newFilterMasterState = {
-      ...filterMaster,
-      saved_filters: {
-        ...filterMaster?.attributes,
-        selectedId: filter?.value,
-        selectedName: filter?.label,
-        selectedCode: filter?.code,
-      },
-      attributes: {
-        ...filterMaster?.attributes,
-        radio: [],
-      },
-      activeFilterTabIndex: tabValue,
-    } as FilterMasterStateProps;
-
-    setFilterMaster(newFilterMasterState);
+  const handleApplyFilter = (filter: FilterOperationListProps) => {
+    applyFilterStates(filter);
+  };
 
-    const newState = {
-      filterMaster: newFilterMasterState,
-      filters: filters,
-    };
+  /**
+   * renderList
+   * @param source - list to render
+   * @param isSharedList - true when rendering Shared Filters (default false)
+   *
+   * Behavior:
+   * - If isSharedList === true -> show Edit icon ONLY when filter.is_editable === true
+   * - If isSharedList === false -> show Edit icon always (or as per filter.is_editable if you prefer)
+   */
+  const renderList = (
+    source: FilterOperationListProps[],
+    isSharedList: boolean = false,
+    { emptyMessage = "No saved filters yet." } = {}
+  ) =>
+    source.length === 0 ? (
+      <Typography>{emptyMessage}</Typography>
+    ) : (
+      <List
+        sx={{
+          display: "flex",
+          flexDirection: "column",
+          gap: 1,
+        }}
+      >
+        {source
+          .filter((f) =>
+            f.label?.toLowerCase().includes(searchTerm.toLowerCase())
+          )
+          .map((filter) => (
+            <ListItem
+              key={filter.value}
+              sx={{
+                cursor: "pointer",
+                // border:
+                //   filter.value ===
+                //   tableStates?.filterMaster?.saved_filters?.selectedId
+                //     ? `3px solid #7a5af8`
+                //     : "1px solid #C5C5C5",
+                borderRadius: "8px",
+                bgcolor: "#f2f6f8ff",
+                display: "flex",
+                justifyContent: "space-between",
+                gap: 1,
+                alignItems: "center",
+                "&:hover .action-icons": {
+                  opacity: 1,
+                  visibility: "visible",
+                },
+              }}
+              onClick={() => handleApplyFilter(filter)}
+            >
+              {filter.value ===
+                tableStates?.filterMaster?.saved_filters?.selectedId && (
+                <Box sx={{ display: "flex", alignItems: "center" }}>
+                  <CheckBox />
+                </Box>
+              )}
 
-    onChangeFunction && onChangeFunction(newState);
-  };
+              <ListItemText primary={filter.label} />
 
-  const renderList = () => (
-    <>
-      <CustomSearch
-        value={searchTerm}
-        onChange={setSearchTerm}
-        className="search-input"
-      />
-
-      {columnsData?.saved_filter?.length === 0 ? (
-        <Typography sx={{ mt: 2 }}>No saved filters yet.</Typography>
-      ) : (
-        <List
-          sx={{
-            display: "flex",
-            flexDirection: "column",
-            gap: 1,
-            mt: 2,
-          }}
-        >
-          {columnsData?.saved_filter
-            ?.filter((filter) =>
-              filter.label?.toLowerCase().includes(searchTerm.toLowerCase())
-            )
-            ?.map((filter) => (
-              <ListItem
-                key={filter?.value}
+              <Box
+                onClick={(e) => e.stopPropagation()}
+                className="action-icons"
                 sx={{
-                  cursor: "pointer",
-                  border:
-                    filter?.value ===
-                    tableStates?.filterMaster?.saved_filters?.selectedId
-                      ? `3px solid #7a5af8`
-                      : "1px solid #C5C5C5",
-                  borderRadius: "8px",
                   display: "flex",
-                  justifyContent: "space-between",
                   gap: 1,
-                  alignItems: "center",
-                  "&:hover .action-icons": {
-                    opacity: 1,
-                    visibility: "visible",
-                  },
+                  opacity: 0,
+                  visibility: "hidden",
+                  transition: "all 0.2s ease",
                 }}
-                onClick={() => handleAppyFilter(filter)}
               >
-                {filter?.value ===
-                  tableStates?.filterMaster?.saved_filters?.selectedId && (
-                  <Box
-                    sx={{
-                      display: "flex",
-                      alignItems: "center",
-                      cursor: "pointer",
-                      color: "green",
-                      rounded: "full",
-                    }}
-                  >
-                    <CheckBox />
-                  </Box>
-                )}
-                <ListItemText primary={filter?.label} />
-
-                <Box
-                  onClick={(e) => e.stopPropagation()}
-                  className="action-icons"
-                  sx={{
-                    display: "flex",
-                    gap: 1,
-                    opacity: 0,
-                    visibility: "hidden",
-                    transition: "opacity 0.2s ease, visibility 0.2s ease",
-                  }}
-                >
+                {/** Show edit icon:
+                 * - For shared lists: only if filter.is_editable === true
+                 * - For non-shared lists: show (keeps previous behavior)
+                 */}
+                {(!isSharedList || filter.is_editable === true) && (
                   <IconButton
                     size="large"
                     onClick={() => handleListItemClick(filter)}
                   >
                     <EditIcon />
                   </IconButton>
-
+                )}
+                {(!isSharedList || filter.is_editable === true) && (
                   <IconButton
                     size="small"
                     onClick={() => {
@@ -201,24 +221,82 @@ const SavedFilter = ({
                   >
                     <DeleteIcon />
                   </IconButton>
-                </Box>
-              </ListItem>
-            ))}
-        </List>
-      )}
-    </>
-  );
-
-  const mainBoxStyles = {
-    ...filterStyles.filterMainComponentWrapper,
-    ...filterStyles.scrollbarCustom,
-  };
+                )}
+              </Box>
+            </ListItem>
+          ))}
+      </List>
+    );
 
   return (
-    <Box sx={mainBoxStyles} className="saved-filter-component-wrapper">
-      {/* Render search input and list */}
-      {!editMode && renderList()}
+    <Box
+      // sx={{
+      //   ...filterStyles.filterMainComponentWrapper,
+      //   ...filterStyles.scrollbarCustom,
+      // }}
+      className="saved-filter-component-wrapper"
+    >
+      {!editMode && (
+        <>
+          {/* Search Box */}
+          <Box sx={{ mb: 2 }}>
+            <CustomSearch
+              value={searchTerm}
+              onChange={setSearchTerm}
+              className="search-input"
+            />
+          </Box>
+
+          {/* ---- My Filters Section ---- */}
+          <Box
+            sx={{
+              background: "#fff",
+              borderRadius: "12px",
+              border: "1px solid #eee",
+              mb: 2,
+              overflow: "hidden",
+            }}
+          >
+            <Accordion defaultExpanded disableGutters elevation={0}>
+              <AccordionSummary
+                expandIcon={<ExpandMoreIcon fontSize="small" />}
+              >
+                <Typography fontWeight={600}>My Filters</Typography>
+              </AccordionSummary>
+              <Divider sx={{ width: "100%" }} />
+              <AccordionDetails sx={{ p: "9px" }}>
+                {renderList(mappedSavedFilter, false)}
+              </AccordionDetails>
+            </Accordion>
+          </Box>
+
+          {/* ---- Shared Filters Section ---- */}
+          <Box
+            sx={{
+              background: "#fff",
+              borderRadius: "12px",
+              border: "1px solid #eee",
+              mb: 2,
+              overflow: "hidden",
+            }}
+          >
+            <Accordion disableGutters elevation={0}>
+              <AccordionSummary
+                expandIcon={<ExpandMoreIcon fontSize="small" />}
+              >
+                <Typography fontWeight={600}>Shared Filters</Typography>
+              </AccordionSummary>
+              <Divider sx={{ width: "100%" }} />
+
+              <AccordionDetails sx={{ p: "9px" }}>
+                {renderList(mappedSharedFilter, true)}
+              </AccordionDetails>
+            </Accordion>
+          </Box>
+        </>
+      )}
 
+      {/* Edit Component */}
       {editMode && (
         <SavedFilterEditComponent
           columnsData={columnsData}
@@ -228,7 +306,7 @@ const SavedFilter = ({
           setEditMode={setEditMode}
           searchTerm={searchTerm}
           setSearchTerm={setSearchTerm}
-          setSavedFilterModalOpen={setSavedFilterModalOpen}
+          onSaveFilterButtonClick={onSaveFilterButtonClick}
           setDeleteFilterModalOpen={setDeleteFilterModalOpen}
           onChangeFunction={onChangeFunction}
           filterComponentOptions={filterComponentOptions}

package/src/listing/components/filter/components/single-filter-rendering.tsx

@@ -13,7 +13,7 @@ const SingleFilterRendering = ({
   columnsData,
   dropdownData,
   tableStates,
-  setSavedFilterModalOpen,
+  onSaveFilterButtonClick,
   onChangeFunction,
   filterComponentOptions,
   editMode,
@@ -50,7 +50,7 @@ const SingleFilterRendering = ({
       {showFilter === "main" && (
         <MainFilter
           {...commonProps}
-          setSavedFilterModalOpen={setSavedFilterModalOpen}
+          onSaveFilterButtonClick={onSaveFilterButtonClick}
           filterComponentOptions={filterComponentOptions}
         />
       )}
@@ -59,7 +59,7 @@ const SingleFilterRendering = ({
         <SavedFilter
           {...commonProps}
           {...editProps}
-          setSavedFilterModalOpen={setSavedFilterModalOpen}
+          onSaveFilterButtonClick={onSaveFilterButtonClick}
           filterComponentOptions={filterComponentOptions}
         />
       )}