webkom · ivarnakken · Feb 16, 2024 · Feb 14, 2024 · Feb 16, 2024
diff --git a/app/components/HeaderNotifications/index.tsx b/app/components/HeaderNotifications/index.tsx
@@ -92,7 +92,7 @@ const NotificationsDropdown = () => {
   usePreparedEffect(
     'fetchNotificationDropdownData',
     () =>
-      Promise.all([
+      Promise.allSettled([
         dispatch(fetchNotificationFeed()),
         dispatch(fetchNotificationData()),
       ]),

diff --git a/app/routes/admin/email/components/EmailUsers.tsx b/app/routes/admin/email/components/EmailUsers.tsx
@@ -50,12 +50,12 @@ const EmailUsers = () => {
   usePreparedEffect(
     'fetchEmailUsers',
     () =>
-      Promise.resolve([
+      Promise.allSettled([
         dispatch(fetchAllWithType(GroupType.Committee)),
         dispatch(fetchAllWithType(GroupType.Grade)),
         dispatch(fetch({ query })),
       ]),
-    []
+    [query]
   );
 
   const columns = [

diff --git a/app/routes/admin/groups/components/GroupPage.tsx b/app/routes/admin/groups/components/GroupPage.tsx
@@ -63,7 +63,7 @@ const GroupPage = () => {
   usePreparedEffect(
     'fetchAllGroups',
     () =>
-      Promise.all([
+      Promise.allSettled([
         dispatch(fetchAll()),
         groupId && dispatch(fetchGroup(groupId)),
       ]),

diff --git a/app/routes/articles/components/Overview.tsx b/app/routes/articles/components/Overview.tsx
@@ -92,11 +92,11 @@ const Overview = () => {
   usePreparedEffect(
     'fetchArticlesOverview',
     () =>
-      Promise.resolve([
+      Promise.allSettled([
         dispatch(fetchPopular()),
         dispatch(fetchAll({ next: false, query })),
       ]),
-    []
+    [query]
   );
 
   const headlineEvents = articles.slice(0, HEADLINE_EVENTS);

diff --git a/app/routes/bdb/components/AddSemester.tsx b/app/routes/bdb/components/AddSemester.tsx
@@ -50,7 +50,11 @@ const AddSemester = () => {
 
   usePreparedEffect(
     'fetchAddSemester',
-    () => Promise.all([dispatch(fetchSemesters()), dispatch(fetchAllAdmin())]),
+    () =>
+      Promise.allSettled([
+        dispatch(fetchSemesters()),
+        dispatch(fetchAllAdmin()),
+      ]),
     [companyId]
   );
 

diff --git a/app/routes/bdb/components/BdbDetail.tsx b/app/routes/bdb/components/BdbDetail.tsx
@@ -78,15 +78,15 @@ const BdbDetail = () => {
   usePreparedEffect(
     'fetchBdbDetail',
     () =>
-      Promise.all([
+      companyId &&
+      Promise.allSettled([
         dispatch(fetchSemesters()).then(() => dispatch(fetchAdmin(companyId))),
-        companyId &&
-          dispatch(
-            fetchEventsForCompany({
-              endpoint: `/events/${queryString(companyId)}`,
-              queryString: queryString(companyId),
-            })
-          ),
+        dispatch(
+          fetchEventsForCompany({
+            endpoint: `/events/${queryString(companyId)}`,
+            queryString: queryString(companyId),
+          })
+        ),
       ]),
     [companyId]
   );

diff --git a/app/routes/company/components/CompanyDetail.tsx b/app/routes/company/components/CompanyDetail.tsx
@@ -70,7 +70,7 @@ const CompanyDetail = () => {
     'fetchDetailedCompany',
     () =>
       companyId &&
-      Promise.all([
+      Promise.allSettled([
         dispatch(fetch(companyId)),
         dispatch(
           fetchEventsForCompany({

diff --git a/app/routes/companyInterest/components/CompanyInterestList.tsx b/app/routes/companyInterest/components/CompanyInterestList.tsx
@@ -120,7 +120,8 @@ const CompanyInterestList = () => {
 
   usePreparedEffect(
     'fetchCompanyInterestList',
-    () => Promise.all([dispatch(fetchAll()), dispatch(fetchSemesters())]),
+    () =>
+      Promise.allSettled([dispatch(fetchAll()), dispatch(fetchSemesters())]),
     []
   );
 

diff --git a/app/routes/companyInterest/components/CompanyInterestPage.tsx b/app/routes/companyInterest/components/CompanyInterestPage.tsx
@@ -322,7 +322,7 @@ const CompanyInterestPage = () => {
   usePreparedEffect(
     'fetchCompanyInterestPage',
     () => {
-      Promise.all([
+      Promise.allSettled([
         edit && dispatch(fetchSemesters()),
         edit &&
           companyInterestId &&

diff --git a/app/routes/contact/components/ContactForm.tsx b/app/routes/contact/components/ContactForm.tsx
@@ -53,7 +53,7 @@ const ContactForm = () => {
   usePreparedEffect(
     'fetchGroups',
     () =>
-      Promise.all([
+      Promise.allSettled([
         dispatch(fetchAllWithType(GroupType.Committee)),
         // The revue board group does not exist in the local dev environment.
         // It should be added to the fixtures, so that the propagateError flag can be removed.

diff --git a/app/routes/events/components/EventAdministrate/Statistics.tsx b/app/routes/events/components/EventAdministrate/Statistics.tsx
@@ -14,7 +14,7 @@ const Statistics = () => {
   usePreparedEffect(
     'fetchStatisticsGroups',
     () =>
-      Promise.all([
+      Promise.allSettled([
         dispatch(fetchAllWithType(GroupType.Committee)),
         dispatch(fetchAllWithType(GroupType.Revue)),
       ]),

diff --git a/app/routes/events/components/EventEditor/index.tsx b/app/routes/events/components/EventEditor/index.tsx
@@ -175,7 +175,7 @@ const EventEditor = () => {
   usePreparedEffect(
     'fetchEventEdit',
     () =>
-      Promise.all([
+      Promise.allSettled([
         eventIdOrSlug && dispatch(fetchEvent(eventIdOrSlug)),
         dispatch(fetchImageGallery()),
       ]),

diff --git a/app/routes/interestgroups/components/InterestGroupDetail.tsx b/app/routes/interestgroups/components/InterestGroupDetail.tsx
@@ -134,11 +134,11 @@ const InterestGroupDetail = () => {
     'fetchInterestGroupDetail',
     () =>
       groupId &&
-      Promise.resolve([
+      Promise.allSettled([
         dispatch(fetchGroup(groupId)),
         loggedIn && dispatch(fetchAllMemberships(groupId)),
       ]),
-    [loggedIn]
+    [groupId, loggedIn]
   );
 
   return (

diff --git a/app/routes/meetings/MeetingDetailWrapper.tsx b/app/routes/meetings/MeetingDetailWrapper.tsx
@@ -38,7 +38,9 @@ const MeetingDetailWrapper = () => {
         dispatch(answerMeetingInvitation(action, token));
       }
 
-      return loggedIn ? dispatch(fetchMeeting(meetingId)) : Promise.resolve();
+      return loggedIn && meetingId
+        ? dispatch(fetchMeeting(meetingId))
+        : Promise.resolve();
     },
     [meetingId, loggedIn, token, action]
   );

diff --git a/app/routes/overview/components/Overview.tsx b/app/routes/overview/components/Overview.tsx
@@ -52,7 +52,7 @@ const Overview = () => {
   usePreparedEffect(
     'fetchIndex',
     () =>
-      Promise.all([
+      Promise.allSettled([
         loggedIn && shouldFetchQuote && dispatch(fetchRandomQuote()),
         dispatch(fetchReadmes(loggedIn ? 4 : 2)),
         dispatch(fetchData()),

diff --git a/app/routes/overview/components/PublicFrontpage.tsx b/app/routes/overview/components/PublicFrontpage.tsx
@@ -35,11 +35,7 @@ const PublicFrontpage = () => {
 
   const dispatch = useAppDispatch();
 
-  usePreparedEffect(
-    'fetchIndex',
-    () => Promise.all([dispatch(fetchData())]),
-    []
-  );
+  usePreparedEffect('fetchIndex', () => dispatch(fetchData()), []);
 
   const pinned = frontpage[0];
 

diff --git a/app/routes/pages/components/PageEditor.tsx b/app/routes/pages/components/PageEditor.tsx
@@ -78,7 +78,7 @@ const PageEditor = () => {
 
   usePreparedEffect(
     'fetchPageEdit',
-    () => !isNew && dispatch(fetchPage(pageSlug)),
+    () => !isNew && pageSlug && dispatch(fetchPage(pageSlug)),
     [isNew, pageSlug]
   );
 

diff --git a/app/routes/photos/components/GalleryDetail.tsx b/app/routes/photos/components/GalleryDetail.tsx
@@ -75,7 +75,8 @@ const GalleryDetail = () => {
   usePreparedEffect(
     'fetchGalleryDetail',
     () =>
-      Promise.all([
+      galleryId &&
+      Promise.allSettled([
         dispatch(fetch(galleryId)).catch(),
         dispatch(fetchGallery(galleryId)).catch(() =>
           dispatch(fetchGalleryMetadata(galleryId))

diff --git a/app/routes/photos/components/GalleryEditor.tsx b/app/routes/photos/components/GalleryEditor.tsx
@@ -142,7 +142,7 @@ const GalleryEditor = () => {
     () =>
       !isNew &&
       galleryId &&
-      Promise.all([
+      Promise.allSettled([
         dispatch(fetch(Number(galleryId))),
         dispatch(fetchGallery(galleryId)),
       ]),

diff --git a/app/routes/photos/components/GalleryPictureEditModal.tsx b/app/routes/photos/components/GalleryPictureEditModal.tsx
@@ -55,9 +55,10 @@ const GalleryPictureEditModal = () => {
   usePreparedEffect(
     'fetchGalleryAndGalleryPicture',
     () =>
-      Promise.all([
+      galleryId &&
+      Promise.allSettled([
         dispatch(fetchGallery(galleryId)),
-        dispatch(fetchGalleryPicture(galleryId, pictureId)),
+        pictureId && dispatch(fetchGalleryPicture(galleryId, pictureId)),
       ]),
     [galleryId, pictureId]
   );

diff --git a/app/routes/photos/components/GalleryPictureModal.tsx b/app/routes/photos/components/GalleryPictureModal.tsx
@@ -187,9 +187,10 @@ const GalleryPictureModal = () => {
   usePreparedEffect(
     'fetchGalleryPicture',
     () =>
-      Promise.all([
-        dispatch(fetchGalleryPicture(galleryId, pictureId)),
+      galleryId &&
+      Promise.allSettled([
         dispatch(fetchGallery(galleryId)),
+        pictureId && dispatch(fetchGalleryPicture(galleryId, pictureId)),
       ]),
     []
   );

diff --git a/app/routes/polls/components/PollDetail.tsx b/app/routes/polls/components/PollDetail.tsx
@@ -23,7 +23,11 @@ const PollDetail = () => {
 
   const dispatch = useAppDispatch();
 
-  usePreparedEffect('fetchPoll', () => dispatch(fetchPoll(pollsId)), []);
+  usePreparedEffect(
+    'fetchPoll',
+    () => pollsId && dispatch(fetchPoll(pollsId)),
+    []
+  );
 
   const poll = useAppSelector((state) => selectPollById(state, pollsId));
   const fetching = useAppSelector((state) => state.polls.fetching);

diff --git a/app/routes/quotes/components/QuotePage.tsx b/app/routes/quotes/components/QuotePage.tsx
@@ -76,11 +76,11 @@ const QuotePage = () => {
   usePreparedEffect(
     'fetchQuotePage',
     () =>
-      Promise.resolve([
+      Promise.allSettled([
         quoteId ? dispatch(fetchQuote(quoteId)) : dispatch(fetchAll({ query })),
         dispatch(fetchEmojis()),
       ]),
-    [query]
+    [quoteId, query]
   );
 
   return (

diff --git a/app/routes/users/components/UserProfile.tsx b/app/routes/users/components/UserProfile.tsx
@@ -208,7 +208,7 @@ const UserProfile = () => {
   usePreparedEffect(
     'fetchUserProfile',
     () =>
-      Promise.all([
+      Promise.allSettled([
         dispatch(fetchAllWithType(GroupType.Grade)),
         isCurrentUser && dispatch(fetchPrevious()),
         isCurrentUser && dispatch(fetchUpcoming()),

diff --git a/app/routes/users/components/UserSettingsNotifications.tsx b/app/routes/users/components/UserSettingsNotifications.tsx
@@ -45,7 +45,7 @@ const UserSettingsNotifications = () => {
   usePreparedEffect(
     'fetchUserSettingsNotifications',
     () =>
-      Promise.all([
+      Promise.allSettled([
         dispatch(fetchNotificationAlternatives()),
         dispatch(fetchNotificationSettings()),
       ]),

diff --git a/app/routes/users/components/UserSettingsOAuth2.tsx b/app/routes/users/components/UserSettingsOAuth2.tsx
@@ -25,7 +25,7 @@ const UserSettingsOAuth2 = () => {
   usePreparedEffect(
     'fetchUserSettingsOAuth2',
     () =>
-      Promise.all([
+      Promise.allSettled([
         dispatch(fetchOAuth2Applications()),
         dispatch(fetchOAuth2Grants()),
       ]),