feat(areabrick-overview): hide empty version / description columns (#33)

teamneusta · Oct 29, 2024 · f8cc157 · f8cc157
1 parent 12e7deb
commit f8cc157
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -23,7 +23,6 @@
     "symfony/dependency-injection": "^5.4 || ^6.4",
     "symfony/http-foundation": "^5.4 || ^6.4",
     "symfony/http-kernel": "^5.4 || ^6.4",
-    "symfony/polyfill-php84": "^1.31",
     "symfony/routing": "^5.4 || ^6.4",
     "symfony/translation": "^5.4 || ^6.4",
     "teamneusta/converter-bundle": "^1.6",

diff --git a/config/services.yaml b/config/services.yaml
@@ -18,3 +18,5 @@ services:
     tags:
       - { name: kernel.event_listener, event: pimcore.bundle_manager.paths.css, method: addCSSFiles }
       - { name: kernel.event_listener, event: pimcore.bundle_manager.paths.js, method: addJSFiles }
+
+  Neusta\Pimcore\AreabrickConfigBundle\Twig\NeustaExtension: ~
diff --git a/src/Bricks/Model/Brick.php b/src/Bricks/Model/Brick.php
@@ -14,5 +14,5 @@ final class Brick
     public array $pages;
 
     /** @var list<BrickProperty> */
-    public array $additionalProperties;
+    public array $additionalProperties = [];
 }
diff --git a/src/Controller/Admin/AreabrickOverviewController.php b/src/Controller/Admin/AreabrickOverviewController.php
@@ -36,11 +36,8 @@ public function __invoke(): Response
         $bricks = array_map($this->brickConverter->convert(...), $this->areabrickManager->getBricks());
         usort($bricks, fn ($a, $b) => strcmp($a->name, $b->name));
 
-        $hasAdditionalProperties = array_any($bricks, fn ($brick) => !empty($brick->additionalProperties));
-
         return new Response($this->twig->render('@NeustaPimcoreAreabrickConfig/bricks/overview.html.twig', [
             'bricks' => $bricks,
-            'hasAdditionalProperties' => $hasAdditionalProperties,
         ]));
     }
 }
diff --git a/src/Twig/NeustaExtension.php b/src/Twig/NeustaExtension.php
@@ -0,0 +1,32 @@
+<?php
+declare(strict_types=1);
+
+namespace Neusta\Pimcore\AreabrickConfigBundle\Twig;
+
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
+
+final class NeustaExtension extends AbstractExtension
+{
+    public function getFilters(): array
+    {
+        return [
+            // Todo: remove in favor of the `any`-test once https://github.com/twigphp/Twig/pull/4422 got released
+            new TwigFilter('any', self::any(...)),
+        ];
+    }
+
+    /**
+     * @param iterable<mixed> $array
+     */
+    private static function any(iterable $array, callable $arrow): bool
+    {
+        foreach ($array as $k => $v) {
+            if ($arrow($v, $k)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/templates/bricks/overview.html.twig b/templates/bricks/overview.html.twig
@@ -1,11 +1,19 @@
+{% set hasVersions = bricks|any(b => b.version is not empty) %}
+{% set hasDescriptions = bricks|any(b => b.description is not empty) %}
+{% set hasAdditionalProperties = bricks|any(b => b.additionalProperties is not empty) %}
+
 <div id="neusta_areabrick_config">
     <table>
         <thead>
         <tr>
             <th>{{ 'neusta_pimcore_areabrick_config.areabricks.overview.table.col_headers.name'|trans }}</th>
             <th>{{ 'neusta_pimcore_areabrick_config.areabricks.overview.table.col_headers.id'|trans }}</th>
-            <th>{{ 'neusta_pimcore_areabrick_config.areabricks.overview.table.col_headers.version'|trans }}</th>
-            <th>{{ 'neusta_pimcore_areabrick_config.areabricks.overview.table.col_headers.description'|trans }}</th>
+            {% if hasVersions %}
+                <th>{{ 'neusta_pimcore_areabrick_config.areabricks.overview.table.col_headers.version'|trans }}</th>
+            {% endif %}
+            {% if hasDescriptions %}
+                <th>{{ 'neusta_pimcore_areabrick_config.areabricks.overview.table.col_headers.description'|trans }}</th>
+            {% endif %}
             <th>{{ 'neusta_pimcore_areabrick_config.areabricks.overview.table.col_headers.template'|trans }}</th>
             <th>{{ 'neusta_pimcore_areabrick_config.areabricks.overview.table.col_headers.pages'|trans }}</th>
             {% if hasAdditionalProperties %}
@@ -18,8 +26,12 @@
             <tr>
                 <td>{{ brick.name|trans }}</td>
                 <td>{{ brick.id }}</td>
-                <td>{{ brick.version }}</td>
-                <td>{{ brick.description|trans }}</td>
+                {% if hasVersions %}
+                    <td>{{ brick.version }}</td>
+                {% endif %}
+                {% if hasDescriptions %}
+                    <td>{{ brick.description|trans }}</td>
+                {% endif %}
                 <td>{{ brick.template }}</td>
                 <td>
                     {% embed "@NeustaPimcoreAreabrickConfig/bricks/pages_accordion.html.twig" with {
@@ -40,7 +52,7 @@
                 {% if hasAdditionalProperties %}
                     <td>
                         <ul class="additional-properties">
-                            {% for additionalProperty in brick.additionalProperties|default([]) %}
+                            {% for additionalProperty in brick.additionalProperties %}
                                 <li class="{% if additionalProperty.name == 'tags' %}tag{% elseif additionalProperty.name == 'groups' %}group{% endif %}">
                                     {{ additionalProperty.name }}: {{ additionalProperty.value }}
                                 </li>