From c1d69b7b69f09fd98b0616791d40ebcfb0fa6c83 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Fri, 29 Oct 2021 13:59:47 +0200
Subject: [PATCH 1/2] fix: [UI] Add link to full attribute

---
 app/View/Attributes/index.ctp                        |  7 ++++++-
 .../IndexTable/Fields/simple_link.ctp                | 12 ++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 app/View/Elements/genericElements/IndexTable/Fields/simple_link.ctp

diff --git a/app/View/Attributes/index.ctp b/app/View/Attributes/index.ctp
index f1f3a740b..525f0393b 100755
--- a/app/View/Attributes/index.ctp
+++ b/app/View/Attributes/index.ctp
@@ -20,7 +20,12 @@ echo $this->element('/genericElements/IndexTable/index_table', [
             [
                 'name' => __('Event'),
                 'sort' => 'Attribute.event_id',
-                'data_path' => 'Attribute.event_id'
+                'data_path' => 'Attribute.event_id',
+                'element' => 'attributeLink',
+                'link_title_path' => 'Event.info',
+                'url' => function (array $row) {
+                    return '/events/view/' . $row['Attribute']['event_id'] . '#focus:' . $row['Attribute']['uuid'];
+                }
             ],
             [
                 'name' => __('Org'),
diff --git a/app/View/Elements/genericElements/IndexTable/Fields/simple_link.ctp b/app/View/Elements/genericElements/IndexTable/Fields/simple_link.ctp
new file mode 100644
index 000000000..5d0640657
--- /dev/null
+++ b/app/View/Elements/genericElements/IndexTable/Fields/simple_link.ctp
@@ -0,0 +1,12 @@
+<?php
+$data = Hash::get($row, $field['data_path']);
+$linkTitle = isset($field['link_title_path']) ? h(Hash::get($row, $field['link_title_path'])) : null;
+$url = is_callable($field['url']) ? $field['url']($row) : $field['url'];
+if ($url[0] === '/') {
+    $url = $baseurl . $url;
+}
+echo "<a href=\"$url\"";
+if ($linkTitle) {
+    echo " title=\"$linkTitle\"";
+}
+echo '>' . h($data) . '</a>';

From 268b071427b270214b500fab11280463a15afd18 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Fri, 29 Oct 2021 14:14:37 +0200
Subject: [PATCH 2/2] fix: [UI] Feed hits

---
 .../IndexTable/Fields/feedHits.ctp            | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/View/Elements/genericElements/IndexTable/Fields/feedHits.ctp b/app/View/Elements/genericElements/IndexTable/Fields/feedHits.ctp
index a6c285810..9268fa636 100644
--- a/app/View/Elements/genericElements/IndexTable/Fields/feedHits.ctp
+++ b/app/View/Elements/genericElements/IndexTable/Fields/feedHits.ctp
@@ -1,7 +1,7 @@
 <?php
-
 $object = Hash::extract($row, $field['data']['object']['value_path']);
 
+$li = [];
 if (isset($object['Feed'])) {
     foreach ($object['Feed'] as $feed) {
         $relatedData = array(
@@ -46,23 +46,21 @@ if (isset($object['Feed'])) {
                 h($feed['id'])
             );
         }
-        echo "<li>$liContents</li>";
+        $li[] = "<li>$liContents</li>";
     }
 }
 if (isset($object['Server'])) {
     foreach ($object['Server'] as $server) {
         $popover = '';
         foreach ($server as $k => $v) {
-            if ($k == 'id') continue;
+            if ($k === 'id') continue;
             if (is_array($v)) {
-                foreach ($v as $k2 => $v2) {
-                    $v[$k2] = h($v2);
-                }
-                $v = implode('<br />', $v);
+                $v = array_map('h', $v);
+                $v = implode('<br>', $v);
             } else {
                 $v = h($v);
             }
-            $popover .= '<span class=\'bold black\'>' . Inflector::humanize(h($k)) . '</span>: <span class="blue">' . $v . '</span><br />';
+            $popover .= '<span class=\'bold black\'>' . Inflector::humanize(h($k)) . '</span>: <span class="blue">' . $v . '</span><br>';
         }
         foreach ($server['event_uuids'] as $k => $event_uuid) {
             $liContents = '';
@@ -81,7 +79,11 @@ if (isset($object['Server'])) {
                     'S' . h($server['id']) . ':' . ($k + 1)
                 );
             }
-            echo "<li>$liContents</li>";
+            $li[] = "<li>$liContents</li>";
         }
     }
 }
+
+if (!empty($li)) {
+    echo '<ul class="inline">' . implode('', $li) .'</ul>';
+}