rez-table-listing-mui 1.3.61 → 1.3.64

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez-table-listing-mui",
-  "version": "1.3.61",
+  "version": "1.3.64",
   "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-entity-list.tsx

@@ -42,7 +42,7 @@ const FilterCriteriaEntityList = ({
 
     // Case 2: default behavior (apply search filter)
     return allEntities.filter((entity) =>
-      entity.label.toLowerCase().includes(searchTerm.toLowerCase())
+      entity.label?.toLowerCase().includes(searchTerm?.toLowerCase())
     );
   }, [isSingleEntity, filters, allEntities, searchTerm]);
 

package/src/listing/components/table-settings/components/column.tsx

@@ -190,11 +190,24 @@ const ColumnTab = ({
     }
   };
 
+  const constructHideList = (): ColumnItem[] => {
+    return (
+      columnTabAttributes
+        ?.map((column) => ({
+          label: column?.name,
+          value: column?.attribute_key,
+        }))
+        ?.filter(
+          (tab) =>
+            !settingsColumnState?.show_list?.find((i) => i.value === tab.value)
+        ) || []
+    );
+  };
   const getCurrentLists = () => {
     if (settingsColumnState?.isDefault) {
       return {
         showList: settingsColumnState.show_list || [],
-        hideList: settingsColumnState.hide_list || [],
+        hideList: constructHideList() || [],
       };
     } else {
       const currentTab = settingsColumnState?.tabs?.[selectedTabIndex];

package/src/listing/components/table-settings/components/quick-tab.tsx

@@ -106,6 +106,8 @@ const QuickTab = ({
           show_list: [],
         },
       }));
+
+      setCurrentQuickAttribute("");
     }
   }, [tabsApiData]);
 
@@ -174,8 +176,14 @@ const QuickTab = ({
   ];
 
   // Convert show_list/hide_list to FilterValue[] for rendering only
+
+  const constructHideList = () => {
+    return tabsApiData?.filter(
+      (tab) => !showListValues?.find((i) => i.value === tab.value)
+    );
+  };
   const showListValues = quickTabStates?.show_list || [];
-  const hideListValues = quickTabStates?.hide_list || [];
+  const hideListValues = constructHideList() || [];
 
   const sensors = useSensors(
     useSensor(MouseSensor),

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

@@ -15,7 +15,7 @@ interface TabDataProps {
 interface TableTabsProps {
   loading?: boolean;
   tabsData?: TabDataProps[];
-  activeTab?: string;
+  activeTab?: any;
   tableStates: CraftTableOptionsProps;
   onClick: (state: string) => void;
   columns?: any[];
@@ -72,22 +72,24 @@ export function TableTabs({
       {/* Tabs */}
       <Tabs
         value={selectedTab}
-        onChange={(_, newValue) => handleTabClick(newValue)}
+        onChange={(_, newValue) => {
+          handleTabClick(newValue);
+        }}
         variant="scrollable"
         scrollButtons="auto"
         slotProps={{ indicator: { sx: { display: "none" } } }}
         sx={tableTabsStyles.tabs}
       >
-        {normalizedTabs.map(({ tab_name, count }) => {
-          const isSelected = activeTab === tab_name;
+        {normalizedTabs.map((tab) => {
+          const isSelected = activeTab?.tab_name === tab?.tab_name;
 
           return (
             <Tab
-              key={tab_name}
-              value={tab_name}
+              key={tab?.tab_name}
+              value={tab}
               label={
                 <Box display="flex" alignItems="center" gap={1}>
-                  <Box>{tab_name}</Box>
+                  <Box>{tab?.tab_name}</Box>
                   <Box
                     sx={{
                       ...tableTabsStyles.tabCount,
@@ -100,7 +102,9 @@ export function TableTabs({
                       }),
                     }}
                   >
-                    {count == 0 ? "0" : String(count).padStart(2, "0")}
+                    {tab?.count == 0
+                      ? "0"
+                      : String(tab?.count).padStart(2, "0")}
                   </Box>
                 </Box>
               }

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

@@ -24,6 +24,8 @@ import {
   getOperationList,
   getLayoutAttributes,
   getAttributes,
+  getTableTabs,
+  newCommonGetDropdownDataAPI,
 } from "../utils/apiColumn";
 import {
   FilterDataMainFilterEntityListProps,
@@ -268,7 +270,11 @@ export const useCommonFilterDropdownAPI = (
     queries: dropdownConfigs.map((cfg) => {
       return {
         queryKey: ["commonDropdown", cfg?.dataSourceType],
-        queryFn: () => commonGetDropdownDataAPI(cfg?.dataSourceType, null),
+        queryFn: () =>
+          newCommonGetDropdownDataAPI({
+            entity_type: "ROL",
+            attribute_key: cfg?.key,
+          }),
         enabled: !!cfg?.dataSourceType,
       };
     }),
@@ -363,10 +369,14 @@ export const useGetFilterEntityListAndCriteria = ({
   return { filterEntityList, filterEntityWiseCriteria };
 };
 
-export const useGetAttributes = (entity_type: string) => {
+export const useGetAttributes = (
+  entity_type: string,
+  element_type?: string
+) => {
   const attributes = useQuery({
-    queryKey: ["attributes", entity_type],
-    queryFn: () => getAttributes(entity_type),
+    queryKey: ["attributes", entity_type, element_type],
+    queryFn: () => getAttributes(entity_type, element_type),
+    enabled: !!entity_type, // optional safety
   });
 
   return { attributes };
@@ -401,6 +411,54 @@ export const useGetLayoutAttributes = ({
   return { layoutAttributes };
 };
 
+export const useGetTableTabs = (payload: any) => {
+  const { data: tableTabs, isLoading } = useQuery({
+    queryKey: ["tableTabs", payload],
+    queryFn: () => getTableTabs(payload),
+  });
+  return { tableTabs, isLoading };
+};
+
+export const useDropdownAPI = ({
+  entity_type,
+  attribute_key,
+  inactiveIds,
+  parentId,
+  data,
+  enabled = true,
+}: {
+  entity_type: string;
+  attribute_key?: string;
+  inactiveIds?: string | null;
+  parentId?: number | string;
+  data?: any;
+  enabled?: boolean;
+}) => {
+  const query = useQuery({
+    queryKey: [
+      "commonDropdown",
+      entity_type,
+      attribute_key,
+      inactiveIds,
+      parentId,
+    ],
+    queryFn: () =>
+      newCommonGetDropdownDataAPI({
+        entity_type,
+        attribute_key,
+        inactiveIds,
+        parentId,
+        data,
+      }),
+    enabled, // prevents auto call unless needed
+    staleTime: 5 * 60 * 1000, // cache for 5 mins
+  });
+
+  return {
+    ...query,
+    dropdownData: query.data || [],
+  };
+};
 // export const useGetSettingsColumnAttributes = (entity_type: string) => {
 //   // First query to get meta data
 //   const settingsColumnAttributes = useQuery({

package/src/listing/libs/hooks/useEntityTableHooks.ts

@@ -14,11 +14,11 @@ export const useDetailsQueryAPI = (value: string | undefined) => {
   return { detailsQuery };
 };
 
-export const useFetchData = (entity_type: string) => {
+export const useFetchData = (entity_type: string, payload?: any) => {
   // First query to get meta data
   const metaQuery = useQuery({
-    queryKey: ["meta", entity_type],
-    queryFn: () => entityTableFilterMaster(entity_type),
+    queryKey: ["meta", entity_type, payload],
+    queryFn: () => entityTableFilterMaster(entity_type, payload),
   });
 
   return { metaQuery };

package/src/listing/libs/services/getLayoutAPI.tsx

@@ -7,7 +7,7 @@ export const getLeadNavigationTabs = async (entity_type: string) => {
       type: "layout",
     };
 
-    const response = await api.get("/layout-preference", { params });
+    const response = await api.get("meta/layout-preference", { params });
 
     return response.data.mapped_json;
   } catch (error) {

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

@@ -27,10 +27,14 @@ export const entityTableMetaMaster = async (entity_type: string) => {
   }
 };
 
-export const entityTableFilterMaster = async (entity_type: string) => {
+export const entityTableFilterMaster = async (
+  entity_type: string,
+  payload?: any
+) => {
   try {
     const response = await api.post(
-      `/meta/get-table-data?entity_type=${entity_type}&list_type=${entity_type}`
+      `/meta/get-table-data?entity_type=${entity_type}&list_type=${entity_type}`,
+      payload
     );
 
     // const filteredData = {
@@ -141,7 +145,7 @@ export const saveSettingsData = async (payload: any) => {
 export const getSettingsData = async (entity_type: any) => {
   try {
     const response = await api.get(
-      `layout-preference?entity_type=${entity_type}`
+      `meta/layout-preference?entity_type=${entity_type}`
     );
     return response.data;
   } catch (error) {
@@ -156,7 +160,7 @@ export const viewSettingsDropDown = async ({
   sort_by,
 }: viewSettingsDropDownAPIProps): Promise<Array<string>> => {
   const response = await api.get(
-    `/layout-preference/column?entity_type=${entity_type}&column=${column}&sort_by=${sort_by}`
+    `meta/layout-preference/column?entity_type=${entity_type}&column=${column}&sort_by=${sort_by}`
   );
 
   return response.data;
@@ -164,7 +168,7 @@ export const viewSettingsDropDown = async ({
 
 export const getFilterEntityList = async (entity_type: string) => {
   const response = await api.get(
-    `/entity-relation/${entity_type}?include=true`
+    `meta/entity-relation/${entity_type}?include=true`
   );
 
   return response.data;
@@ -176,7 +180,7 @@ export const getFilterCriteriaByEntity = async (
   const params = { entity_type: selectedFilterEntity?.value };
 
   const response = await api.get(
-    `/attribute-master/getAttributes?direct=false&entity_type=${selectedFilterEntity?.value}`
+    `meta/attribute-master/getAttributes?direct=false&entity_type=${selectedFilterEntity?.value}`
   );
 
   return response.data;
@@ -198,18 +202,64 @@ export const getLayoutAttributes = async ({
     element_type,
   };
   const response = await api.post(
-    `/layout-preference/attributes`,
+    `meta/layout-preference/attributes`,
     { entity_type },
     { params }
   );
   return response.data;
 };
 
-export const getAttributes = async (entity_type: string) => {
-  const response = await api.get(
-    `/attribute-master/getAttributes?direct=false&entity_type=${entity_type}`
-  );
-  console.log("resss", response);
+export const getAttributes = async (
+  entity_type: string,
+  element_type?: string
+) => {
+  const response = await api.get("/meta/attribute-master/getAttributes", {
+    params: {
+      // direct: false, // commented as per requirement
+      entity_type,
+      ...(element_type && { element_type }),
+    },
+  });
+
+  return response.data;
+};
 
+export const getTableTabs = async (payload: any) => {
+  const response = await api.post(`filter/adm/tabs`, payload);
   return response.data;
 };
+
+export const newCommonGetDropdownDataAPI = async ({
+  entity_type,
+  attribute_key,
+  // organization_id,
+  data,
+  inactiveIds,
+  parentId,
+}: {
+  entity_type: string | undefined;
+  attribute_key?: string;
+  // organization_id?: string | null;
+  data?: any;
+  inactiveIds?: string | null;
+  parentId?: number | string;
+}) => {
+  // Body can still accept optional custom data if needed
+  const requestBody = data || {};
+
+  // Build query params dynamically
+  const queryParams: string[] = [];
+
+  if (entity_type) queryParams.push(`entity_type=${entity_type}`);
+  if (attribute_key) queryParams.push(`attribute_key=${attribute_key}`);
+  if (!Number.isNaN(Number(inactiveIds)) && inactiveIds)
+    queryParams.push(`inactiveIds=${inactiveIds}`);
+  if (parentId !== undefined && parentId !== null)
+    queryParams.push(`parent=${parentId}`);
+
+  const queryString = queryParams.length > 0 ? `?${queryParams.join("&")}` : "";
+
+  return await api
+    .post(`entity/getAttributeDropdown${queryString}`, requestBody)
+    .then((response) => response.data);
+};

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

@@ -78,7 +78,7 @@ export function customDebounce<T extends (...args: any[]) => any>(
 
 //ENTITY TYPE
 const ENVIRONMENT = "adm_dev";
-export const ENTITY_TYPE = "SCH";
+export const ENTITY_TYPE = "ROL";
 export const MAPPED_ENTITY_TYPE = "LYPR"; // LAP OR LYPR
 export const USER_ID = 226;
 
@@ -111,3 +111,47 @@ api.interceptors.request.use(
     return Promise.reject(error);
   }
 );
+
+export const formatTableHeaders = (columns: any) => {
+  const mapped = columns.map((col: any) => {
+    const meta =
+      col.attribute_key === "status" ||
+      col.attribute_key === "lead_status" ||
+      col.attribute_key === "flag" ||
+      col.attribute_key === "invitation_status"
+        ? { type: "custom", propName: "renderStatus", align: col.align }
+        : col.attribute_key === "profile_image" ||
+          col.attribute_key === "short_logo"
+        ? {
+            type: "custom",
+            propName: "profileImageFetch",
+            align: col.align,
+          }
+        : col.attribute_key === "start_date" || col.attribute_key === "end_date"
+        ? { type: "custom", propName: "dateFormater", align: col.align }
+        : col.attribute_key === "action"
+        ? { type: "custom", propName: "renderAction", align: col.align }
+        : col.attribute_key === "code"
+        ? {
+            type: "custom",
+            propName: "drillCellRenderer",
+            align: col.align,
+          }
+        : col.attribute_key === "primary_mobile"
+        ? {
+            type: "custom",
+            propName: "apiCallonClick",
+            align: col.align,
+          }
+        : undefined;
+
+    return {
+      header: col.name ?? "",
+      accessorKey: col.attribute_key ?? "",
+      size: col.size,
+      meta,
+    };
+  });
+
+  return mapped;
+};

package/src/listing/types/common.ts

@@ -48,6 +48,7 @@ export interface EntityTableAPIProps {
     columnName: string;
     sortBy: "ASC" | "DSC";
     value?: string;
+    name?: string;
   };
   sortby?: {
     sortColum: string;

package/src/listing/types/table.ts

@@ -95,7 +95,7 @@ export interface CraftTableProps<T> {
   filterOptions?: FilterOptionsProps;
   settingsOptions?: settingsOptionsProps;
   craftTableFilterSettingsOptions?: craftTableFilterSettingsOptionsProps;
-  activeTab?: string;
+  activeTab?: any;
 }
 export interface CraftTableComponentProps<T> {
   table: Table<T>;