Add working event query after breaking API change

web/components/ActivityStream/MergedActivityStreamList/RenderMergedActivityStreamList.js

@@ -16,6 +16,7 @@ function resolveEvents(event) {
 
 function RenderMergedActivityStreamList(props) {
   const { stream } = props
+  console.log(stream)
 
   const filteredStream = stream.filter((x) => x._type)
 

web/components/PT/PortableTextBlock.js

@@ -34,7 +34,7 @@ export default function PortableTextBlock(props) {
 
   const {
     blocks,
-    fontSize = { base: 'lg', sm: 'xl', md: '2xl', xl: '2xl' },
+    fontSize = { base: 'lg', sm: 'xl', md: 'xl', xl: '2xl' },
     maxW = ['xl', null, '2xl', null],
     lineHeight = ['1.25', '1.3'],
     fontWeight = 'normal',

web/lib/api.js

@@ -38,9 +38,24 @@ export async function getRoutes() {
   return data
 }
 
+/**
+ * Fetch Activity and Event documents and activityStream objects
+ * @param {boolean} preview
+ * @returns {object}
+ */
 export async function getEvents(preview) {
   const data = await getClient(preview).fetch(eventsQuery)
-  return data
+
+  const activityStreamsObjects = data.objects
+    .map((o) => o.activityStream)
+    .filter((o) => o.length != 0)
+
+  const activityStream = {
+    items: [...data.documents, ...activityStreamsObjects[0]],
+    siteSettings: data.siteSettings,
+  }
+
+  return activityStream
 }
 
 export async function getPreviewHumanMadeObjectByID(id) {

web/lib/queries/index.js

@@ -170,7 +170,7 @@ export const typeQuery = groq`
 `
 
 export const eventsQuery = groq`{
-  "items": [
+  "documents": [
     ...*[_type in ["Activity", "Event"]]{
       ...,
       _id,
@@ -188,8 +188,12 @@ export const eventsQuery = groq`{
         label
       },
     },
-    ...*[defined(activityStream)].activityStream[featured == true]{
-      ${activityStreamFields}
+  ],
+  "objects": [
+    ...*[defined(activityStream) && count(activityStream) > 0] {
+      activityStream[featured == true]{
+        ${activityStreamFields}
+      }
     }
   ],
   ${siteSettings}

web/events/index.js → web/pages/events/index.js

-import {orderBy} from 'lodash'
-import {getEvents} from '../lib/api'
-import Layout from '../components/Layout'
-import {Container, Heading, useColorModeValue, SimpleGrid} from '@chakra-ui/react'
-import RenderMergedActivityStreamList from '../components/ActivityStream/MergedActivityStreamList/RenderMergedActivityStreamList'
+import { orderBy } from 'lodash'
+import { getEvents } from '../../lib/api'
+import Layout from '../../components/Layout'
+import { Container, Heading, useColorModeValue, SimpleGrid } from '@chakra-ui/react'
+import RenderMergedActivityStreamList from '../../components/ActivityStream/MergedActivityStreamList/RenderMergedActivityStreamList'
 
-export default function Events({data, preview}) {
+export default function Events({ data, preview }) {
   const tagColor = useColorModeValue('blackAlpha', 'red')
 
   return (
     <Layout preview={preview} site={data.siteSettings}>
       <Container my="5" maxWidth="6xl">
-        <Heading 
+        <Heading
           fontSize={['2xl', '3xl', '4xl', '5xl']}
           py="5"
           mb="5"
@@ -20,9 +20,9 @@ export default function Events({data, preview}) {
         >
           Hendelser
         </Heading>
-        
+
         {data.items &&
-          <SimpleGrid 
+          <SimpleGrid
             w="full"
             columnGap="5"
             templateColumns={{
@@ -39,11 +39,11 @@ export default function Events({data, preview}) {
   )
 }
 
-export async function getStaticProps({preview = false}) {
+export async function getStaticProps({ preview = false }) {
   let data = await getEvents(preview)
   data.items = orderBy(data.items, ['timespan[0].orderDate'])
 
   return {
-    props: {data, preview},
+    props: { data, preview },
   }
 }