rez-table-listing-mui 1.2.18 → 1.3.0

package/src/listing/libs/utils/apiColumn.ts

@@ -2,6 +2,7 @@ import { api, MAPPED_ENTITY_TYPE } from "./common";
 import {
   createSavedFilterPayload,
   deleteSavedFilterPayload,
+  FilterDataMainFilterEntityListProps,
   updateSavedFilterPayload,
 } from "../../types/filter";
 import { viewSettingsDropDownAPIProps } from "../../types/common";
@@ -126,7 +127,10 @@ export const updateSavedFilter = async (
 // ALL View Settings API
 export const saveSettingsData = async (payload: any) => {
   try {
-    const response = await api.post(`/entity/create?entity_type=${MAPPED_ENTITY_TYPE}`, payload);
+    const response = await api.post(
+      `/entity/create?entity_type=${MAPPED_ENTITY_TYPE}`,
+      payload
+    );
     return response.data;
   } catch (error) {
     console.error("Failed to save settings data:", error);
@@ -157,3 +161,25 @@ export const viewSettingsDropDown = async ({
 
   return response.data;
 };
+
+export const getFilteEntityList = async (entity_type: string) => {
+  const response = await api.get(`/entity-relation/${entity_type}`);
+
+  return response.data;
+};
+
+export const getFilterCriteriaByEntity = async (
+  selectedFilterEntity: FilterDataMainFilterEntityListProps | undefined
+) => {
+  const params = { entity_type: selectedFilterEntity?.value };
+
+  const response = await api.post(
+    `meta/get-filter-data`,
+    {},
+    {
+      params,
+    }
+  );
+
+  return response.data;
+};

package/src/listing/libs/utils/common.ts

@@ -79,7 +79,7 @@ export function customDebounce<T extends (...args: any[]) => any>(
 //ENTITY TYPE
 const ENVIRONMENT = "crm_dev";
 export const ENTITY_TYPE = "LEAD";
-export const MAPPED_ENTITY_TYPE = "LAP";
+export const MAPPED_ENTITY_TYPE = "LYPR"; // LAP OR LYPR
 
 const environments = {
   adm_dev: "http://localhost:4010/api",

package/src/listing/libs/utils/deep-merge-objects.ts

@@ -0,0 +1,18 @@
+export function deepMergeObjects<T>(target: T, source: Partial<T>): T {
+  const output = { ...target };
+  for (const key in source) {
+    if (
+      source[key] &&
+      typeof source[key] === "object" &&
+      !Array.isArray(source[key])
+    ) {
+      output[key] = deepMergeObjects(
+        (target as any)[key] || {},
+        (source as any)[key]
+      );
+    } else {
+      (output as any)[key] = source[key];
+    }
+  }
+  return output;
+}

package/src/listing/types/common.ts

@@ -1,5 +1,3 @@
-import { FilterMasterStateProps, UpdatedFilterStateProps } from "./filter";
-
 export interface defaultColumnsProps {
   id: number;
   name: string;

package/src/listing/types/filter.ts

@@ -62,6 +62,30 @@ export interface FilterDropdownDataProps {
   [key: string]: FilterOperationListProps[];
 }
 
+export interface FilterComponentOptionsMainFilterOptions {
+  showSaveButton?: boolean;
+  showClearAllButton?: boolean;
+}
+
+export type FilterComponentOptions =
+  | {
+      showMainHeader?: boolean;
+      showTabs?: true; // when true → additional fields allowed
+      showMainFilter?: boolean;
+      showSavedFilter?: boolean;
+      showAttributesFilter?: boolean;
+      tabOptions?: {
+        mainFilter?: FilterComponentOptionsMainFilterOptions;
+      };
+    }
+  | {
+      showMainHeader?: boolean;
+      showTabs?: false; // explicitly false or omitted
+      tabOptions?: {
+        mainFilter?: FilterComponentOptionsMainFilterOptions;
+      };
+    };
+
 export interface FilterDrawerProps {
   tableStates: CraftTableOptionsProps;
   open?: boolean;
@@ -84,6 +108,7 @@ export interface FilterDrawerProps {
     updatedFilters,
     filterMaster,
   }: onFilterChangeFunctionProps) => void;
+  filterComponentOptions?: FilterComponentOptions;
 }
 
 export interface FilterCriteria {
@@ -107,9 +132,6 @@ export interface FilterStateProps {
   filter_attribute: string;
   filter_operator: string;
   filter_value: string | string[];
-}
-
-export interface UpdatedFilterStateProps extends FilterStateProps {
   id: string | number;
   name: string | undefined;
   data_type: FilterInputDataTypes | undefined;
@@ -122,6 +144,8 @@ export interface UpdatedFilterStateProps extends FilterStateProps {
     label?: string | undefined;
     value?: string | undefined;
   };
+  filter_entity_type?: string;
+  filter_entity_name?: string;
 }
 
 interface FilterDetail {
@@ -171,10 +195,6 @@ export interface FilterFormComponentProps {
   columnsData: FilterColumnsDataProps;
   dropdownData: FilterDropdownDataProps;
   tableStates: CraftTableOptionsProps;
-  selectedFilters: UpdatedFilterStateProps[];
-  setSelectedFilters: React.Dispatch<
-    React.SetStateAction<UpdatedFilterStateProps[]>
-  >;
   editMode?: boolean;
   setEditMode?: React.Dispatch<React.SetStateAction<boolean>>;
   setDeleteFilterModalOpen?: React.Dispatch<React.SetStateAction<boolean>>;
@@ -184,6 +204,7 @@ export interface FilterFormComponentProps {
     updatedFilters,
     filterMaster,
   }: onFilterChangeFunctionProps) => void;
+  filterComponentOptions?: FilterComponentOptions;
 }
 
 export interface FilterMasterStateProps {
@@ -224,3 +245,29 @@ export interface viewSettingsPayload {
   column: string;
   sort_by: string;
 }
+
+export interface FilterDataMainFilterEntityListProps {
+  value: string;
+  id: string | number;
+  label: string;
+}
+
+export interface FilterDataMainFilterEntityWiseCriteriaProps {
+  id: string;
+  name: string;
+  attribute_key: string;
+  element_type: FilterInputDataTypes;
+}
+
+export interface FilterDataProps {
+  mainFilter?: {
+    entityList?: {
+      data?: FilterDataMainFilterEntityListProps[];
+      isPending?: boolean;
+    };
+    entityWiseCriteria?: {
+      data?: FilterDataMainFilterEntityWiseCriteriaProps[];
+      isPending?: boolean;
+    };
+  };
+}

package/src/listing/types/table-options.ts

@@ -7,6 +7,8 @@ import {
 } from "@tanstack/react-table";
 import { Dispatch, SetStateAction } from "react";
 import {
+  FilterDataMainFilterEntityListProps,
+  FilterDataProps,
   FilterMasterStateProps,
   FilterOperationListProps,
   FilterStateProps,
@@ -48,6 +50,12 @@ export interface CraftTableOptionsProps {
   setShowFilterOption: Dispatch<SetStateAction<boolean>>;
   columnPinning: ColumnPinningState;
   setColumnPinning: Dispatch<SetStateAction<ColumnPinningState>>;
+  filterData: FilterDataProps | null;
+  setFilterData: Dispatch<SetStateAction<FilterDataProps | null>>;
+  selectedFilterEntity: FilterDataMainFilterEntityListProps | undefined;
+  setSelectedFilterEntity: Dispatch<
+    SetStateAction<FilterDataMainFilterEntityListProps | undefined>
+  >;
 }
 
 export interface craftTableFilterSettingsOptionsProps {

package/src/view/FIlterWrapper.tsx

@@ -1,28 +1,66 @@
 import { useEffect } from "react";
-import { CraftTableFilter } from "..";
+import { CraftTableFilter, CraftTableOptionsProps } from "..";
 import { useGetNavigationLayoutAPI } from "../listing/libs/hooks/useGetNavigationLayoutAPI";
 import { ENTITY_TYPE } from "../listing/libs/utils/common";
 import {
   useDeleteFilterAPI,
+  useGetFilterEntityList,
   useSavedFilterAPI,
   useUpdateFilterAPI,
 } from "../listing/libs/hooks/useEntityTableAPI";
-import { FilterMasterStateProps } from "../listing/types/filter";
+import {
+  FilterColumnsDataProps,
+  FilterComponentOptions,
+  FilterDropdownDataProps,
+  FilterDataProps,
+  FilterMasterStateProps,
+} from "../listing/types/filter";
+import { onFilterChangeFunctionProps } from "../listing/types/common";
 
 const CraftTableFilterWrapper = ({
   tableStates,
   dropdownData,
   onChangeFunction,
   columnsData,
-}: any) => {
+  filterComponentOptions,
+}: {
+  tableStates: CraftTableOptionsProps;
+  columnsData: FilterColumnsDataProps;
+  dropdownData: FilterDropdownDataProps;
+  onChangeFunction: ({
+    updatedFilters,
+    filterMaster,
+  }: onFilterChangeFunctionProps) => void;
+  filterComponentOptions?: FilterComponentOptions;
+}) => {
   const getNavigationLayoutQuery = useGetNavigationLayoutAPI(ENTITY_TYPE);
 
-  const { filters, filterMaster, setFilterMaster, filterToDelete } =
-    tableStates;
+  const {
+    filters,
+    filterMaster,
+    setFilterMaster,
+    filterToDelete,
+    setFilterData,
+  } = tableStates;
 
   const { savedMutation } = useSavedFilterAPI(); //API CALL FOR SAVED FILTER
   const { updateMutation } = useUpdateFilterAPI(); //API FOR UPDATE FILTER
   const { deleteMutation } = useDeleteFilterAPI(tableStates); //API FOR DELETING FILTER
+  const filterEntityList: any = useGetFilterEntityList({
+    entity_type: ENTITY_TYPE,
+  });
+
+  useEffect(() => {
+    if (filterEntityList?.data) {
+      setFilterData((prev: FilterDataProps | null) => ({
+        ...prev,
+        mainFilter: {
+          ...prev?.mainFilter,
+          entityList: filterEntityList?.data,
+        },
+      }));
+    }
+  }, [filterEntityList?.data, filterEntityList?.isPending]);
 
   // API to handle saving a filter
   const handleSaveFilter = (name: string) => {
@@ -48,7 +86,7 @@ const CraftTableFilterWrapper = ({
           const newFilterId = response?.id;
           if (newFilterId) {
             setFilterMaster(
-              (prev: FilterMasterStateProps) =>
+              (prev: FilterMasterStateProps | null) =>
                 ({
                   ...prev,
                   saved_filters: {
@@ -123,6 +161,7 @@ const CraftTableFilterWrapper = ({
       onDeleteFilter={handleRemoveFilter}
       onSaveFilter={handleSaveFilter}
       onChangeFunction={onChangeFunction}
+      filterComponentOptions={filterComponentOptions}
     />
   );
 };