rez-table-listing-mui 1.0.30 → 1.0.31

package/src/App.tsx

@@ -24,7 +24,7 @@ function App() {
   const [columns, setColumns] = useState<any[]>([]);
   const [searchTerm, setSearchTerm] = useState("");
   // const [data, setData] = useState<Person[]>(() => makeData(50, 3, 2));
-  // const [entity_type] = useState(ENTITY_TYPE); //OR UPR BRD
+  // const [entity_type] = useState(ENTITY_TYPE); //OR NTM BRD
 
   const [selectedTab, setSelectedTab] = useState("ALL");
 
@@ -33,7 +33,7 @@ function App() {
 
   const { defaultColumns } = useDefaultColumns();
 
-  const { metaQuery } = useFetchData("UPR");
+  const { metaQuery } = useFetchData("NTM");
   const { detailsQuery } = useDetailsQueryAPI(
     filterMaster?.saved_filters?.selectedId
       ? filterMaster?.saved_filters?.selectedId
@@ -58,7 +58,7 @@ function App() {
 
     const fetchMeta = async () => {
       try {
-        const { res } = await entityTableMetaMaster("UPR");
+        const { res } = await entityTableMetaMaster("NTM");
         setColumns(res);
       } catch (error) {
         console.error("Failed to fetch metadata:", error);
@@ -77,7 +77,7 @@ function App() {
   const { tableData, isTableDataPending } = useEntityTableAPI({
     page: 0,
     size: 50,
-    entity_type: "UPR",
+    entity_type: "NTM",
     tabs: {
       columnName: "status",
       sortBy: "ASC",
@@ -156,7 +156,7 @@ function App() {
     const payload = {
       name,
       is_default: false,
-      mapped_entity_type: "UPR", // For that entity type
+      mapped_entity_type: "NTM", // For that entity type
       status: "ACTIVE",
       entity_type: "SFM", // FIXED entity type
       filterDetails: quickFilter,
@@ -171,7 +171,7 @@ function App() {
       name: filterToDelete?.label,
       id: filterToDelete?.value,
       is_default: false,
-      mapped_entity_type: "UPR",
+      mapped_entity_type: "NTM",
       status: "INACTIVE",
       entity_type: "SFM",
     };
@@ -192,7 +192,7 @@ function App() {
       name: filterMaster?.saved_filters?.selectedName, // Name of the filter
       is_default: false,
       id: filterMaster?.saved_filters?.selectedId,
-      mapped_entity_type: "UPR",
+      mapped_entity_type: "NTM",
       status: "ACTIVE",
       entity_type: "SFM",
       filterDetails: quickFilter,
@@ -218,10 +218,10 @@ function App() {
           enableRowSelection: false,
           enableServerSideSorting: enableServerSideSorting,
         }}
-        loadingOptions={{
-          isLoading: isTableDataPending || detailsQuery.isPending,
-          // loaderText: "Loading, Please wait...",
-        }}
+        // loadingOptions={{
+        //   isLoading: isTableDataPending || detailsQuery.isPending,
+        //   // loaderText: "Loading, Please wait...",
+        // }}
         topbarOptions={{
           tableStates,
           leftSideComponent: (

package/src/components/filter/components/forms/components/Date.tsx

@@ -9,12 +9,14 @@ import { SxProps, Theme } from "@mui/material";
 const FormDatePicker = ({
   filter,
   control,
-  sx,
 }: {
   filter: UpdatedFilterStateProps;
   control: any;
   sx?: SxProps<Theme>;
 }) => {
+  const range = filter.filter_operator === "between";
+  console.log("range+++", range);
+
   return (
     <Controller
       name={`${filter?.name}.value`} // or use a consistent structure like `filters.${index}.filter_value`

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

@@ -16,6 +16,7 @@ import {
   UpdatedFilterStateProps,
 } from "../../../../../types/filter";
 import { CraftTableOptionsProps } from "../../../../../types/table-options";
+import CustomSearch from "../../search";
 
 const FilterCriteria = ({
   columnsData,
@@ -45,11 +46,20 @@ const FilterCriteria = ({
 
   const handleAddFilter = (column: FilterColumnsListProps) => {
     const dropdownOptions = columnsData.operation_list[column.data_type];
+
+    // console.log("dropdownOptionssssss", dropdownOptions);
+
     const defaultValue = column.data_type === "multiselect" ? [] : "";
+    console.log("defaultValue", defaultValue);
+
     const defaultOperator = dropdownOptions?.[0]?.value || "";
+    // console.log("defaultOperator", defaultOperator);
+
     const matchingDropdownList =
       columnsData.operation_list[column.data_type] || [];
 
+    // console.log("matchingDropdownList", matchingDropdownList);
+
     const newFilter = {
       filter_attribute: column.attribute_key,
       filter_operator: defaultOperator,
@@ -129,7 +139,8 @@ const FilterCriteria = ({
                     borderRadius: "6px",
                   }}
                 >
-                  Filter by...
+                  {/* Filter by... */}
+                  {/* <CustomSearch placeholder="Filter by..." /> */}
                 </ListSubheader>
               }
             >

package/src/components/filter/components/forms/index.tsx

@@ -241,6 +241,8 @@ const FilterForm = ({
           columnsData={columnsData}
           tableStates={tableStates}
           setSelectedFilters={setSelectedFilters}
+          // searchTerm={searchTerm}
+          // setSearchTerm={setSearchTerm}
         />
 
         {/* Render search input */}
@@ -306,9 +308,8 @@ const FilterForm = ({
                     sx={{ marginLeft: "auto" }}
                     onClick={() => {
                       const fieldName = `${filter.name}.value`;
-                      unregister(fieldName); // ✅ Unregister field manually
+                      unregister(fieldName);
 
-                      // ✅ Trigger dirty manually (optional, but safe fallback)
                       setValue("filterName", formValues.filterName, {
                         shouldDirty: true,
                       });
@@ -438,7 +439,7 @@ const FilterForm = ({
               },
             }}
             // onClick={() => setSaveFilterModalOpen(true)}
-            disabled={editMode && !isDirty}
+            // disabled={editMode && !isDirty}
             onClick={() => {
               setSavedFilterModalOpen && setSavedFilterModalOpen(true);
             }}

package/src/libs/hooks/useCraftTable.tsx

@@ -14,7 +14,7 @@ import {
 
 export function useCraftTable(paginationPageSize: number = 25) {
   const [pagination, setPagination] = useState<PaginationState>({
-    pageIndex: 0,
+    pageIndex: 1,
     pageSize: paginationPageSize,
   });
   const [sorting, setSorting] = useState<SortingState>([]);

package/src/libs/utils/common.ts

@@ -101,4 +101,4 @@ api.interceptors.request.use(
   }
 );
 
-export const ENTITY_TYPE = "UPR";
+export const ENTITY_TYPE = "NTM";