rez-table-listing-mui 1.3.58 → 1.3.60

package/src/view/ListingView.tsx

@@ -10,11 +10,8 @@ import { ENTITY_TYPE, MAPPED_ENTITY_TYPE } from "../listing/libs/utils/common";
 import {
   useCommonFilterDropdownAPI,
   useEntityTableAPI,
-  useGetFilterEntityListAndCriteria,
-  useGetLayoutAttributes,
+  useGetAttributes,
   useGetOperationList,
-  useGetSettingsColumnAttributes,
-  useGetSettingsDataAPI,
   useSaveSettingsDataAPI,
   useSettingsDropDownAPI,
 } from "../listing/libs/hooks/useEntityTableAPI";
@@ -55,24 +52,17 @@ function ListingView() {
   const { defaultColumns } = useDefaultColumns();
 
   const { metaQuery } = useFetchData(ENTITY_TYPE);
+
   const { detailsQuery } = useDetailsQueryAPI(
     filterMaster?.saved_filters?.selectedId
       ? filterMaster?.saved_filters?.selectedId
       : metaQuery?.data?.default_filter?.value
   );
   const { saveSettingsDataMutation } = useSaveSettingsDataAPI(ENTITY_TYPE);
-  const { settingsColumnAttributes } =
-    useGetSettingsColumnAttributes(ENTITY_TYPE);
   const { operationList } = useGetOperationList();
 
-  const { layoutAttributes: quickTabAttributes } = useGetLayoutAttributes({
-    entity_type: ENTITY_TYPE,
-    data_type: "select",
-  });
+  const { attributes } = useGetAttributes(ENTITY_TYPE);
 
-  const { layoutAttributes: sortingTabAttributes } = useGetLayoutAttributes({
-    entity_type: ENTITY_TYPE,
-  });
   const isColumnDefault =
     filterSettingStates?.columnTabState?.isDefault || false;
   const activeTabIndex = filterSettingStates?.columnTabState?.tabs?.findIndex(
@@ -118,55 +108,58 @@ function ListingView() {
         //   ?.filter((col): col is ColumnDef<any> => col !== undefined); // Ensure non-undefined columns are returned
 
         // didnt know what above code was doing so rewrote it as below
-        const res = showList.map((item: any) => ({
-          id: item.value,
-          accessorKey: item.value,
-          header: item.label,
-        }));
-
-        return res;
+        // const res = showList.map((item: any) => ({
+        //   id: item.value,
+        //   accessorKey: item.value,
+        //   header: item.label,
+        // }));
+
+        // return res;
+        return allColumns;
       };
 
-      if (
-        savedColumnSettings &&
-        !savedColumnSettings.isDefault &&
-        savedColumnSettings.tabs
-      ) {
-        // Tab-wise view: find the active tab and use its show_list
-        const activeTabSettings = savedColumnSettings.tabs.find(
-          (tab) => tab.tab_name?.value == selectedTab.toLowerCase()
-        );
-
-        if (activeTabSettings?.show_list) {
-          const visibleColumns = new Set(
-            activeTabSettings.show_list.map((c) => c.value)
-          );
-
-          // First, filter columns based on visibleColumns
-          const filteredColumns = allColumns.filter((col: any) =>
-            visibleColumns.has(col?.accessorKey)
-          );
-          setColumns(
-            getOrderedColumns(activeTabSettings.show_list, filteredColumns)
-          );
-        } else {
-          // Fallback if no specific settings for the active tab are found
-          setColumns(allColumns);
-        }
-      } else if (savedColumnSettings && savedColumnSettings.show_list) {
-        // Default view: use the main show_list
-        const visibleColumns = new Set(
-          savedColumnSettings.show_list.map((c) => c.value)
-        );
-        const filtered = allColumns.filter((col: any) =>
-          visibleColumns.has(col?.accessorKey)
-        );
-
-        setColumns(getOrderedColumns(savedColumnSettings.show_list, filtered));
-      } else {
-        // No settings found, use all columns
-        setColumns(allColumns);
-      }
+      setColumns(allColumns);
+
+      // if (
+      //   savedColumnSettings &&
+      //   !savedColumnSettings.isDefault &&
+      //   savedColumnSettings.tabs
+      // ) {
+      //   // Tab-wise view: find the active tab and use its show_list
+      //   const activeTabSettings = savedColumnSettings.tabs.find(
+      //     (tab) => tab.tab_name?.value == selectedTab.toLowerCase()
+      //   );
+
+      //   if (activeTabSettings?.show_list) {
+      //     const visibleColumns = new Set(
+      //       activeTabSettings.show_list.map((c) => c.value)
+      //     );
+
+      //     // First, filter columns based on visibleColumns
+      //     const filteredColumns = allColumns.filter((col: any) =>
+      //       visibleColumns.has(col?.accessorKey)
+      //     );
+      //     setColumns(
+      //       getOrderedColumns(activeTabSettings.show_list, filteredColumns)
+      //     );
+      //   } else {
+      //     // Fallback if no specific settings for the active tab are found
+      //     setColumns(allColumns);
+      //   }
+      // } else if (savedColumnSettings && savedColumnSettings.show_list) {
+      //   // Default view: use the main show_list
+      //   const visibleColumns = new Set(
+      //     savedColumnSettings.show_list.map((c) => c.value)
+      //   );
+      //   const filtered = allColumns.filter((col: any) =>
+      //     visibleColumns.has(col?.accessorKey)
+      //   );
+
+      //   setColumns(getOrderedColumns(savedColumnSettings.show_list, filtered));
+      // } else {
+      //   // No settings found, use all columns
+      //   setColumns(allColumns);
+      // }
     } catch (error) {
       console.error("Failed to fetch metadata:", error);
     }
@@ -238,17 +231,17 @@ function ListingView() {
       tabsData &&
       tabsData.length > 0 &&
       !tabsData.some(
-        (tab) => tab.tab_value?.toLowerCase() === selectedTab.toLowerCase()
+        (tab) => tab.tab_name?.toLowerCase() === selectedTab.toLowerCase()
       )
     ) {
       // Try to select 'ALL' if it exists
       const allTab = tabsData.find(
-        (tab) => tab.tab_value?.toLowerCase() === "all"
+        (tab) => tab.tab_name?.toLowerCase() === "all"
       );
       if (allTab) {
-        setSelectedTab(allTab.tab_value || "All");
+        setSelectedTab(allTab.tab_name || "All");
       } else {
-        setSelectedTab(tabsData[0].tab_value || "All");
+        setSelectedTab(tabsData[0].tab_name || "All");
       }
     }
   }, [tabsData, selectedTab]);
@@ -258,9 +251,9 @@ function ListingView() {
       tableData?.entity_tabs?.find((tab) => {
         const activeTab = selectedTab || "All";
         return (
-          tab.tab_value?.toLocaleLowerCase() === activeTab.toLocaleLowerCase()
+          tab.tab_name?.toLocaleLowerCase() === activeTab.toLocaleLowerCase()
         );
-      })?.tab_value_count || "0"
+      })?.count || "0"
     );
   }, [tableData, selectedTab]);
 
@@ -410,6 +403,9 @@ function ListingView() {
           queryClient.invalidateQueries({
             queryKey: ["GET_NAVIGATION_LAYOUT", ENTITY_TYPE],
           });
+          queryClient.invalidateQueries({
+            queryKey: ["meta", ENTITY_TYPE],
+          });
         },
       }
     );
@@ -541,14 +537,17 @@ function ListingView() {
               onClose={() => setShowListViewSettings(false)}
               columnsData={metaQuery.data || {}}
               columnsDataLoading={metaQuery.isPending}
-              quickTabAttributes={quickTabAttributes?.data}
-              quickTabAttributesLoading={quickTabAttributes?.isLoading}
-              columnTabAttributes={settingsColumnAttributes?.data?.filter(
+              quickTabAttributes={attributes?.data?.map((item) => ({
+                label: item.name,
+                value: item.attribute_key,
+              }))}
+              quickTabAttributesLoading={attributes?.data?.isLoading}
+              columnTabAttributes={attributes?.data?.filter(
                 (item) => item.attribute_key
               )}
-              columnAttributesLoading={settingsColumnAttributes?.isLoading}
-              sortingTabAttributes={sortingTabAttributes?.data}
-              sortingTabAttributesLoading={sortingTabAttributes?.isLoading}
+              columnAttributesLoading={attributes?.data?.isLoading}
+              sortingTabAttributes={attributes?.data}
+              sortingTabAttributesLoading={attributes?.data?.isLoading}
               tabsApiData={settingsTabDropdownData || []}
               tabsApiDataLoading={settingsTabDropdownPending}
               onSaveSettingsData={handleSaveSettingsData}