Merge branch 'feature/ISTWCMS-5032-ebremner-catalogs' into '1.0.x'

Feature/istwcms 5032 ebremner catalogs

See merge request !149

config/install/layout_builder_browser.layout_builder_browser_block.uw_lbb_catalog_search.yml

+langcode: en
+status: true
+dependencies: {  }
+id: uw_lbb_catalog_search
+block_id: uw_cbl_catalog_search
+category: uw_bc_searches
+label: 'Catalog search'
+weight: -1
+image_path: images/layout_builder_browser/catalogsearch.svg
+image_path_base: 'theme:uw_fdsu_theme_resp'
+image_alt: 'Catalog search'

src/Service/UWService.php

@@ -417,7 +417,11 @@ class UWService implements UWServiceInterface {
             if (!empty($tabs)) {
               foreach ($data as $key => $field) {
                 if (in_array($key, $tabs)) {
-                  $tags[$key] = $this->uwGetTermsFromEntityField($node->$field, 'tags');
+                  $tags_to_add = $this->uwGetTermsFromEntityField($node->$field, 'tags');
+
+                  if (!empty($tags_to_add)) {
+                    $tags[$key] = $this->uwGetTermsFromEntityField($node->$field, 'tags');
+                  }
                 }
               }
             }
@@ -428,6 +432,7 @@ class UWService implements UWServiceInterface {
           case 'tags':
             $tags = [];
             foreach ($data as $field) {
+              $tags_to_add = $this->uwGetTermsFromEntityField($node->$field, 'tags');
               $tags = array_merge($tags, $this->uwGetTermsFromEntityField($node->$field, 'tags'));
             }
             $node_data[$index] = [$tags];