From 8cf3fbf00f871a3bf424ade13b8b8ef77f7f2641 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Wed, 8 Sep 2021 15:32:16 +0000
Subject: [PATCH] ISTWCMS-5032: fixing tags showing when there are none for
 catalogs

---
 src/Service/UWService.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Service/UWService.php b/src/Service/UWService.php
index 0ee6ac6f..598b191b 100644
--- a/src/Service/UWService.php
+++ b/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];
-- 
GitLab