rez-table-listing-mui 1.3.38 → 1.3.39

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

@@ -15,7 +15,6 @@ import AttributesFilter from "./components/attributes-filter";
 import { filterStyles } from "./style";
 import { deepMergeObjects } from "../../libs/utils/deep-merge-objects";
 import SingleFilterRendering from "./components/single-filter-rendering";
-import SavedFilterModalView from "../common/saved-filter-modal";
 
 export function TableFilter({
   onClose,
@@ -33,8 +32,6 @@ export function TableFilter({
 
   // remove this
   const [saveFilterModalOpen, setSaveFilterModalOpen] = useState(false);
-  const [savedFilterModalOpen, setSavedFilterModalOpen] = useState(false);
-
   const [deleteFilterModalOpen, setDeleteFilterModalOpen] = useState(false);
 
   const [searchTerm, setSearchTerm] = useState<string>("");
@@ -117,97 +114,6 @@ export function TableFilter({
     type: "text",
   };
 
-  const hasSavedFilterRecords = Boolean(columnsData?.saved_filter?.length);
-
-  // const handleSaveFilterButtonClick = () => {
-  //   if (editMode) {
-  //     setSavedFilterModalOpen(true);
-  //     return;
-  //   }
-
-  //   setSavedFilterModalOpen(true);
-  // };
-
-  // const handleSaveFilterButtonClick = () => {
-  //   // Reset filterMaster fields when creating a new filter
-  //   if (!editMode) {
-  //     setFilterMaster((prev) => ({
-  //       ...prev,
-  //       saved_filters: {
-  //         selectedId: "",
-  //         selectedName: "",
-  //         selectedCode: "",
-  //         description: "",
-  //         shareWithTeam: false,
-  //         allowTeamEdit: false,
-  //       },
-  //     }));
-  //   }
-
-  //   setSavedFilterModalOpen(true);
-  // };
-
-  const handleSaveFilterButtonClick = () => {
-    if (!editMode) {
-      setFilterMaster((prev) => {
-        if (!prev) return prev;
-
-        return {
-          ...prev,
-          saved_filters: {
-            ...prev.saved_filters,
-            shareWithTeam: false,
-            allowTeamEdit: false,
-          },
-        };
-      });
-    }
-
-    setSavedFilterModalOpen(true);
-  };
-
-  const handleSavedFilterModalSave = () => {
-    const selectedId = filterMaster?.saved_filters?.selectedId;
-    const selectedName = filterMaster?.saved_filters?.selectedName || "";
-    const description = filterMaster?.saved_filters?.description || "";
-
-    const selectedCode = filterMaster?.saved_filters?.selectedCode;
-
-    const newFilterMasterState = {
-      ...filterMaster,
-      saved_filters: {
-        ...(filterMaster?.saved_filters ?? {}),
-        selectedId,
-        selectedName,
-        selectedCode,
-        description,
-      },
-    } as FilterMasterStateProps;
-
-    setFilterMaster(newFilterMasterState);
-
-    const newState = {
-      filterMaster: newFilterMasterState,
-      filters,
-    };
-
-    onChangeFunction && onChangeFunction(newState);
-
-    if (editMode) {
-      onUpdateFilter && onUpdateFilter(selectedName);
-      const isSingleSavedFilterEditMode =
-        filterComponentOptions?.tabOptions?.savedFilter?.editMode;
-      if (!isSingleSavedFilterEditMode) {
-        setEditMode(false);
-      }
-    } else {
-      onSaveFilter && onSaveFilter(selectedName);
-      setTabValue(1);
-    }
-
-    setSavedFilterModalOpen(false);
-  };
-
   const handleTabChange = (_: React.SyntheticEvent, newValue: number) => {
     const tabType = tabMapping[newValue]?.label;
 
@@ -216,22 +122,6 @@ export function TableFilter({
     }
 
     setTabValue(newValue);
-    if (newValue === 0) {
-      setFilterMaster((prev) => {
-        if (!prev) return prev;
-        return {
-          ...prev,
-          saved_filters: {
-            ...(prev.saved_filters ?? {}),
-            selectedId: "",
-            selectedName: "",
-            description: "",
-            is_shared: false,
-            is_editable: false,
-          },
-        };
-      });
-    }
 
     if (tabType === "Filter") {
       setEditMode(false);
@@ -254,12 +144,9 @@ export function TableFilter({
 
     if (tabType?.label === "Saved Filter") {
       patches.saved_filters = {
-        ...(filterMaster?.saved_filters ?? {}),
         selectedId: "",
         selectedName: "",
         selectedCode: "",
-        is_shared: undefined,
-        is_editable: undefined,
       };
     } else if (tabType?.label === "Attributes") {
       patches.attributes = { radio: [], selected: "" };
@@ -331,7 +218,7 @@ export function TableFilter({
           {...commonProps}
           {...savedFilterProps}
           {...attributesProps}
-          onSaveFilterButtonClick={handleSaveFilterButtonClick}
+          setSavedFilterModalOpen={setSaveFilterModalOpen}
           filterComponentOptions={finalComponentOptions}
         />
       )}
@@ -344,7 +231,7 @@ export function TableFilter({
         >
           <MainFilter
             {...commonProps}
-            onSaveFilterButtonClick={handleSaveFilterButtonClick}
+            setSavedFilterModalOpen={setSaveFilterModalOpen}
             filterComponentOptions={finalComponentOptions}
           />
         </CustomTabPanel>
@@ -359,7 +246,7 @@ export function TableFilter({
           <SavedFilter
             {...commonProps}
             {...savedFilterProps}
-            onSaveFilterButtonClick={handleSaveFilterButtonClick}
+            setSavedFilterModalOpen={setSaveFilterModalOpen}
             filterComponentOptions={finalComponentOptions}
           />
         </CustomTabPanel>
@@ -411,17 +298,14 @@ export function TableFilter({
                     inputValue || filterMaster?.saved_filters?.selectedName;
                   const selectedCode =
                     filterMaster?.saved_filters?.selectedCode;
-                  const description =
-                    inputValue || filterMaster?.saved_filters?.description;
 
                   const newFilterMasterState = {
                     ...filterMaster,
                     saved_filters: {
-                      ...(filterMaster?.saved_filters ?? {}),
+                      ...filterMaster?.attributes,
                       selectedId,
                       selectedName,
                       selectedCode,
-                      description,
                     },
                   } as FilterMasterStateProps;
 
@@ -545,7 +429,7 @@ export function TableFilter({
                   const newFilterMasterState = {
                     ...filterMaster,
                     saved_filters: {
-                      ...(filterMaster?.saved_filters ?? {}),
+                      ...filterMaster?.attributes,
                       selectedId,
                       selectedName,
                       selectedCode,
@@ -636,15 +520,6 @@ export function TableFilter({
           maxWidth="xs"
         />
       )}
-      <SavedFilterModalView
-        open={savedFilterModalOpen}
-        onClose={() => setSavedFilterModalOpen(false)}
-        onSave={handleSavedFilterModalSave}
-        filterMaster={tableStates.filterMaster}
-        setFilterMaster={tableStates.setFilterMaster}
-        hasSavedFilters={hasSavedFilterRecords}
-        columnsData={columnsData}
-      />
     </Box>
   );
 }

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

@@ -7,9 +7,9 @@ const LoginButton = () => {
 
   const handleLogin = async () => {
     setLoading(true);
-    const api_url = "https://api.eth-qa.rezolut.in/api/enrol/auth";
-    // const api_url = "http://localhost:6011/api/auth";
-    const email_id = "shraddha.nandurkar@rezolut.in";
+    const api_url = "https://api.eth-qa.rezolut.in/api/admin/auth";
+    // const api_url = "http://localhost:4011/api/admin/auth";
+    const email_id = "kartik.shetty@rezolut.in";
     const email_otp = "123456";
     const sub_domain = "universal";
 
@@ -21,6 +21,8 @@ const LoginButton = () => {
         subdomain: sub_domain,
       })
       .then(async (emailAPIResponse) => {
+        console.log(emailAPIResponse.data);
+
         await axios
           .post(`${api_url}/sso/otp/generate`, {
             identifier: email_id,
@@ -38,6 +40,7 @@ const LoginButton = () => {
                 subdomain: "universal",
               })
               .then((otpVerifyResponse) => {
+                console.log(otpVerifyResponse.data);
                 const token = otpVerifyResponse.data.accessToken;
 
                 if (token) {

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

@@ -163,12 +163,9 @@ export const useDeleteFilterAPI = (tableStates: CraftTableOptionsProps) => {
         const newFilterMasterState = {
           ...filterMaster,
           saved_filters: {
-            ...(filterMaster?.saved_filters ?? {}),
             selectedId: "",
             selectedName: "",
             selectedCode: "",
-            shareWithTeam: undefined,
-            allowTeamEdit: undefined,
           },
           activeFilterTabIndex: -1,
         };

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

@@ -80,7 +80,6 @@ export function customDebounce<T extends (...args: any[]) => any>(
 const ENVIRONMENT = "uat";
 export const ENTITY_TYPE = "LEAD";
 export const MAPPED_ENTITY_TYPE = "LYPR"; // LAP OR LYPR
-export const USER_ID = 226;
 
 const environments = {
   adm_dev: "http://localhost:4010/api",

package/src/listing/types/filter.ts

@@ -15,38 +15,6 @@ export interface FilterOperationListProps {
   code: string;
   label: string;
   value: string;
-  is_shared: boolean;
-  is_editable: boolean;
-  is_owner: boolean;
-  created_by: string;
-  // user_id: number;
-  description: string | null;
-}
-
-export interface FilterSharedListProps {
-  created_date: string; // ISO date string
-  entity_type: string;
-  id: string;
-  name: string;
-  status: string;
-  parent_type: string | null;
-  parent_id: string | number | null;
-  code: string;
-  created_by: string;
-  modified_by: string | null;
-  modified_date: string | null;
-  enterprise_id: number;
-  organization_id: number;
-  appcode: string | null;
-  level_id: string;
-  level_type: string;
-  mapped_entity_type: string;
-  user_id: number;
-  is_default: boolean;
-  filter_scope: string;
-  is_shared: boolean;
-  is_editable: boolean | string; // API gives "true" (string) so support both
-  description: string | null;
 }
 
 export type FilterInputDataTypes =
@@ -90,7 +58,6 @@ export interface FilterColumnsDataProps {
   column_list: FilterColumnsListProps[];
   operation_list: OperationMapProps;
   saved_filter: FilterOperationListProps[];
-  shared_filter: FilterOperationListProps[];
 }
 
 export interface FilterDropdownDataProps {
@@ -248,7 +215,6 @@ export interface createSavedFilterPayload {
   enterprise_id?: number;
   user_id?: number;
   is_default: boolean;
-  description: string | null;
   mapped_entity_type: string;
   status?: string;
   entity_type: string;
@@ -268,7 +234,6 @@ export interface updateSavedFilterPayload {
   name: string;
   is_default: boolean;
   id: string | number;
-
   status?: string;
   entity_type: string;
   mapped_entity_type: string;
@@ -277,14 +242,12 @@ export interface updateSavedFilterPayload {
 
 export interface FilterFormComponentProps {
   columnsData: FilterColumnsDataProps;
-  saved_filter?: any;
-  shared_filter?: any;
   dropdownData: FilterDropdownDataProps;
   tableStates: CraftTableOptionsProps;
   editMode?: boolean;
   setEditMode?: React.Dispatch<React.SetStateAction<boolean>>;
   setDeleteFilterModalOpen?: React.Dispatch<React.SetStateAction<boolean>>;
-  onSaveFilterButtonClick?: () => void;
+  setSavedFilterModalOpen?: React.Dispatch<React.SetStateAction<boolean>>;
   tabValue?: number;
   onChangeFunction: ({
     updatedFilters,
@@ -293,11 +256,6 @@ export interface FilterFormComponentProps {
   filterComponentOptions?: FilterComponentOptions;
 }
 
-export interface SavedFilterSharingPreference {
-  shareWithTeam?: boolean;
-  allowTeamEdit?: boolean;
-}
-
 export interface FilterMasterStateProps {
   attributes: {
     selected: string;
@@ -307,13 +265,8 @@ export interface FilterMasterStateProps {
     selectedId: string;
     selectedName: string;
     selectedCode?: string;
-    description?: string;
-    is_shared?: boolean;
-    is_editable?: boolean;
-    is_owner?: boolean;
   };
   activeFilterTabIndex: number;
-  shared_filters_meta?: Record<string, SavedFilterSharingPreference>;
 }
 
 export interface AttributesFilterProps {

package/src/view/FIlterWrapper.tsx

@@ -87,9 +87,6 @@ const CraftTableFilterWrapper = ({
   // API to handle saving a filter
   const handleSaveFilter = (name: string) => {
     const quickFilter = filters.map((f: any) => ({ ...f }));
-    const shareWithTeam = filterMaster?.saved_filters?.is_shared ?? false;
-    const allowTeamEdit = filterMaster?.saved_filters?.is_editable ?? false;
-    const description = filterMaster?.saved_filters?.description ?? "";
 
     const payload = {
       name,
@@ -97,10 +94,7 @@ const CraftTableFilterWrapper = ({
       mapped_entity_type: ENTITY_TYPE, // For that entity type
       status: "ACTIVE",
       entity_type: "SFM", // FIXED entity type
-      description: description,
       filterDetails: quickFilter,
-      is_shared: shareWithTeam,
-      is_editable: allowTeamEdit,
     };
     const entity_type = "SFM";
     savedMutation.mutate(
@@ -117,9 +111,6 @@ const CraftTableFilterWrapper = ({
                     ...prev?.saved_filters,
                     selectedId: newFilterId.toString(),
                     selectedName: name,
-                    description: description,
-                    is_shared: shareWithTeam,
-                    is_editable: allowTeamEdit,
                   },
                   activeFilterTabIndex: 1,
                 } as FilterMasterStateProps)
@@ -136,9 +127,6 @@ const CraftTableFilterWrapper = ({
       filter_operator: f.filter_operator,
       filter_value: f.filter_value,
     }));
-    const shareWithTeam = filterMaster?.saved_filters?.is_shared ?? false;
-    const allowTeamEdit = filterMaster?.saved_filters?.is_editable ?? false;
-    const description = filterMaster?.saved_filters?.description ?? "";
 
     const payload = {
       name: filterMaster?.saved_filters?.selectedName, // Name of the filter
@@ -146,11 +134,8 @@ const CraftTableFilterWrapper = ({
       id: filterMaster?.saved_filters?.selectedId,
       mapped_entity_type: ENTITY_TYPE,
       status: "ACTIVE",
-      description: description,
       entity_type: "SFM",
       filterDetails: quickFilter,
-      is_shared: shareWithTeam, // Now true/false from state
-      is_editable: allowTeamEdit,
     };
     const entity_type = "SFM";
     updateMutation.mutate({ entity_type, payload });

package/src/view/ListingView.tsx

@@ -280,7 +280,7 @@ function ListingView() {
       entity_type: MAPPED_ENTITY_TYPE,
       mapped_entity_type: ENTITY_TYPE,
       mapped_json: data,
-      type: "filter",
+      type: "layout",
     };
 
     await saveLayoutAPI(payload);