From c91fc277b4c1ca9b741636493cb816c0cba24b8f Mon Sep 17 00:00:00 2001 From: Ray Wang <134452344+ray-oxd@users.noreply.github.com> Date: Tue, 26 Mar 2024 13:31:47 -0700 Subject: [PATCH] DBC22-1829: removed routeEdit state (#342) --- .../src/Components/map/LocationSearch.js | 3 +-- src/frontend/src/Components/map/RouteSearch.js | 6 ++---- src/frontend/src/pages/CamerasListPage.js | 10 +--------- src/frontend/src/pages/EventsListPage.js | 16 ++-------------- 4 files changed, 6 insertions(+), 29 deletions(-) diff --git a/src/frontend/src/Components/map/LocationSearch.js b/src/frontend/src/Components/map/LocationSearch.js index 533957c22..47acf9c23 100644 --- a/src/frontend/src/Components/map/LocationSearch.js +++ b/src/frontend/src/Components/map/LocationSearch.js @@ -16,7 +16,7 @@ export default function LocationSearch(props) { // Redux const dispatch = useDispatch(); - const { placeholder, location, action, routeEdit } = props; + const { placeholder, location, action } = props; const [isSearching, setSearching] = useState(false); const [options, setLocationOptions] = useState([]); @@ -44,7 +44,6 @@ export default function LocationSearch(props) { // Rendering return ( true} diff --git a/src/frontend/src/Components/map/RouteSearch.js b/src/frontend/src/Components/map/RouteSearch.js index 6b22b4ee4..a7045f218 100644 --- a/src/frontend/src/Components/map/RouteSearch.js +++ b/src/frontend/src/Components/map/RouteSearch.js @@ -22,8 +22,6 @@ import Spinner from 'react-bootstrap/Spinner'; import './RouteSearch.scss'; export default function RouteSearch(props) { - const { routeEdit } = props; - // Redux const dispatch = useDispatch(); const { searchLocationFrom, searchLocationTo } = useSelector(useCallback(memoize(state => ({ @@ -88,7 +86,7 @@ export default function RouteSearch(props) { } - + {!!searchLocationFrom.length && @@ -97,7 +95,7 @@ export default function RouteSearch(props) { - + {showSpinner && diff --git a/src/frontend/src/pages/CamerasListPage.js b/src/frontend/src/pages/CamerasListPage.js index f9f6979d4..cc58d9667 100644 --- a/src/frontend/src/pages/CamerasListPage.js +++ b/src/frontend/src/pages/CamerasListPage.js @@ -37,7 +37,6 @@ export default function CamerasListPage() { // UseState hooks const [displayedCameras, setDisplayedCameras] = useState(null); const [processedCameras, setProcessedCameras] = useState(null); - const [routeEdit, setRouteEdit] = useState(!(selectedRoute && selectedRoute.routeFound)); const [searchText, setSearchText] = useState(''); // UseEffect hooks and data functions @@ -75,9 +74,6 @@ export default function CamerasListPage() { useEffect(() => { getCamerasData(); - if (selectedRoute && selectedRoute.routeFound) { - setRouteEdit(false); - } }, [selectedRoute]); useEffect(() => { @@ -130,11 +126,7 @@ export default function CamerasListPage() {
- - - {/* {!routeEdit && - - } */} +
diff --git a/src/frontend/src/pages/EventsListPage.js b/src/frontend/src/pages/EventsListPage.js index eb9489489..c9774e0db 100644 --- a/src/frontend/src/pages/EventsListPage.js +++ b/src/frontend/src/pages/EventsListPage.js @@ -99,7 +99,6 @@ export default function EventsListPage() { 'roadConditions': false, }); - const [routeEdit, setRouteEdit] = useState(!(selectedRoute && selectedRoute.routeFound)); const [processedEvents, setProcessedEvents] = useState([]); // Nulls for mapping loader const [showLoader, setShowLoader] = useState(false); @@ -130,9 +129,6 @@ export default function EventsListPage() { useEffect(() => { setShowLoader(true); - if (selectedRoute && selectedRoute.routeFound) { - setRouteEdit(false); - } }, [selectedRoute]); useEffect(() => { @@ -230,11 +226,7 @@ export default function EventsListPage() {
{ largeScreen &&
- - - {/* {!routeEdit && - - } */} +
} @@ -259,11 +251,7 @@ export default function EventsListPage() { { !largeScreen &&
- - - {!routeEdit && - - } +
}