Merge branch 'develop' into feature/tracking

lib/graphql/Query/ContentPage/ContentPage.graphql

@@ -1,5 +1,6 @@
 #import "../../Fragments/System.graphql"
 
+#import "../../Fragments/Blocks/Accordion.graphql"
 #import "../../Fragments/Blocks/CardsGrid.graphql"
 #import "../../Fragments/Blocks/Content.graphql"
 #import "../../Fragments/Blocks/DynamicContent.graphql"
@@ -7,7 +8,6 @@
 #import "../../Fragments/Blocks/Table.graphql"
 #import "../../Fragments/Blocks/TextCols.graphql"
 #import "../../Fragments/Blocks/UspGrid.graphql"
-
 #import "../../Fragments/ContentPage/NavigationLinks.graphql"
 
 #import "../../Fragments/Sidebar/Content.graphql"
@@ -40,13 +40,22 @@ query GetContentPage($locale: String!, $uid: String!) {
   }
 }
 
-query GetContentPageBlocks($locale: String!, $uid: String!) {
+query GetContentPageBlocksBatch1($locale: String!, $uid: String!) {
   content_page(uid: $uid, locale: $locale) {
     blocks {
       __typename
+      ...Accordion_ContentPage
       ...CardsGrid_ContentPage
       ...Content_ContentPage
       ...DynamicContent_ContentPage
+    }
+  }
+}
+
+query GetContentPageBlocksBatch2($locale: String!, $uid: String!) {
+  content_page(uid: $uid, locale: $locale) {
+    blocks {
+      __typename
       ...Shortcuts_ContentPage
       ...Table_ContentPage
       ...TextCols_ContentPage
@@ -73,6 +82,7 @@ query GetContentPageRefs($locale: String!, $uid: String!) {
     }
     blocks {
       __typename
+      ...Accordion_ContentPageRefs
       ...CardsGrid_ContentPageRefs
       ...Content_ContentPageRefs
       ...DynamicContent_ContentPageRefs

lib/graphql/Query/HotelPage/HotelPage.graphql

@@ -1,10 +1,47 @@
+#import "../../Fragments/PageLink/AccountPageLink.graphql"
 #import "../../Fragments/PageLink/ContentPageLink.graphql"
+#import "../../Fragments/PageLink/HotelPageLink.graphql"
+#import "../../Fragments/PageLink/LoyaltyPageLink.graphql"
+
+#import "../../Fragments/Blocks/Accordion.graphql"
 
 query GetHotelPage($locale: String!, $uid: String!) {
   hotel_page(locale: $locale, uid: $uid) {
     hotel_page_id
     title
     url
+    faq {
+      __typename
+      title
+      global_faqConnection {
+        __typename
+        edges {
+          node {
+            ...AccordionBlock
+          }
+        }
+      }
+      specific_faq {
+        __typename
+        questions {
+          question
+          answer {
+            json
+            embedded_itemsConnection {
+              edges {
+                node {
+                  __typename
+                  ...AccountPageLink
+                  ...ContentPageLink
+                  ...HotelPageLink
+                  ...LoyaltyPageLink
+                }
+              }
+            }
+          }
+        }
+      }
+    }
     content {
       __typename
       ... on HotelPageContentUpcomingActivitiesCard {
@@ -26,6 +63,60 @@ query GetHotelPage($locale: String!, $uid: String!) {
         }
       }
     }
+    system {
+      ...System
+      created_at
+      updated_at
+    }
+  }
+}
+
+query GetHotelPageRefs($locale: String!, $uid: String!) {
+  hotel_page(locale: $locale, uid: $uid) {
+    faq {
+      global_faqConnection {
+        edges {
+          node {
+            ...AccordionBlockRefs
+          }
+        }
+      }
+      specific_faq {
+        questions {
+          answer {
+            embedded_itemsConnection {
+              edges {
+                node {
+                  __typename
+                  ...AccountPageRef
+                  ...ContentPageRef
+                  ...HotelPageRef
+                  ...LoyaltyPageRef
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    content {
+      __typename
+      ... on HotelPageContentUpcomingActivitiesCard {
+        upcoming_activities_card {
+          hotel_page_activities_content_pageConnection {
+            edges {
+              node {
+                __typename
+                ...ContentPageRef
+              }
+            }
+          }
+        }
+      }
+    }
+    system {
+      ...System
+    }
   }
   trackingProps: hotel_page(locale: "en", uid: $uid) {
     url