From 596e94edab4ac27f5ff0b3bddecc447265253fed Mon Sep 17 00:00:00 2001
From: Mantri Ramkishor <mantri.ramkishor@navi.com>
Date: Tue, 26 Dec 2023 22:44:25 +0530
Subject: [PATCH] Revert "TP-52028 | Filters on Map are resetting on reload
 (#757)" (#760)

This reverts commit 40c48ae63618ce7e63e1d6a4f4507479742bf3a8.
---
 src/layout/DefaultLayout.module.scss                      | 8 +++-----
 src/layout/DefaultLayout.tsx                              | 1 -
 .../AgencyPincodeMapping/components/DataTable/index.tsx   | 7 ++++---
 .../LiveLocationTracker/components/TopBar/Filters.tsx     | 5 ++---
 src/pages/LiveLocationTracker/components/TopBar/index.tsx | 5 +++++
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/layout/DefaultLayout.module.scss b/src/layout/DefaultLayout.module.scss
index f378ede6..4e9fdcfb 100644
--- a/src/layout/DefaultLayout.module.scss
+++ b/src/layout/DefaultLayout.module.scss
@@ -65,14 +65,12 @@
 .mainContent {
   margin-left: calc(var(--sidenav-width-close)); // sidenav bar width
   width: calc(100% - var(--sidenav-width-close));
-  height: 100%;
+  height: calc(
+    100% - 58px
+  ); // 58px is the height of the topnav bar, 40px is the height of the sticky banner
   overflow-y: auto;
 }
 
-.mainContentWithTopBar {
-  height: calc(100% - 58px); // 58px is the height of the topnav bar
-}
-
 .mainContentWithStickyBanner {
   height: calc(
     100% - 58px - 36px
diff --git a/src/layout/DefaultLayout.tsx b/src/layout/DefaultLayout.tsx
index 48fda32d..007e3061 100644
--- a/src/layout/DefaultLayout.tsx
+++ b/src/layout/DefaultLayout.tsx
@@ -303,7 +303,6 @@ function DefaultLayout() {
         <div
           className={cx(styles.mainContent, {
             [styles.noScroll]: shouldShowScroll,
-            [styles.mainContentWithTopBar]: !hideTopNavBarRoutes,
             [styles.mainContentWithStickyBanner]: shouldShowStickyBanner
           })}
         >
diff --git a/src/pages/AgencyPincodeMapping/components/DataTable/index.tsx b/src/pages/AgencyPincodeMapping/components/DataTable/index.tsx
index 83f781eb..4ad79fb9 100644
--- a/src/pages/AgencyPincodeMapping/components/DataTable/index.tsx
+++ b/src/pages/AgencyPincodeMapping/components/DataTable/index.tsx
@@ -1,12 +1,13 @@
-import React, { useEffect, useState } from 'react';
+import React, { Suspense, useEffect, useState } from 'react';
 import GridRow from '../../../../../web-ui-library/src/layouts/Grid/GridRow/GridRow';
 import GridColumn from '../../../../../web-ui-library/src/layouts/Grid/GridColumn/GridColumn';
+import styles from '../../../Cases/components/Cases.module.scss';
 import Pagination from '@components/Pagination';
 import { DropDownPosition } from '@components/Pagination/constant';
 import DataTableHeader from '../DataTableHeader';
 import axiosInstance, { ApiKeys, getApiUrl } from '../../../../utils/ApiHelper';
 import { useSelector } from 'react-redux';
-import { AgencySummary } from '../../types';
+import { AgencySummary, Serviceability } from '../../types';
 import { RootState } from '@cp/src/store';
 import Loader from '../../../../components/Loader/Loader';
 import toProperCase from '@cp/src/utils/toProperCase';
@@ -106,7 +107,7 @@ function DataTable({ openUploadDialog }: DataTableProps) {
       </GridRow>
 
       <GridRow className="no-gutters">
-        <GridColumn md={12} className={'h-[calc(100vh-210px)]'}>
+        <GridColumn md={12} className={styles.cases__table}>
           <AgTable
             defaultColDef={{
               suppressMovable: true
diff --git a/src/pages/LiveLocationTracker/components/TopBar/Filters.tsx b/src/pages/LiveLocationTracker/components/TopBar/Filters.tsx
index eb9c80b6..7faa0bb0 100644
--- a/src/pages/LiveLocationTracker/components/TopBar/Filters.tsx
+++ b/src/pages/LiveLocationTracker/components/TopBar/Filters.tsx
@@ -72,6 +72,7 @@ const Filters = () => {
         return;
       }
 
+      // If selected agency is inhouse, anyway get the agent locations
       if (filterType === FilterTypes.AGENCY) {
         dispatch(getAgentsLocations(pinsPayload));
       }
@@ -86,9 +87,7 @@ const Filters = () => {
       applyFilterRecursively(nextFilter);
     };
 
-    if (!filterData[FilterTypes.AGENCY]?.data[0]?.value) {
-      applyFilterRecursively(FilterTypes.AGENCY);
-    }
+    if (!queryParams?.AGENTID) applyFilterRecursively(FilterTypes.AGENCY);
   }, [searchParams, filters]);
 
   const handleFilterChange = (value: string, filterType: FilterTypes) => {
diff --git a/src/pages/LiveLocationTracker/components/TopBar/index.tsx b/src/pages/LiveLocationTracker/components/TopBar/index.tsx
index dd958733..caebad02 100644
--- a/src/pages/LiveLocationTracker/components/TopBar/index.tsx
+++ b/src/pages/LiveLocationTracker/components/TopBar/index.tsx
@@ -57,6 +57,11 @@ function TopBar() {
     if (!selectedAgency) {
       return true;
     }
+    const isInhouseAgencySelected =
+      queryParams[FilterTypes.AGENCY] === INHOUSE_AGENCY_CODE.toString();
+    if (!isInhouseAgencySelected && !queryParams[FilterTypes.TEAM_LEAD]) {
+      return true;
+    }
     return false;
   }, [selectedAgency, queryParams?.TEAM_LEAD, queryParams?.AGENCY]);