rez-table-listing-mui 2.0.13 → 2.0.15

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

@@ -1,4 +1,4 @@
-import { api, MAPPED_ENTITY_TYPE } from "./common";
+import { api, APP_CODE, MAPPED_ENTITY_TYPE } from "./common";
 import {
   createSavedFilterPayload,
   deleteSavedFilterPayload,
@@ -142,11 +142,20 @@ export const saveSettingsData = async (payload: any) => {
   }
 };
 
-export const getSettingsData = async (entity_type: any) => {
+export const getSettingsData = async (entity_type: string, type: string) => {
+  let url = `/meta/layout-preference`;
+
+  // if (entity_type === USER || entity_type === ROLE || entity_type === ORGP) {
+  //   url = `sso/layout`;
+  // }
+
+  const params = {
+    entity_type: entity_type,
+    type: type,
+  };
+
   try {
-    const response = await api.get(
-      `meta/layout-preference?entity_type=${entity_type}`
-    );
+    const response = await api.get(url, { params });
     return response.data;
   } catch (error) {
     console.error("Failed to fetch settings data:", error);
@@ -225,7 +234,7 @@ export const getAttributes = async (
 };
 
 export const getTableTabs = async (payload: any) => {
-  const response = await api.post(`filter/adm/tabs`, payload);
+  const response = await api.post(`filter/${APP_CODE}/tabs`, payload);
   return response.data;
 };
 
@@ -263,3 +272,49 @@ export const newCommonGetDropdownDataAPI = async ({
     .post(`entity/getAttributeDropdown${queryString}`, requestBody)
     .then((response) => response.data);
 };
+
+export const commonFetchDropdownDataAPI = async ({
+  entity_type,
+  enterprise_id,
+  data,
+  inactiveIds,
+  parentId,
+}: {
+  entity_type: string | undefined;
+  enterprise_id?: string | null;
+  data?: any;
+  inactiveIds?: string | null;
+  parentId?: number | string;
+}) => {
+  const requestBody = {
+    // status: "ACTIVE",
+    enterprise_id,
+    ...data,
+  };
+
+  let params = "";
+
+  const queryParams: string[] = [];
+
+  if (!Number.isNaN(Number(inactiveIds)) && inactiveIds) {
+    queryParams.push(`inactiveIds=${inactiveIds}`);
+  }
+
+  if (parentId !== undefined && parentId !== null) {
+    queryParams.push(`parent=${parentId}`);
+  }
+
+  if (queryParams.length > 0) {
+    params = `?${queryParams.join("&")}`;
+  }
+  // if (entity_type === "ORGP") {
+  //   return await api.get(`organization/sso/getdropdown`).then((response) => {
+  //     return response.data;
+  //   });
+  // }
+  return await api
+    .post(`entity/getListMasterDropdown/${entity_type}${params}`, requestBody)
+    .then((response) => {
+      return response.data;
+    });
+};

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

@@ -77,14 +77,16 @@ export function customDebounce<T extends (...args: any[]) => any>(
 }
 
 //ENTITY TYPE
-const ENVIRONMENT = "adm_dev";
-export const ENTITY_TYPE = "SCH";
+const ENVIRONMENT = "crm_dev";
+export const ENTITY_TYPE = "LEAD";
+export const MODULE_CODE = "school_adm_org";
 export const MAPPED_ENTITY_TYPE = "LYPR"; // LAP OR LYPR
 export const USER_ID = 226;
+export const APP_CODE = "crm";
 
 const environments = {
   adm_dev: "http://localhost:6010/api",
-  crm_dev: "http://localhost:4011/api",
+  crm_dev: "http://localhost:6011/api",
   uat: "https://api.eth-qa.rezolut.in/api/enrol",
 };
 

package/src/listing/types/common.ts

@@ -65,6 +65,7 @@ export interface EntityTableAPIProps {
     filter_value: string[] | string;
   }[];
   flatJson: boolean;
+  module_code?: string;
 }
 
 export interface viewSettingsDropDownAPIProps {

package/src/listing/types/filter-settings.ts

@@ -19,6 +19,11 @@ export interface QuickFilterModalProps {
   tabsApiDataLoading?: boolean;
   onSaveSettingsData?: (data: any) => void;
   activeTab?: string;
+  selectAttributeData?: { label: string; value: string }[];
+  selectSwinLandData?: { label: string; value: string }[];
+  laneHideListData?: { label: string; value: string }[];
+  swimLaneHideListData?: { label: string; value: string }[];
+  onSaveKanbanSettingsData?: (data: KanbanSettingsDataProps) => void;
 }
 
 type TabName = string;
@@ -31,6 +36,15 @@ export type QuickTabSortingType =
   | "count_dsc"
   | "custom";
 
+export type KanbanSortingType =
+  | "asc"
+  | "dsc"
+  | "count_asc"
+  | "count_dsc"
+  | "custom"
+  | "sort_by"
+  | null;
+
 export interface QuickTabConfigProps {
   attribute?: string;
   sorting?: QuickTabSortingType;
@@ -39,6 +53,19 @@ export interface QuickTabConfigProps {
   isAllSelected?: boolean;
   isCombineOther?: boolean;
 }
+export interface LaneTabConfigProps {
+  attribute?: string;
+  sorting?: KanbanSortingType;
+  hide_list?: { label: string; value: string }[];
+  show_list?: { label: string; value: string }[];
+  isSubLane?: boolean;
+}
+export interface SwimLameTabConfigProps {
+  attribute?: string;
+  sorting?: KanbanSortingType;
+  hide_list?: { label: string; value: string }[];
+  show_list?: { label: string; value: string }[];
+}
 
 interface ColumnItem {
   label: string;
@@ -115,6 +142,10 @@ export interface SettingsDataProps {
   column?: ColumnTabConfigProps;
   sorting?: SortingConfigProps;
 }
+export interface KanbanSettingsDataProps {
+  lane?: LaneTabConfigProps;
+  swim_lane?: SwimLameTabConfigProps;
+}
 
 export interface ToggleButtonTabsProps {
   label: string;

package/src/listing/types/filter.ts

@@ -55,7 +55,8 @@ export type FilterInputDataTypes =
   | "multiselect"
   | "date"
   | "year"
-  | "number";
+  | "number"
+  | "label";
 
 export interface FilterColumnsListProps {
   created_date: string | null;

package/src/listing/types/table-options.ts

@@ -15,6 +15,7 @@ import {
 } from "./filter";
 import {
   ColumnTabConfigProps,
+  KanbanSettingsDataProps,
   QuickTabConfigProps,
   SavedButtonErrorProps,
   SettingsDataProps,
@@ -61,6 +62,8 @@ export interface CraftTableOptionsProps {
 export interface craftTableFilterSettingsOptionsProps {
   settingsData: SettingsDataProps;
   setSettingsData: Dispatch<SetStateAction<SettingsDataProps>>;
+  kanbanSettingsData: KanbanSettingsDataProps;
+  setKanbanSettingsData: Dispatch<SetStateAction<KanbanSettingsDataProps>>;
   showListViewSettings: boolean;
   setShowListViewSettings: Dispatch<SetStateAction<boolean>>;
   quickTabStates: QuickTabConfigProps;

package/src/view/KanbanView.tsx

@@ -1,21 +1,53 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import Kanban from "../kanban";
 import LeadCard from "../kanban/components/LeadCard";
-import { useGetKanbanData } from "../kanban/hooks/hooks";
+import {
+  kanbanDropdownResults,
+  useGetAttributeDropdown,
+  useGetKanbanData,
+} from "../kanban/hooks/hooks";
 import { useCraftTable } from "../listing/libs/hooks/useCraftTable";
 import {
   useEntityTableAPI,
   useGetSettingsDataAPI,
+  useSaveSettingsDataAPI,
 } from "../listing/libs/hooks/useEntityTableAPI";
-import { ENTITY_TYPE } from "../listing/libs/utils/common";
+import { ENTITY_TYPE, MAPPED_ENTITY_TYPE } from "../listing/libs/utils/common";
 import { useCraftTableFilterSettings } from "../listing/libs/hooks/useCraftTableFilterSettings";
 import { QuickFilterSettings } from "../listing/components/table-settings";
+import { KanbanSettingsDataProps } from "../listing/types/filter-settings";
+import { useQueryClient } from "@tanstack/react-query";
 
 const KanbanView = () => {
   const { metaData, isLoading } = useGetKanbanData("LEAD");
-  const { getSettingsAPIData } = useGetSettingsDataAPI(ENTITY_TYPE);
+  const { getSettingsAPIData } = useGetSettingsDataAPI(ENTITY_TYPE, "kanban");
   const [selectedTab, setSelectedTab] = useState("All");
   const tableStates = useCraftTable();
+
+  const filterSettingStates = useCraftTableFilterSettings();
+
+  const {
+    showListViewSettings,
+    setShowListViewSettings,
+    kanbanSettingsData,
+    setKanbanSettingsData,
+  } = filterSettingStates;
+
+  const { data: laneHideListData } = useGetAttributeDropdown(
+    "LEAD",
+    kanbanSettingsData?.lane?.attribute ?? ""
+  );
+  const { data: swimLaneHideListData } = useGetAttributeDropdown(
+    "LEAD",
+    kanbanSettingsData?.swim_lane?.attribute ?? ""
+  );
+  const queryClient = useQueryClient();
+
+  const [selectAttributeData] = kanbanDropdownResults("ATT", "1001");
+  const [selectSwinLandData] = kanbanDropdownResults("SWM", "1001");
+  const { saveSettingsDataMutation: saveKanbanSettingsDataMutation } =
+    useSaveSettingsDataAPI(ENTITY_TYPE);
+
   const { tableData } = useEntityTableAPI({
     page: 0,
     size: 20,
@@ -36,10 +68,36 @@ const KanbanView = () => {
     ],
     attributeFilter: [],
   });
-  const filterSettingStates = useCraftTableFilterSettings();
 
-  const { showListViewSettings, setShowListViewSettings, setSettingsData } =
-    filterSettingStates;
+  const handleSaveKanbanSetSettingsData = (
+    kanbanSettingsData: KanbanSettingsDataProps
+  ) => {
+    console.log("kanbanSettingsData", kanbanSettingsData);
+
+    const payload = {
+      entity_type: MAPPED_ENTITY_TYPE,
+      mapped_entity_type: ENTITY_TYPE,
+      mapped_json: kanbanSettingsData,
+      type: "kanban",
+    };
+
+    saveKanbanSettingsDataMutation.mutate(
+      { payload },
+      {
+        onSuccess: () => {
+          queryClient.invalidateQueries({
+            queryKey: ["GET_NAVIGATION_LAYOUT", ENTITY_TYPE],
+          });
+          queryClient.invalidateQueries({
+            queryKey: ["meta", ENTITY_TYPE],
+          });
+        },
+      }
+    );
+  };
+  useEffect(() => {
+    setKanbanSettingsData(getSettingsAPIData?.mapped_json || {});
+  }, [getSettingsAPIData]);
 
   return (
     <div>
@@ -57,6 +115,11 @@ const KanbanView = () => {
         onClose={() => setShowListViewSettings(false)}
         columnsData={metaData || {}}
         columnsDataLoading={isLoading}
+        selectAttributeData={selectAttributeData?.data}
+        selectSwinLandData={selectSwinLandData?.data}
+        laneHideListData={laneHideListData}
+        swimLaneHideListData={swimLaneHideListData}
+        onSaveKanbanSettingsData={handleSaveKanbanSetSettingsData}
         // tabsApiData={settingsTabDropdownData || []}
         // tabsApiDataLoading={settingsTabDropdownPending}
         // onSaveSettingsData={handleSaveSettingsData}

package/src/view/ListingView.tsx

@@ -10,6 +10,7 @@ import {
   ENTITY_TYPE,
   formatTableHeaders,
   MAPPED_ENTITY_TYPE,
+  MODULE_CODE,
 } from "../listing/libs/utils/common";
 import {
   useCommonFilterDropdownAPI,
@@ -135,7 +136,7 @@ function ListingView() {
     // }, 1000);
 
     fetchMeta();
-  }, [selectedTab]);
+  }, [selectedTab, metaQuery?.data]);
 
   // useEffect(() => {
   //   setFilters(detailsQuery.data ?? []);
@@ -187,6 +188,7 @@ function ListingView() {
     ],
     attributeFilter: [],
     flatJson: metaQuery.data?.is_flat_json || false,
+    // module_code: MODULE_CODE,
   });
 
   const newData = useMemo(
@@ -381,24 +383,7 @@ function ListingView() {
     );
   };
 
-  return isTableDataPending ? (
-    <Box
-      sx={{
-        // full viewport height
-        display: "flex",
-        flexDirection: "column",
-        alignItems: "center",
-        justifyContent: "center",
-        gap: 2,
-        bgcolor: "background.default",
-      }}
-    >
-      <CircularProgress size={60} thickness={5} color="primary" />
-      <Typography variant="body1" color="text.secondary">
-        Loading, please wait...
-      </Typography>
-    </Box>
-  ) : (
+  return (
     <TableWrapper
       data={filteredData}
       activeTab={selectedTab}
@@ -528,7 +513,7 @@ function ListingView() {
         ),
         searchValue: searchTerm,
         onSearchChange: (val) => setSearchTerm(val),
-        showFilterToggle: false,
+        showFilterToggle: true,
         onFilterButtonClick: () =>
           tableStates.setShowTableFilter(!tableStates.showTableFilter),
         showColumnToggle: false,