DBC22-1829: removed routeEdit state (#342)

bcgov · Mar 26, 2024 · c91fc27 · c91fc27
1 parent 2439ed0
commit c91fc27
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 29 deletions.
diff --git 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 (
     <AsyncTypeahead
-      disabled={!routeEdit}
       clearButton={true}
       selected={location}
       filterBy={() => true}

diff --git 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) {
           </span>
         }
 
-        <LocationSearch routeEdit={routeEdit} placeholder={'Find a location'} location={searchLocationFrom} action={updateSearchLocationFrom} />
+        <LocationSearch placeholder={'Find a location'} location={searchLocationFrom} action={updateSearchLocationFrom} />
       </div>
 
       {!!searchLocationFrom.length &&
@@ -97,7 +95,7 @@ export default function RouteSearch(props) {
             <FontAwesomeIcon icon={faLocationDot} />
           </span>
 
-          <LocationSearch routeEdit={routeEdit} placeholder={'Find a destination'} location={searchLocationTo} action={updateSearchLocationTo} />
+          <LocationSearch placeholder={'Find a destination'} location={searchLocationTo} action={updateSearchLocationTo} />
 
           {showSpinner &&
             <Spinner className="typeahead-spinner" size="sm" animation="border" />

diff --git 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() {
 
         <div className="controls-container">
           <div className="route-display-container">
-            <RouteSearch routeEdit={routeEdit} />
-
-            {/* {!routeEdit &&
-              <Button onClick={() => setRouteEdit(true)}>Change</Button>
-            } */}
+            <RouteSearch />
           </div>
 
           <div className="search-container">

diff --git 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() {
         <div className="controls-container">
           { largeScreen &&
             <div className="route-display-container">
-              <RouteSearch routeEdit={routeEdit} />
-
-              {/* {!routeEdit &&
-                <Button onClick={() => setRouteEdit(true)}>Change</Button>
-              } */}
+              <RouteSearch />
             </div>
           }
 
@@ -259,11 +251,7 @@ export default function EventsListPage() {
 
           { !largeScreen &&
             <div className="route-display-container">
-              <RouteSearch routeEdit={routeEdit} />
-
-              {!routeEdit &&
-                <Button onClick={() => setRouteEdit(true)}>Change</Button>
-              }
+              <RouteSearch />
             </div>
           }
         </div>