Support public activity query params (#2713)

* Support public activity query params

For:
- place
- activity type

* Linting fix

* Delete flakey unused cordova test

src/activities/queries.js

@@ -273,13 +273,17 @@ export function useICSTokenQuery (queryOptions) {
 export function usePublicActivityListQuery ({
   groupId,
   dateMin,
+  placeId,
+  activityTypeId,
   pageSize = 10,
 }, queryOptions = {}) {
   const query = useInfiniteQuery(
-    queryKeyActivityList({ groupId, dateMin }),
+    queryKeyActivityList({ groupId, dateMin, placeId, activityTypeId }),
     ({ pageParam }) => api.listPublic({
       group: unref(groupId),
       dateMin: unref(dateMin),
+      place: unref(placeId),
+      activityType: unref(activityTypeId),
       cursor: pageParam,
       pageSize,
     }),

src/base/routes/embed.js

@@ -5,5 +5,8 @@ export default [
     name: 'publicActivitiesEmbed',
     path: '/embed/public-activities/:groupId',
     component: PublicActivitiesEmbed,
+    meta: {
+      noRedirect: true,
+    },
   },
 ]

src/base/services.js

@@ -68,6 +68,11 @@ export const useRoutingLogic = defineService(() => {
   router.beforeEach(async (to, from, nextFn) => {
     let next
 
+    if (to.meta.noRedirect) {
+      nextFn()
+      return
+    }
+
     await waitForUserToLoad()
 
     const requiredGroupFeatures = to.matched.map(m => m.meta.requireFeature).filter(Boolean)

src/group/services.js

@@ -1,6 +1,6 @@
 import { extend } from 'quasar'
 import { computed, watch, ref, readonly, watchEffect } from 'vue'
-import { useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 
 import { useSaveUserMutation } from '@/authuser/mutations'
 import { useAuthService } from '@/authuser/services'
@@ -37,6 +37,8 @@ export const useCurrentGroupService = defineService(() => {
     clearGroup,
   } = useCurrentGroupId()
 
+  const route = useRoute()
+
   const { groups } = useGroupInfoService()
 
   const {
@@ -46,6 +48,8 @@ export const useCurrentGroupService = defineService(() => {
   } = useGroupDetailQuery({ groupId }, {
     onError (error) {
       if (error?.response?.status === 404) { // TODO: could do for other errors too?
+        if (route.meta.noRedirect) return
+
         // Not found! (only groups we are members of can be found) .. but it might exist for preview
         const groupPreview = groups.value.find(group => group.id === groupId.value)
         if (groupPreview) {

src/groupInfo/pages/PublicActivitiesEmbed.vue

@@ -71,6 +71,8 @@ import {
   QItemSection,
   QItemLabel,
 } from 'quasar'
+import { computed } from 'vue'
+import { useRoute } from 'vue-router'
 
 import { useActivityTypeHelpers } from '@/activities/helpers'
 import { usePublicActivityListQuery } from '@/activities/queries'
@@ -83,12 +85,19 @@ const { getIconProps, getTranslatedName } = useActivityTypeHelpers()
 
 const groupId = useIntegerRouteParam('groupId')
 
+const route = useRoute()
+
+const placeId = computed(() => route.query.place)
+const activityTypeId = computed(() => route.query.type)
+
 const {
   publicActivities,
   infiniteScroll,
 } = usePublicActivityListQuery({
   groupId,
   dateMin: newDateRoundedTo5Minutes(),
+  placeId,
+  activityTypeId,
 })
 
 function getBannerImageUrl (publicActivity) {