diff --git a/js/src/views/SearchView.vue b/js/src/views/SearchView.vue
index 9ee3600ae..df1cc1c59 100644
--- a/js/src/views/SearchView.vue
+++ b/js/src/views/SearchView.vue
@@ -503,54 +503,45 @@
{{ t("Groups are not enabled on this instance.") }}
-
{{ t("No events found") }}
@@ -770,6 +761,7 @@ const arrayTransformer: RouteQueryTransformer = {
},
};
+const page = useRouteQuery("page", 1, integerTransformer);
const eventPage = useRouteQuery("eventPage", 1, integerTransformer);
const groupPage = useRouteQuery("groupPage", 1, integerTransformer);
@@ -783,6 +775,18 @@ const contentType = useRouteQuery(
ContentType.ALL,
enumTransformer(ContentType)
);
+
+watch(contentType, (newContentType: ContentType) => {
+ switch (newContentType) {
+ case ContentType.ALL:
+ page.value = 1;
+ case ContentType.EVENTS:
+ eventPage.value = 1;
+ case ContentType.GROUPS:
+ groupPage.value = 1;
+ }
+});
+
const isOnline = useRouteQuery("isOnline", false, booleanTransformer);
const categoryOneOf = useRouteQuery("categoryOneOf", [], arrayTransformer);
const statusOneOf = useRouteQuery(
@@ -1168,8 +1172,10 @@ const { result: searchElementsResult, loading: searchLoading } = useQuery<{
beginsOn: start.value,
endsOn: end.value,
radius: geoHashLocation.value ? radius.value : undefined,
- eventPage: eventPage.value,
- groupPage: groupPage.value,
+ eventPage:
+ contentType.value === ContentType.ALL ? page.value : eventPage.value,
+ groupPage:
+ contentType.value === ContentType.ALL ? page.value : groupPage.value,
limit: EVENT_PAGE_LIMIT,
type: isOnline.value ? "ONLINE" : undefined,
categoryOneOf: categoryOneOf.value,