feat: Align components in approval pages of Lead (#366)

* Feat dark mode (#363) * feat: change theme to dark mode * fix: dashboard table dark mode * feat-dark mode * feat:dark mode * fix: lead page in dark mode --------- Co-authored-by: AidrinVargheseEXP <aidrin.varghese@experionglobal.com> * Update Allocate.tsx (#365) --------- Co-authored-by: Aidrin Varghese <aidrinv2001@gmail.com> Co-authored-by: AidrinVargheseEXP <aidrin.varghese@experionglobal.com>
getwithashish · Jul 16, 2024 · 981b1e5 · 981b1e5
1 parent 1e6d6b8
commit 981b1e5
Show file tree

Hide file tree

Showing 22 changed files with 195 additions and 489 deletions.
diff --git a/exam_frontend/src/ExamRoutes.tsx b/exam_frontend/src/ExamRoutes.tsx
@@ -27,7 +27,7 @@ import PendingRequestPage from "./pages/PendingRequest/PendingRequestPage";
 const ExamRoutes = () => {
   const { setAuthenticated } = useAuth();
 
-  useLayoutEffect(() => {
+  useEffect(() => {
     const storedValue = localStorage.getItem("jwt");
     if (storedValue) {
       setAuthenticated(true);

diff --git a/exam_frontend/src/components/AssetTable/AssetTableHandler.tsx b/exam_frontend/src/components/AssetTable/AssetTableHandler.tsx
@@ -13,14 +13,23 @@ import {
 } from "./api/getAssetDetails";
 import moment from "moment";
 
+interface Props{
+  userRole?:string;
+  isRejectedPage?:boolean;
+  queryParamProp?:string;
+  heading?:string;
+  isMyApprovalPage?:boolean;
+}
+
+
 const AssetTableHandler = ({
   userRole,
   isRejectedPage,
   queryParamProp,
   heading,
   isMyApprovalPage,
-  assets,
-}) => {
+
+}:Props) => {
   const [selectedRow, setSelectedRow] = useState(null);
   const [drawerVisible, setDrawerVisible] = useState(false);
   const [sortedColumn, setSortedColumn] = useState<string>("");
@@ -67,7 +76,7 @@ const AssetTableHandler = ({
     assetData?.results?.map((item: AssetResult) => item.status) || [];
   const businessUnitOptions =
     assetData?.results?.map(
-      (item: AssetResult) => item.business_unit.business_unit_name
+      (item: AssetResult) => item.business_unit?.business_unit_name
     ) || [];
 
   const { data: locationResults } = useQuery({
@@ -760,7 +769,7 @@ const AssetTableHandler = ({
     status: result.status,
     location: result.location?.location_name,
     invoice_location: result.invoice_location?.location_name,
-    business_unit: result.business_unit.business_unit_name,
+    business_unit: result.business_unit?.business_unit_name,
     os: result.os,
     os_version: result.os_version,
     mobile_os: result.mobile_os,

diff --git a/exam_frontend/src/components/AssetTable/types/index.ts b/exam_frontend/src/components/AssetTable/types/index.ts
@@ -162,6 +162,6 @@ export interface AssetTableProps {
   assetPageDataFetch: any;
   isAssetDataLoading: any;
   totalItemCount: any;
-  userRole: any;
+  userRole?: string;
   isMyApprovalPage: any;
 }
diff --git a/exam_frontend/src/components/AssignAsset/AssetTable/AssetTableHandler.tsx b/exam_frontend/src/components/AssignAsset/AssetTable/AssetTableHandler.tsx
@@ -62,7 +62,7 @@ const AssetTableHandler = ({
 
   const businessUnitOptions =
     assetData?.results?.map(
-      (item: AssetResult) => item.business_unit.business_unit_name
+      (item: AssetResult) => item.business_unit?.business_unit_name
     ) || [];
 
   const { data: locationResults } = useQuery({

diff --git a/exam_frontend/src/components/DashboardAssetTable/DashboardAssetHandler.tsx b/exam_frontend/src/components/DashboardAssetTable/DashboardAssetHandler.tsx
@@ -90,7 +90,7 @@ const DashboardAssetHandler = ({
 
   const businessUnitOptions =
     assetData?.results?.map(
-      (item: AssetResult) => item.business_unit.business_unit_name
+      (item: AssetResult) => item.business_unit?.business_unit_name
     ) || [];
 
   const { data: locationResults } = useQuery({
@@ -825,7 +825,7 @@ const DashboardAssetHandler = ({
       status: result.status,
       location: result.location?.location_name,
       invoice_location: result.invoice_location?.location_name,
-      business_unit: result.business_unit.business_unit_name,
+      business_unit: result.business_unit?.business_unit_name,
       os: result.os,
       os_version: result.os_version,
       mobile_os: result.mobile_os,