Skip to content

Commit b59fd99

Browse files
committed
DBC22-5193: fixed regression and mobile sharing from DBC22-5182
1 parent 39ba245 commit b59fd99

2 files changed

Lines changed: 16 additions & 2 deletions

File tree

src/frontend/src/Components/routing/RouteSearch.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,16 @@ const RouteSearch = forwardRef((props, ref) => {
8383
const updateSearch = () => {
8484
updateSearchParams();
8585

86+
// Only update search params on first load
87+
if (isInitialMount.current) {
88+
isInitialMount.current = false;
89+
90+
// Unless coming from notifications, then load route
91+
if (!searchParams.get('route_distance')) {
92+
return;
93+
}
94+
}
95+
8696
if (validSearch) {
8797
onShowSpinnerChange(true);
8898

src/frontend/src/Components/shared/header/Header.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export default function Header() {
6464
const [bulletinsCount, setBulletinsCount] = useState();
6565
const [expanded, setExpanded] = useState(false);
6666
const [showSpinner, setShowSpinner] = useState(false);
67-
const [openSearch, setOpenSearch] = useState(searchParams.get('start') || searchParams.get('end'));
67+
const [openSearch, setOpenSearch] = useState(searchParams.get('start') || searchParams.get('end') || searchParams.get('route_distance'));
6868
const [isNavbarCollapsed, setIsNavbarCollapsed] = useState(true);
6969

7070
// Effects
@@ -83,7 +83,7 @@ export default function Header() {
8383
} else {
8484
advisoriesData = await getAdvisories();
8585
}
86-
86+
8787
const filteredAdvisoriesData = selectedRoute ? filterAdvisoryByRoute(advisoriesData, selectedRoute) : advisoriesData;
8888
dispatch(updateAdvisories({
8989
list: advisoriesData,
@@ -122,6 +122,10 @@ export default function Header() {
122122
}
123123
}, [selectedRoute]);
124124

125+
useEffect(() => {
126+
console.log('Open search changed:', openSearch);
127+
}, [openSearch]);
128+
125129
/* Helpers */
126130
const getUnreadAdvisoriesCount = (advisoriesData) => {
127131
if (!advisoriesData) {

0 commit comments

Comments
 (0)