fix(events): remove dateRange workarounds and sort by time

- with optimizing the main-server we do not need to reduce results with
  date range
- main-server is now sorting with time as well

SVAK-135

src/components/EventList.js

@@ -1,5 +1,4 @@
 import { FlashList } from '@shopify/flash-list';
-import _sortBy from 'lodash/sortBy';
 import PropTypes from 'prop-types';
 import React, { useEffect, useState } from 'react';
 
@@ -25,13 +24,6 @@ const sectionData = (data) => {
       }
     });
 
-    for (const dateKey in grouped) {
-      grouped[dateKey] = _sortBy(
-        grouped[dateKey],
-        (item) => item?.params?.details?.date?.timeFrom || item?.params?.details?.date?.timeTo
-      );
-    }
-
     return grouped;
   };
 

src/components/screens/EventRecords.js

@@ -15,7 +15,6 @@ import {
   EmptyMessage,
   ListComponent,
   LoadingContainer,
-  OptionToggle,
   REFRESH_CALENDAR,
   RegularText,
   SafeAreaViewFlex,
@@ -50,8 +49,6 @@ const hasFilterSelection = (isLocationFilter, queryVariables) => {
 };
 
 const today = moment().format('YYYY-MM-DD');
-// we need to set a date range to correctly sort the results by list date, so we set it far in the future
-const todayIn10Years = moment().add(10, 'years').format('YYYY-MM-DD');
 
 /* eslint-disable complexity */
 /* NOTE: we need to check a lot for presence, so this is that complex */
@@ -65,9 +62,10 @@ export const EventRecords = ({ navigation, route }) => {
   const { calendarToggle = false } = settings;
   const { eventListIntro } = sections;
   const query = route.params?.query ?? '';
+  const initialQueryVariables = route.params?.queryVariables || {};
   const [queryVariables, setQueryVariables] = useState({
-    ...(route.params?.queryVariables || {}),
-    dateRange: (route.params?.queryVariables || {}).dateRange || [today, todayIn10Years]
+    ...initialQueryVariables,
+    ...resourceFiltersState[query]
   });
   const [refreshing, setRefreshing] = useState(false);
   const [showCalendar, setShowCalendar] = useState(false);
@@ -186,7 +184,7 @@ export const EventRecords = ({ navigation, route }) => {
         });
       } else {
         setQueryVariables((prevQueryVariables) => {
-          return { ...prevQueryVariables, dateRange: [today, todayIn10Years], refetchDate: true };
+          return { ...prevQueryVariables, refetchDate: true };
         });
       }
 

src/components/widgets/EventWidget.tsx

@@ -15,18 +15,20 @@ import { DefaultWidget } from './DefaultWidget';
 const { ROOT_ROUTE_NAMES } = consts;
 
 const today = moment().format('YYYY-MM-DD');
-// we need to set a date range to correctly sort the results by list date, so we set it far in the future
-const todayIn10Years = moment().add(10, 'years').format('YYYY-MM-DD');
 
 export const EventWidget = ({ text, additionalProps }: WidgetProps) => {
   const navigation = useNavigation();
   const { globalSettings } = useContext(SettingsContext);
   const { deprecated = {}, hdvt = {} } = globalSettings;
   const { events: showVolunteerEvents = false } = hdvt as { events?: boolean };
-  const [queryVariables] = useState<{ dateRange?: string[]; order?: string }>({
-    dateRange: [today, additionalProps?.noFilterByDailyEvents ? todayIn10Years : today],
-    order: 'listDate_ASC'
-  });
+  const [queryVariables] = useState<{ dateRange?: string[]; order?: string }>(
+    additionalProps?.noFilterByDailyEvents
+      ? { order: 'listDate_ASC' }
+      : {
+          dateRange: [today, today],
+          order: 'listDate_ASC'
+        }
+  );
 
   const {
     data,

src/screens/HomeScreen.js

@@ -39,8 +39,6 @@ import { ScreenName } from '../types';
 const { MATOMO_TRACKING, ROOT_ROUTE_NAMES } = consts;
 
 const today = moment().format('YYYY-MM-DD');
-// we need to set a date range to correctly sort the results by list date, so we set it far in the future
-const todayIn10Years = moment().add(10, 'years').format('YYYY-MM-DD');
 
 const renderItem = ({ item }) => {
   const {
@@ -310,7 +308,7 @@ export const HomeScreen = ({ navigation, route }) => {
       navigate: 'EVENT_RECORDS_INDEX',
       navigation,
       query: QUERY_TYPES.EVENT_RECORDS,
-      queryVariables: { take: 3, order: 'listDate_ASC', dateRange: [today, todayIn10Years] },
+      queryVariables: { take: 3, order: 'listDate_ASC' },
       showData: showEvents,
       showVolunteerEvents,
       title: headlineEvents