rez-table-listing-mui 0.0.26 → 1.0.27

package/src/components/index-table.tsx

@@ -243,6 +243,30 @@ function TableWrapper<T>({
 
   return (
     <div className="ts__table__container" ref={tableRef}>
+      {enableTopbar && (
+        <Topbar
+          table={table}
+          topbarOptions={craftTopbarOptions}
+          isCompactTable={isCompactTable}
+          setIsCompactTable={setIsCompactTable}
+          isFullscreen={isFullscreen}
+          fullscreenToggle={handleFullscreenToggle}
+          paginationComponent={
+            craftPaginationOptions?.showPagination === true &&
+            craftPaginationOptions?.paginationPosition === "top" ? (
+              <DefaultPagination
+                table={table}
+                rowsPerPageArray={rowsPerPageArray}
+                paginationOptions={craftPaginationOptions}
+              />
+            ) : null
+          }
+          // searchValue={searchValue} // 👈 new
+          // onSearchChange={onSearchChange}
+          tableStates={tableStates}
+        />
+      )}
+
       {isLoading ? (
         loadingComponent ?? (
           <div className="ts__loader">
@@ -251,70 +275,44 @@ function TableWrapper<T>({
           </div>
         )
       ) : (
-        <>
-          {enableTopbar && (
-            <Topbar
+        <div
+          // {...tableWrapperProps}
+          className={`ts__table__wrapper ${
+            isFullscreen ? "is-fullscreen" : ""
+          }`}
+        >
+          {enableColumnReordering ? (
+            <TableDND
               table={table}
-              topbarOptions={craftTopbarOptions}
+              columnOrder={columnOrder}
+              featureOptions={craftFeatureOptions}
+              NestedComponent={nestedComponent}
+              setColumnOrder={setColumnOrder}
               isCompactTable={isCompactTable}
-              setIsCompactTable={setIsCompactTable}
-              isFullscreen={isFullscreen}
-              fullscreenToggle={handleFullscreenToggle}
-              paginationComponent={
-                craftPaginationOptions?.showPagination === true &&
-                craftPaginationOptions?.paginationPosition === "top" ? (
-                  <DefaultPagination
-                    table={table}
-                    rowsPerPageArray={rowsPerPageArray}
-                    paginationOptions={craftPaginationOptions}
-                  />
-                ) : null
-              }
-              // searchValue={searchValue} // 👈 new
-              // onSearchChange={onSearchChange}
               tableStates={tableStates}
             />
-          )}
-
-          <div
-            // {...tableWrapperProps}
-            className={`ts__table__wrapper ${
-              isFullscreen ? "is-fullscreen" : ""
-            }`}
-          >
-            {enableColumnReordering ? (
-              <TableDND
-                table={table}
-                columnOrder={columnOrder}
-                featureOptions={craftFeatureOptions}
-                NestedComponent={nestedComponent}
-                setColumnOrder={setColumnOrder}
-                isCompactTable={isCompactTable}
-                tableStates={tableStates}
-              />
-            ) : (
-              <Table
-                table={table}
-                featureOptions={craftFeatureOptions}
-                NestedComponent={nestedComponent}
-                columnOrder={columnOrder}
-                setColumnOrder={setColumnOrder}
-                isCompactTable={isCompactTable}
-                tableStates={tableStates}
-              />
-            )}
-          </div>
-
-          {craftPaginationOptions?.showPagination === true &&
-          craftPaginationOptions?.paginationPosition === "bottom" ? (
-            <DefaultPagination
+          ) : (
+            <Table
               table={table}
-              rowsPerPageArray={rowsPerPageArray}
-              paginationOptions={craftPaginationOptions}
+              featureOptions={craftFeatureOptions}
+              NestedComponent={nestedComponent}
+              columnOrder={columnOrder}
+              setColumnOrder={setColumnOrder}
+              isCompactTable={isCompactTable}
+              tableStates={tableStates}
             />
-          ) : null}
-        </>
+          )}
+        </div>
       )}
+
+      {craftPaginationOptions?.showPagination === true &&
+      craftPaginationOptions?.paginationPosition === "bottom" ? (
+        <DefaultPagination
+          table={table}
+          rowsPerPageArray={rowsPerPageArray}
+          paginationOptions={craftPaginationOptions}
+        />
+      ) : null}
     </div>
   );
 }

package/src/libs/hooks/useEntityTableAPI.tsx

@@ -66,7 +66,7 @@ const entityListingCall = async ({
 export const useEntityTableAPI = ({
   page = 0,
   size = 50,
-  quickFilter,
+  quickFilter = [],
 }: EntityTableAPIProps) => {
   const { data, isPending: isTableDataPending } = useQuery({
     queryKey: [page, size, quickFilter],
@@ -166,11 +166,13 @@ export const useCommonDropdownAPI = (
 
   // Step 2: Use useQueries to fetch them all in parallel
   const dropdownResults = useQueries({
-    queries: dropdownConfigs.map((cfg) => ({
-      queryKey: ["commonDropdown", cfg.dataSourceType],
-      queryFn: () => commonGetDropdownDataAPI(cfg.dataSourceType, null),
-      enabled: !!cfg.dataSourceType,
-    })),
+    queries: dropdownConfigs.map((cfg) => {
+      return {
+        queryKey: ["commonDropdown", cfg.dataSourceType],
+        queryFn: () => commonGetDropdownDataAPI(cfg.dataSourceType, null),
+        enabled: !!cfg.dataSourceType,
+      };
+    }),
   });
 
   // Step 3: Map results to keys

package/src/libs/utils/apiColumn.ts

@@ -1,6 +1,6 @@
 import { api } from "./common";
 import {
-  createSavedFilterPaload,
+  createSavedFilterPayload,
   deleteSavedFilterPayload,
   updateSavedFilterPayload,
 } from "../../types/filter";
@@ -52,13 +52,13 @@ export const fetchDetailsByFilterId = async (filterId: string) => {
 
 export const commonGetDropdownDataAPI = async (
   entity_type: string,
-  organization_id?: string | null,
+  // organization_id?: string | null,
   data?: any
 ) => {
   try {
     const requestBody = {
       status: "ACTIVE",
-      organization_id: organization_id,
+      organization_id: 1,
       ...data,
     };
 
@@ -76,7 +76,7 @@ export const commonGetDropdownDataAPI = async (
 
 export const createSavedFilter = async (
   entity_type: string,
-  payload: createSavedFilterPaload
+  payload: createSavedFilterPayload
 ) => {
   try {
     const response = await api.post(

package/src/types/filter.ts

@@ -124,7 +124,7 @@ interface FilterDetail {
   filter_value: string | string[];
 }
 
-export interface createSavedFilterPaload {
+export interface createSavedFilterPayload {
   name: string;
   organization_id?: number;
   enterprise_id?: number;
@@ -155,14 +155,6 @@ export interface updateSavedFilterPayload {
   filterDetails: FilterDetail[];
 }
 
-export interface deleteSavedFilterPayload {
-  name: string;
-  is_default: boolean;
-  id: string | number;
-  status?: string;
-  entity_type: string;
-  mapped_entity_type: string;
-}
 interface FilterDetail {
   filter_attribute: string;
   filter_operator: string;
@@ -181,6 +173,7 @@ export interface FilterFormComponentProps {
   setEditMode?: React.Dispatch<React.SetStateAction<boolean>>;
   setDeleteFilterModalOpen?: React.Dispatch<React.SetStateAction<boolean>>;
   setSavedFilterModalOpen?: React.Dispatch<React.SetStateAction<boolean>>;
+  tabValue?: number;
 }
 
 export interface FilterMasterStateProps {
@@ -192,6 +185,7 @@ export interface FilterMasterStateProps {
     selectedId: string;
     selectedName: string;
   };
+  activeFilterTabIndex: number;
 }
 
 export interface AttributesFilterProps {
@@ -200,6 +194,7 @@ export interface AttributesFilterProps {
   dropdownData: FilterDropdownDataProps;
   searchTerm: string;
   setSearchTerm: React.Dispatch<React.SetStateAction<string>>;
+  tabValue?: number;
 }
 
 export interface AttributesFilterSelectProps {
@@ -208,4 +203,5 @@ export interface AttributesFilterSelectProps {
   dropdownData: FilterDropdownDataProps;
   searchTerm: string;
   setSearchTerm: React.Dispatch<React.SetStateAction<string>>;
+  tabValue?: number;
 }