Merge pull request #4390 from webkom/router-6-bugs

Resolve some router-v6 bugs
webkom · Jan 14, 2024 · 2ff0eb1 · 2ff0eb1
2 parents 1185b54 + 5044429
commit 2ff0eb1
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 9 deletions.
diff --git a/app/reducers/events.ts b/app/reducers/events.ts
@@ -321,7 +321,7 @@ export const selectMergedPoolWithRegistrations = createSelector(
               pool.permissionGroups
             );
             const registrations = total.registrations.concat(
-              pool.registrations.map((regId) => {
+              pool.registrations?.map((regId) => {
                 const registration = registrationsById[regId];
                 return { ...registration, user: usersById[registration.user] };
               })

diff --git a/app/routes/events/components/EventDetail/index.tsx b/app/routes/events/components/EventDetail/index.tsx
@@ -212,7 +212,7 @@ const EventDetail = () => {
   }
 
   const currentPool = pools.find((pool) =>
-    pool.registrations.some(
+    pool.registrations?.some(
       (registration) => registration.user?.id === currentUser.id
     )
   );

diff --git a/app/routes/pages/components/PageDetail.tsx b/app/routes/pages/components/PageDetail.tsx
@@ -232,8 +232,13 @@ const getSection = (sectionName) =>
     fetchItemActions: [],
   };
 
-const loadData = async (pageSlug, section, loggedIn, dispatch) => {
-  const { fetchItemActions } = getSection(section);
+const loadData = async (
+  pageSlug: string | undefined,
+  sectionName: string | undefined,
+  loggedIn: boolean,
+  dispatch
+) => {
+  const { fetchItemActions } = getSection(sectionName);
 
   // Only handle flatpages and groups when user isn't authenticated
   if (!loggedIn) {
@@ -244,7 +249,7 @@ const loadData = async (pageSlug, section, loggedIn, dispatch) => {
     return Promise.all([...actionsToDispatch, dispatch(fetchAllPages())]);
   }
 
-  const itemActions = [];
+  const itemActions: (typeof dispatch)[] = [];
 
   for (let i = 0; i < fetchItemActions.length; i++) {
     itemActions[i] = await dispatch(fetchItemActions[i](pageSlug));
@@ -298,7 +303,7 @@ const PageDetail = () => {
     })
   );
 
-  const loggedIn = useUserContext();
+  const { loggedIn } = useUserContext();
 
   const dispatch = useAppDispatch();
 

diff --git a/app/routes/polls/components/PollsList.tsx b/app/routes/polls/components/PollsList.tsx
@@ -40,7 +40,7 @@ const PollsList = () => {
         }
       />
       <Paginator
-        hasMore={hasMore}
+        hasMore={!!hasMore}
         fetching={fetching}
         fetchNext={() => {
           dispatch(

diff --git a/app/routes/search/SearchPageWrapper.tsx b/app/routes/search/SearchPageWrapper.tsx
@@ -1,7 +1,7 @@
 import { usePreparedEffect } from '@webkom/react-prepare';
 import { debounce } from 'lodash';
 import qs from 'qs';
-import { useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
 import { search } from 'app/actions/SearchActions';
 import { Content } from 'app/components/Content';
 import SearchPage from 'app/components/Search/SearchPage';
@@ -11,6 +11,7 @@ import { useAppDispatch, useAppSelector } from 'app/store/hooks';
 const SearchPageWrapper = () => {
   const results = useAppSelector((state) => selectResult(state));
 
+  const location = useLocation();
   const query = qs.parse(location.search, {
     ignoreQueryPrefix: true,
   }).q;

diff --git a/app/routes/userValidator/WrappedValidator.tsx b/app/routes/userValidator/WrappedValidator.tsx
@@ -1,6 +1,6 @@
 import { debounce } from 'lodash';
 import qs from 'qs';
-import { useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
 import { autocomplete } from 'app/actions/SearchActions';
 import { fetchUser } from 'app/actions/UserActions';
 import { Content } from 'app/components/Content';
@@ -14,6 +14,7 @@ const searchTypes = ['users.user'];
 const WrappedValidator = () => {
   const navigate = useNavigate();
   const dispatch = useAppDispatch();
+  const location = useLocation();
 
   const clearSearch = () =>
     navigate(`/validator?${qs.stringify({ ...search, q: '' })}`);