twig fix

Author: RobiNN1

src/Dashboards/Redis/RedisTrait.php

@@ -464,9 +464,10 @@ public function keysTableView(array $keys_array): array {
         foreach ($keys_array as $key) {
             $formatted_keys[] = [
                 'key'    => $key,
+                'items'  => $pipeline[$key]['count'] ?? null,
                 'base64' => true,
                 'info'   => [
-                    'link_title' => ($pipeline[$key]['count'] !== null ? '('.$pipeline[$key]['count'].' items) ' : '').$key,
+                    'link_title' => $key,
                     'bytes_size' => $pipeline[$key]['size'],
                     'type'       => $pipeline[$key]['type'],
                     'ttl'        => $pipeline[$key]['ttl'] === -1 ? 'Doesn\'t expire' : $pipeline[$key]['ttl'],
@@ -503,8 +504,9 @@ public function keysTreeView(array $keys_array): array {
                 if ($i === count($parts) - 1) { // check last part
                     $current[] = [
                         'type'   => 'key',
-                        'name'   => ($pipeline[$key]['count'] !== null ? '('.$pipeline[$key]['count'].' items) ' : '').$part,
+                        'name'   => $part,
                         'key'    => $key,
+                        'items'  => $pipeline[$key]['count'] ?? null,
                         'base64' => true,
                         'info'   => [
                             'bytes_size' => $pipeline[$key]['size'],

templates/partials/table_view.twig

@@ -39,7 +39,12 @@
                     <td class="px-3 py-2 border-b border-gray-200 text-sm{{ td_class }}{{ classes[loop.index]|space }} dark:border-gray-700 dark:text-gray-300">
                         {% if item_key == 'link_title' and view_key %}
                             {% set link = view_key|replace({'__key__': key.key}) %}
-                            <a class="text-primary-500 hover:text-primary-700 font-semibold dark:text-primary-400 dark:hover:text-primary-300" href="{{ link }}">{{ item }}</a>
+                            <a class="text-primary-500 hover:text-primary-700 font-semibold dark:text-primary-400 dark:hover:text-primary-300" href="{{ link }}">
+                                {{ item }}
+                                {% if key.items %}
+                                    <span class="text-gray-500 dark:text-gray-400 text-xs">({{ key.items }} items)</span>
+                                {% endif %}
+                            </a>
                         {% elseif item_key == 'type' %}
                             {{- components.key_type(item) -}}
                         {% elseif item_key starts with 'number_' %}

templates/partials/tree_view.twig

@@ -18,7 +18,7 @@
             </div>
         {% else %}
             <div class="keywrapper border-t border-gray-200 dark:border-gray-700" style="--level: {{ level }}">
-                <div data-key="{{ item.base64 ? item.key|base64 : item.key }}" class="flex justify-between px-6 py-1 hover:bg-gray-50 dark:hover:bg-white/5" style="padding-left: calc({{ level }} * 20px + 32px)">
+                <div data-key="{{ item.base64 ? item.key|base64 : item.key }}" class="flex justify-between px-6 py-1 text-sm hover:bg-gray-50 dark:hover:bg-white/5" style="padding-left: calc({{ level }} * 20px + 32px)">
                     <div class="flex items-center gap-2">
                         {% if show_actions %}
                             {{ components.checkbox('check-key mt-0') }}
@@ -28,14 +28,17 @@
                             {% set link = view_key|replace({'__key__': item.key}) %}
                             <a class="text-primary-500 hover:text-primary-700 font-semibold dark:text-primary-400 dark:hover:text-primary-300" href="{{ link }}">
                                 {{ item.name }}
+                                {% if item.items %}
+                                    <span class="text-gray-500 dark:text-gray-400 text-xs">({{ item.items }} items)</span>
+                                {% endif %}
                             </a>
                         </span>
                     </div>
 
                     <div class="flex gap-4">
                         {% for item_key, kitem in item.info %}
                             {% if item_key == 'type' %}
-                                {{- components.key_type(kitem) -}}
+                                <span class="w-24">{{ components.key_type(kitem) }}</span>
                             {% elseif item_key starts with 'number_' %}
                                 {{- kitem|number -}}
                             {% elseif item_key starts with 'time_' %}

tests/Dashboards/Redis/RedisTestCase.php

@@ -262,11 +262,13 @@ public function testGetAllKeysTableView(): void {
         $expected = [
             [
                 'key'    => 'pu-test-table1',
+                'items'  => null,
                 'base64' => true,
                 'info'   => array_merge(['link_title' => 'pu-test-table1'], $info),
             ],
             [
                 'key'    => 'pu-test-table2',
+                'items'  => null,
                 'base64' => true,
                 'info'   => array_merge(['link_title' => 'pu-test-table2'], $info),
             ],
@@ -305,13 +307,15 @@ public function testGetAllKeysTreeView(): void {
                         'type'   => 'key',
                         'name'   => 'sub1',
                         'key'    => 'pu-test-tree1:sub1',
+                        'items'  => null,
                         'base64' => true,
                         'info'   => $info,
                     ],
                     [
                         'type'   => 'key',
                         'name'   => 'sub2',
                         'key'    => 'pu-test-tree1:sub2',
+                        'items'  => null,
                         'base64' => true,
                         'info'   => $info,
                     ],
@@ -323,6 +327,7 @@ public function testGetAllKeysTreeView(): void {
                 'type'   => 'key',
                 'name'   => 'pu-test-tree2',
                 'key'    => 'pu-test-tree2',
+                'items'  => null,
                 'base64' => true,
                 'info'   => $info,
             ],