rez-table-listing-mui 1.3.42 → 1.3.43

package/package.json

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

package/src/listing/components/filter/components/attributes-filter.tsx

@@ -76,7 +76,7 @@ const AttributesFilter = ({
     } else {
       // Else, replace with new single selection
       const defaultOperator =
-        columnsData?.operation_list[matchingColumn.data_type]?.[0]?.value ||
+        columnsData?.operation_list[matchingColumn.element_type]?.[0]?.value ||
         "in";
 
       const newFilter = {
@@ -173,7 +173,7 @@ const AttributesFilter = ({
           }}
         >
           {columnsData?.column_list
-            ?.filter((column) => column.data_type.includes("select"))
+            ?.filter((column) => column.element_type.includes("select"))
             .map((column, index) => (
               <MenuItem
                 key={index}

package/src/listing/components/filter/components/forms/components/Dropdown.tsx

@@ -59,8 +59,8 @@ const FormDropdown = ({
               field.onChange(e);
 
               if (
-                (filter?.filter_attribute_data_type === "date" ||
-                  filter?.filter_attribute_data_type === "year") &&
+                (filter?.filter_attribute_element_type === "date" ||
+                  filter?.filter_attribute_element_type === "year") &&
                 newOperator !== oldOperator
               ) {
                 if (newOperator === "today") {

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

@@ -62,14 +62,15 @@ const FilterCriteria = ({
   const handleAddFilter = (
     attribute: FilterDataMainFilterEntityWiseCriteriaProps
   ) => {
-    const dropdownOptions = columnsData?.operation_list[attribute?.data_type];
+    const dropdownOptions =
+      columnsData?.operation_list[attribute?.element_type];
 
-    const defaultValue = attribute.data_type === "multiselect" ? [] : "";
+    const defaultValue = attribute.element_type === "multiselect" ? [] : "";
 
     const defaultOperator = dropdownOptions?.[0]?.value || "";
 
     const matchingDropdownList =
-      columnsData?.operation_list[attribute.data_type] || [];
+      columnsData?.operation_list[attribute.element_type] || [];
 
     const newFilter = {
       filter_attribute: attribute.attribute_key,
@@ -82,8 +83,8 @@ const FilterCriteria = ({
       ...newFilter,
       // id: attribute?.id,
       filter_attribute_name: attribute?.name,
-      filter_attribute_data_type:
-        attribute?.data_type || attribute?.element_type,
+      filter_attribute_element_type:
+        attribute?.element_type || attribute?.element_type,
       datasource_list: attribute?.datasource_list,
       dropdown_list: matchingDropdownList,
       filter_entity_name: selectedFilterEntity?.label,
@@ -144,14 +145,11 @@ const FilterCriteria = ({
           >
             <Box
               sx={{
-                maxHeight: filterMaster?.saved_filters?.selectedId
-                  ? `calc(100vh - 601px)`
-                  : `calc(100vh - 440px)`,
+                maxHeight: `calc(100vh - 440px)`,
                 overflowY: "auto",
                 width: "100%",
                 ...filterStyles.scrollbarCustom,
               }}
-              className="filter-criteria-list-box"
             >
               {selectedFilterEntity ? (
                 <FilterCriteriaList

package/src/listing/components/filter/components/forms/components/Textfield.tsx

@@ -33,9 +33,11 @@ const FormTextfield = ({
               padding: "12px 20px",
             },
           }}
-          // type={filter?.filter_attribute_data_type || "text" || "number"}
+          // type={filter?.filter_attribute_element_type || "text" || "number"}
           type={
-            filter?.filter_attribute_data_type === "number" ? "number" : "text"
+            filter?.filter_attribute_element_type === "number"
+              ? "number"
+              : "text"
           }
           placeholder={"Enter value"}
           disabled={isLoading}

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

@@ -70,7 +70,6 @@ const FilterCriteriaList = ({
             onClick={() =>
               !isSingleEntity && setSelectedFilterEntity(undefined)
             }
-            className="cross-icon"
           >
             <CloseIcon />
           </IconButton>

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

@@ -36,7 +36,7 @@ const FilterForm = ({
   handleRemoveFilter,
   editMode = false,
   tableStates,
-  onSaveFilterButtonClick,
+  setSavedFilterModalOpen,
   setDeleteFilterModalOpen,
   onChangeFunction,
   filterComponentOptions,
@@ -48,7 +48,7 @@ const FilterForm = ({
   handleRemoveFilter: (filter_attribute: string) => void;
   editMode?: boolean;
   tableStates: CraftTableOptionsProps;
-  onSaveFilterButtonClick?: () => void;
+  setSavedFilterModalOpen?: React.Dispatch<React.SetStateAction<boolean>>;
   setDeleteFilterModalOpen?: React.Dispatch<React.SetStateAction<boolean>>;
   onChangeFunction: ({
     updatedFilters,
@@ -67,7 +67,6 @@ const FilterForm = ({
     filterComponentOptions?.tabOptions?.mainFilter?.customButtons;
 
   const filterName = filterMaster?.saved_filters?.selectedName || "";
-  const isOwner = filterMaster?.saved_filters?.is_owner || false;
 
   const defaultValues = useMemo(() => {
     const filterValues = filters?.reduce((acc, curr) => {
@@ -253,30 +252,22 @@ const FilterForm = ({
                 />
               )}
             />
-            {isOwner && (
-              <Box onClick={(e) => e.stopPropagation()}>
-                <IconButton
-                  size="small"
-                  onClick={() =>
-                    setDeleteFilterModalOpen && setDeleteFilterModalOpen(true)
-                  }
-                >
-                  <DeleteIcon />
-                </IconButton>
-              </Box>
-            )}
+            <Box onClick={(e) => e.stopPropagation()}>
+              <IconButton
+                size="small"
+                onClick={() =>
+                  setDeleteFilterModalOpen && setDeleteFilterModalOpen(true)
+                }
+              >
+                <DeleteIcon />
+              </IconButton>
+            </Box>
           </Box>
         )}
 
         <Box
           className="filter-criteria-form"
-          sx={{
-            ...filterFormStyles.formFlexContainer,
-            ...(editMode && {
-              maxHeight: "calc(100vh - 570px)",
-              overflowY: "auto",
-            }),
-          }}
+          sx={filterFormStyles.formFlexContainer}
         >
           <FilterCriteria
             columnsData={columnsData}
@@ -451,7 +442,7 @@ const FilterForm = ({
                 },
               }}
               onClick={() => {
-                onSaveFilterButtonClick && onSaveFilterButtonClick();
+                setSavedFilterModalOpen && setSavedFilterModalOpen(true);
               }}
             >
               Save Filter

package/src/listing/components/filter/components/forms/utils/filter-date-input-resolver.tsx

@@ -33,7 +33,7 @@ export const resolveFilterInput = ({
   dropdownData: any;
   updateFiltersFromForm: () => void;
 }) => {
-  const dataType = filter?.filter_attribute_data_type;
+  const dataType = filter?.filter_attribute_element_type;
 
   // TEXT / NUMBER → always textfield
   if (dataType === "text" || dataType === "number") {
@@ -84,9 +84,9 @@ export const resolveFilterInput = ({
 
   // SELECT / MULTISELECT / RADIO / CHECKBOX
   if (
-    filter?.filter_attribute_data_type !== undefined &&
+    filter?.filter_attribute_element_type !== undefined &&
     ["select", "multiselect", "radio", "checkbox"].includes(
-      filter?.filter_attribute_data_type
+      filter?.filter_attribute_element_type
     )
   ) {
     return (

package/src/listing/components/filter/components/main-filter.tsx

@@ -11,7 +11,7 @@ const MainFilter = ({
   columnsData,
   dropdownData,
   tableStates,
-  onSaveFilterButtonClick,
+  setSavedFilterModalOpen,
   onChangeFunction,
   filterComponentOptions,
 }: FilterFormComponentProps) => {
@@ -22,10 +22,10 @@ const MainFilter = ({
   useEffect(() => {
     setFilterMaster(
       (prev) =>
-      ({
-        ...prev,
-        activeFilterTabIndex: 0,
-      } as FilterMasterStateProps)
+        ({
+          ...prev,
+          activeFilterTabIndex: 0,
+        } as FilterMasterStateProps)
     );
   }, []);
 
@@ -61,7 +61,7 @@ const MainFilter = ({
         setSearchTerm={setSearchTerm}
         handleRemoveFilter={handleRemoveFilter}
         tableStates={tableStates}
-        onSaveFilterButtonClick={onSaveFilterButtonClick}
+        setSavedFilterModalOpen={setSavedFilterModalOpen}
         dropdownData={dropdownData}
         onChangeFunction={onChangeFunction}
         filterComponentOptions={filterComponentOptions}

package/src/listing/components/filter/components/saved-edit-filter.tsx

@@ -18,7 +18,7 @@ const SavedFilterEditComponent = ({
   setEditMode,
   searchTerm,
   setSearchTerm,
-  onSaveFilterButtonClick,
+  setSavedFilterModalOpen,
   setDeleteFilterModalOpen,
   onChangeFunction,
   filterComponentOptions,
@@ -30,7 +30,7 @@ const SavedFilterEditComponent = ({
   setEditMode?: React.Dispatch<React.SetStateAction<boolean>>;
   searchTerm?: string;
   setSearchTerm: React.Dispatch<React.SetStateAction<string>>;
-  onSaveFilterButtonClick?: () => void;
+  setSavedFilterModalOpen?: React.Dispatch<React.SetStateAction<boolean>>;
   setDeleteFilterModalOpen?: React.Dispatch<React.SetStateAction<boolean>>;
   onChangeFunction: ({
     updatedFilters,
@@ -62,8 +62,6 @@ const SavedFilterEditComponent = ({
             selectedId: "",
             selectedName: "",
             selectedCode: "",
-            shareWithTeam: false,
-            allowTeamEdit: false,
           },
           activeFilterTabIndex: -1,
         } as FilterMasterStateProps)
@@ -101,7 +99,7 @@ const SavedFilterEditComponent = ({
         dropdownData={dropdownData}
         searchTerm={searchTerm}
         setSearchTerm={setSearchTerm}
-        onSaveFilterButtonClick={onSaveFilterButtonClick}
+        setSavedFilterModalOpen={setSavedFilterModalOpen}
         setDeleteFilterModalOpen={setDeleteFilterModalOpen}
         onChangeFunction={onChangeFunction}
         filterComponentOptions={filterComponentOptions}