Merge branch 'feature/ISTWCMS-5195-ebremner-m26lebla-node-theming' into '1.0.x'

ISTWCMS-5195: updating node content and data to use separate tagging

See merge request !171

src/Service/UwNodeContent.php

@@ -122,6 +122,7 @@ class UwNodeContent {
     $node_flags['get_title'] = FALSE;
     $node_flags['get_hero'] = FALSE;
     $node_flags['get_listing_image'] = FALSE;
+    $node_flags['get_tags'] = TRUE;
 
     // Setup flags based on teaser content argument.
     if ($content == 'all') {
@@ -144,6 +145,7 @@ class UwNodeContent {
         $node_flags['get_header'] = TRUE;
         $node_flags['get_title'] = TRUE;
         $node_flags['get_hero'] = TRUE;
+        $node_flags['get_tags'] = FALSE;
       }
 
       if ($content == 'footer') {
@@ -239,15 +241,15 @@ class UwNodeContent {
       $content_data['content'] = $this->addToContentData('content', 'field_uw_blog_summary');
     }
 
-    // Setup the footer.
-    if ($node_flags['get_footer']) {
-
-      $terms = [
-        'field_uw_blog_tags',
-        'field_uw_audience',
-      ];
-
-      $content_data['footer']['tags'] = $this->addToContentData('terms', $terms);
+    // Get the tags, if any.
+    if ($node_flags['get_tags']) {
+      $content_data['tags'] = $this->addToContentData(
+        'terms',
+        [
+          'field_uw_blog_tags',
+          'field_uw_audience',
+        ]
+      );
     }
 
     return $content_data;
@@ -302,8 +304,11 @@ class UwNodeContent {
         'address' => $this->addToContentData('address', 'field_uw_event_location_address', 'Location address'),
         'map' => $this->addToContentData('map', 'field_uw_event_location_coord', 'Location coordinates'),
       ];
+    }
 
-      $content_data['footer']['tags'] = $this->addToContentData(
+    // Get the tags, if any.
+    if ($node_flags['get_tags']) {
+      $content_data['tags'] = $this->addToContentData(
         'terms',
         [
           'field_uw_event_tags',
@@ -350,9 +355,9 @@ class UwNodeContent {
       $content_data['content'] = $this->addToContentData('content', 'field_uw_news_summary');
     }
 
-    // Get the footer content.
-    if ($node_flags['get_footer']) {
-      $content_data['footer']['tags'] = $this->addToContentData(
+    // Get the tags, if any.
+    if ($node_flags['get_tags']) {
+      $content_data['tags'] = $this->addToContentData(
         'terms',
         [
           'field_uw_news_tags',
@@ -506,7 +511,11 @@ class UwNodeContent {
       $content_data['footer']['links']['has_children'] = TRUE;
       $content_data['footer']['links']['profile'] = $this->addToContentData('link', 'field_uw_ct_profile_info_link');
       $content_data['footer']['links']['webpage'] = $this->addToContentData('link', 'field_uw_ct_profile_link_persona');
-      $content_data['footer']['tags'] = $this->addToContentData(
+    }
+
+    // Get the tags, if any.
+    if ($node_flags['get_tags']) {
+      $content_data['tags'] = $this->addToContentData(
         'terms',
         [
           'field_uw_ct_profile_type',