fix: Code Review

ibexa · Mar 1, 2024 · b14080a · b14080a
1 parent a9d7936
commit b14080a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 19 deletions.
diff --git a/src/contracts/Tab/AbstractEventDispatchingTab.php b/src/contracts/Tab/AbstractEventDispatchingTab.php
@@ -49,14 +49,6 @@ public function renderView(array $parameters): string
         );
     }
 
-    /**
-     * @param array<string, mixed> $parameters
-     */
-    public function isEnabled(array $parameters): bool
-    {
-        return true;
-    }
-
     abstract public function getTemplate(): string;
 
     /**

diff --git a/src/lib/Component/TabsComponent.php b/src/lib/Component/TabsComponent.php
@@ -13,7 +13,6 @@
 use Ibexa\AdminUi\Tab\Event\TabGroupEvent;
 use Ibexa\AdminUi\Tab\TabGroup;
 use Ibexa\Contracts\AdminUi\Component\Renderable;
-use Ibexa\Contracts\AdminUi\Tab\AbstractEventDispatchingTab;
 use Ibexa\Contracts\AdminUi\Tab\TabInterface;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use Twig\Environment;
@@ -65,14 +64,6 @@ public function render(array $parameters = []): string
         foreach ($tabGroupEvent->getData()->getTabs() as $tab) {
             $tabEvent = $this->dispatchTabPreRenderEvent($tab, $parameters);
             $parameters = array_merge($parameters, $tabGroupEvent->getParameters(), $tabEvent->getParameters());
-            // BC Safe: @todo move AbstractEventDispatchingTab::isEnabled to TabInterface
-            $isEnabled = $tab instanceof AbstractEventDispatchingTab
-                ? $tab->isEnabled($parameters)
-                : true;
-
-            if ($isEnabled) {
-                $tabs[] = $this->composeTabParameters($tabEvent->getData(), $parameters);
-            }
         }
 
         return $this->twig->render(

diff --git a/src/lib/Tab/LocationView/SubItemsTab.php b/src/lib/Tab/LocationView/SubItemsTab.php
@@ -9,14 +9,15 @@
 namespace Ibexa\AdminUi\Tab\LocationView;
 
 use Ibexa\Contracts\AdminUi\Tab\AbstractEventDispatchingTab;
+use Ibexa\Contracts\AdminUi\Tab\ConditionalTabInterface;
 use Ibexa\Contracts\AdminUi\Tab\OrderedTabInterface;
 use Ibexa\Contracts\Core\Repository\LocationService;
 use JMS\TranslationBundle\Annotation\Desc;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Twig\Environment;
 
-class SubItemsTab extends AbstractEventDispatchingTab implements OrderedTabInterface
+class SubItemsTab extends AbstractEventDispatchingTab implements OrderedTabInterface, ConditionalTabInterface
 {
     private LocationService $locationService;
 
@@ -54,7 +55,7 @@ public function getTemplate(): string
         return '@ibexadesign/content/tab/sub_items.html.twig';
     }
 
-    public function isEnabled(array $parameters): bool
+    public function evaluate(array $parameters): bool
     {
         /** @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $contentType */
         $contentType = $parameters['contentType'];