rez-table-listing-mui 1.3.5 → 1.3.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez-table-listing-mui",
-  "version": "1.3.5",
+  "version": "1.3.7",
   "type": "module",
   "description": "A rez table listing component built on TanStack Table",
   "main": "dist/index.js",

package/src/listing/components/filter/components/forms/components/Filter-criteria.tsx

@@ -54,15 +54,14 @@ const FilterCriteria = ({
   const handleAddFilter = (
     attribute: FilterDataMainFilterEntityWiseCriteriaProps
   ) => {
-    const dropdownOptions =
-      columnsData?.operation_list[attribute?.element_type];
+    const dropdownOptions = columnsData?.operation_list[attribute?.data_type];
 
-    const defaultValue = attribute.element_type === "multiselect" ? [] : "";
+    const defaultValue = attribute.data_type === "multiselect" ? [] : "";
 
     const defaultOperator = dropdownOptions?.[0]?.value || "";
 
     const matchingDropdownList =
-      columnsData?.operation_list[attribute.element_type] || [];
+      columnsData?.operation_list[attribute.data_type] || [];
 
     const newFilter = {
       filter_attribute: attribute.attribute_key,
@@ -75,7 +74,8 @@ const FilterCriteria = ({
       ...newFilter,
       id: attribute?.id,
       filter_attribute_name: attribute?.name,
-      filter_attribute_data_type: attribute?.element_type,
+      filter_attribute_data_type:
+        attribute?.data_type || attribute?.element_type,
       datasource_list: attribute?.datasource_list,
       dropdown_list: matchingDropdownList,
       filter_entity_name: selectedFilterEntity?.label,

package/src/listing/components/filter/components/forms/components/Multi-Select.tsx

@@ -71,7 +71,7 @@ const FormMultiSelect = ({
                   .join(", ");
               }}
             >
-              {options.map((item, idx) => (
+              {options?.map((item, idx) => (
                 <MenuItem key={idx} value={item.value}>
                   <Checkbox
                     checked={cleanedValue.includes(item.value)}

package/src/listing/libs/hooks/useEntityTableAPI.tsx

@@ -23,12 +23,13 @@ import {
   viewSettingsDropDown,
 } from "../utils/apiColumn";
 import {
-  FilterColumnsDataProps,
   FilterDataMainFilterEntityListProps,
   FilterMasterStateProps,
+  FilterStateProps,
 } from "../../types/filter";
 import { CraftTableOptionsProps } from "../../types/table-options";
 import { saveLayoutAPI } from "../services/saveLayoutAPI";
+import { useMemo } from "react";
 
 const entityListingCall = async ({
   page,
@@ -214,8 +215,8 @@ export const useUpdateFilterAPI = () => {
 export const useCommonDropdownAPI = (column_list?: any, value?: string) => {
   // Step 1: Extract all keys and query types
   const dropdownConfigs = (column_list || [])
-    .filter((col) => col?.datasource_list)
-    .map((col) => ({
+    ?.filter((col) => col?.datasource_list)
+    ?.map((col) => ({
       key: col.attribute_key,
       dataSourceType: value ?? col.datasource_list ?? "STS",
     }));
@@ -233,13 +234,47 @@ export const useCommonDropdownAPI = (column_list?: any, value?: string) => {
 
   // Step 3: Map results to keys
   const dropdownData: Record<string, any> = {};
-  dropdownConfigs.forEach((cfg, idx) => {
+  dropdownConfigs?.forEach((cfg, idx) => {
     dropdownData[cfg.key] = dropdownResults[idx].data;
   });
 
   return { dropdownData };
 };
 
+export const useCommonFilterDropdownAPI = (
+  filters: FilterStateProps[],
+  value?: string
+) => {
+  // Step 1: Extract all keys and query types
+  const dropdownConfigs = useMemo(() => {
+    return filters
+      ?.filter((col) => col?.filter_attribute_data_type === "select")
+      ?.map((col) => ({
+        key: col?.filter_attribute,
+        dataSourceType: value ?? col?.datasource_list ?? "STS",
+      }));
+  }, [filters]);
+
+  // Step 2: Use useQueries to fetch them all in parallel
+  const dropdownResults = useQueries({
+    queries: dropdownConfigs.map((cfg) => {
+      return {
+        queryKey: ["commonDropdown", cfg?.dataSourceType],
+        queryFn: () => commonGetDropdownDataAPI(cfg?.dataSourceType, null),
+        enabled: !!cfg?.dataSourceType,
+      };
+    }),
+  });
+
+  // Step 3: Map results to keys
+  const dropdownFilterData: Record<string, any> = {};
+  dropdownConfigs?.forEach((cfg, idx) => {
+    dropdownFilterData[cfg.key] = dropdownResults[idx].data;
+  });
+
+  return { dropdownFilterData };
+};
+
 //ALL VIEW SETTINGS API
 
 export const useSettingsDropDownAPI = ({

package/src/listing/types/filter.ts

@@ -274,6 +274,7 @@ export interface FilterDataMainFilterEntityWiseCriteriaProps {
   attribute_key: string;
   element_type: FilterInputDataTypes;
   datasource_list: any;
+  data_type: FilterInputDataTypes;
 }
 
 export interface FilterDataProps {

package/src/view/ListingView.tsx

@@ -8,18 +8,14 @@ import {
 } from "../listing/libs/hooks/useEntityTableHooks";
 import { ENTITY_TYPE, MAPPED_ENTITY_TYPE } from "../listing/libs/utils/common";
 import {
-  useCommonDropdownAPI,
-  useDeleteFilterAPI,
+  useCommonFilterDropdownAPI,
   useEntityTableAPI,
   useGetSettingsDataAPI,
-  useSavedFilterAPI,
   useSaveSettingsDataAPI,
   useSettingsDropDownAPI,
-  useUpdateFilterAPI,
 } from "../listing/libs/hooks/useEntityTableAPI";
 import { entityTableMetaMaster } from "../listing/libs/utils/apiColumn";
 import { ColumnDef } from "@tanstack/react-table";
-import { FilterMasterStateProps } from "../listing/types/filter";
 import { SettingsDataProps } from "../listing/types/filter-settings";
 import TableWrapper from "../listing/components/index-table";
 import { TableTabs } from "../listing/components/tabs";
@@ -39,8 +35,7 @@ function ListingView() {
   const tableStates = useCraftTable();
   const filterSettingStates = useCraftTableFilterSettings();
 
-  const { filters, setFilters, filterMaster, setFilterMaster, filterToDelete } =
-    tableStates;
+  const { filters, setFilters, filterMaster } = tableStates;
 
   const { showListViewSettings, setShowListViewSettings, setSettingsData } =
     filterSettingStates;
@@ -53,17 +48,13 @@ function ListingView() {
       ? filterMaster?.saved_filters?.selectedId
       : metaQuery?.data?.default_filter?.value
   );
-
-  const { savedMutation } = useSavedFilterAPI(); //API CALL FOR SAVED FILTER
-  const { deleteMutation } = useDeleteFilterAPI(tableStates); //API FOR DELETING FILTER
-  const { updateMutation } = useUpdateFilterAPI(); //API FOR UPDATE FILTER
   const { saveSettingsDataMutation } = useSaveSettingsDataAPI(ENTITY_TYPE);
-  const memoizedFilters = useMemo(() => filters, [filters]);
 
   // const { dropdownData } = useCommonDropdownAPI(
   //   dropdownColumnList || metaQuery.data.column_list
   // );
-  const { dropdownData } = useCommonDropdownAPI(memoizedFilters);
+  // const { dropdownData } = useCommonDropdownAPI(filters);
+  const { dropdownFilterData } = useCommonFilterDropdownAPI(filters);
   const { settingsTabDropdownData, settingsTabDropdownPending } =
     useSettingsDropDownAPI({
       entity_type: ENTITY_TYPE,
@@ -253,47 +244,6 @@ function ListingView() {
     );
   }, [newData, searchTerm]);
 
-  // API to handle saving a filter
-  const handleSaveFilter = (name: string) => {
-    const quickFilter = filters.map((f) => ({
-      filter_attribute: f.filter_attribute,
-      filter_operator: f.filter_operator,
-      filter_value: f.filter_value,
-    }));
-
-    const payload = {
-      name,
-      is_default: false,
-      mapped_entity_type: ENTITY_TYPE, // For that entity type
-      status: "ACTIVE",
-      entity_type: "SFM", // FIXED entity type
-      filterDetails: quickFilter,
-    };
-    const entity_type = "SFM";
-    savedMutation.mutate(
-      { entity_type, payload },
-      {
-        onSuccess: (response) => {
-          const newFilterId = response?.id;
-          if (newFilterId) {
-            setFilterMaster(
-              (prev) =>
-                ({
-                  ...prev,
-                  saved_filters: {
-                    ...prev?.saved_filters,
-                    selectedId: newFilterId.toString(),
-                    selectedName: name,
-                  },
-                  activeFilterTabIndex: 1,
-                } as FilterMasterStateProps)
-            );
-          }
-        },
-      }
-    );
-  };
-
   const handleChangeFunction = async (data: any) => {
     const payload = {
       entity_type: MAPPED_ENTITY_TYPE,
@@ -305,43 +255,6 @@ function ListingView() {
     await saveLayoutAPI(payload);
   };
 
-  // API to handle removing or deleting a filter
-  const handleRemoveFilter = () => {
-    const payload = {
-      name: filterToDelete?.label,
-      id: filterToDelete?.value,
-      is_default: false,
-      mapped_entity_type: ENTITY_TYPE,
-      status: "INACTIVE",
-      entity_type: "SFM",
-    };
-    const entity_type = "SFM";
-    deleteMutation.mutate({ entity_type, payload });
-  };
-
-  //API to update the filter
-  const handleUpdateFilter = () => {
-    console.log("handleUpdateFilter");
-
-    const quickFilter = filters.map((f) => ({
-      filter_attribute: f.filter_attribute,
-      filter_operator: f.filter_operator,
-      filter_value: f.filter_value,
-    }));
-
-    const payload = {
-      name: filterMaster?.saved_filters?.selectedName, // Name of the filter
-      is_default: false,
-      id: filterMaster?.saved_filters?.selectedId,
-      mapped_entity_type: ENTITY_TYPE,
-      status: "ACTIVE",
-      entity_type: "SFM",
-      filterDetails: quickFilter,
-    };
-    const entity_type = "SFM";
-    updateMutation.mutate({ entity_type, payload });
-  };
-
   const handleSaveSettingsData = (settingsData: SettingsDataProps) => {
     const payload = {
       entity_type: MAPPED_ENTITY_TYPE,
@@ -387,7 +300,7 @@ function ListingView() {
           <CraftTableFilterWrapper
             tableStates={tableStates}
             columnsData={metaQuery.data || {}}
-            dropdownData={dropdownData || []}
+            dropdownData={dropdownFilterData || []}
             // onUpdateFilter={handleUpdateFilter}
             // onDeleteFilter={handleRemoveFilter}
             // onSaveFilter={handleSaveFilter}