Merge pull request #1551 from ezsystems/empty-tab-group

EZP-31983: Catched exception thrown by empty tab group
ezsystems · Oct 6, 2020 · c8c1ead · c8c1ead
2 parents cd03671 + a6677ea
commit c8c1ead
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/lib/Tab/Event/Subscriber/ConditionalTabSubscriber.php b/src/lib/Tab/Event/Subscriber/ConditionalTabSubscriber.php
@@ -11,15 +11,14 @@
 use EzSystems\EzPlatformAdminUi\Tab\ConditionalTabInterface;
 use EzSystems\EzPlatformAdminUi\Tab\Event\TabEvents;
 use EzSystems\EzPlatformAdminUi\Tab\Event\TabGroupEvent;
-use EzSystems\EzPlatformAdminUi\Tab\OrderedTabInterface;
 use EzSystems\EzPlatformAdminUi\UI\Service\TabService;
+use InvalidArgumentException;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
- * Reorders tabs according to their Order value (Tabs implementing OrderedTabInterface).
- * Tabs without order specified are pushed to the end of the group.
+ * Evaluates if tabs should be visible (Tabs implementing ConditionalTabInterface).
  *
- * @see OrderedTabInterface
+ * @see ConditionalTabInterface
  */
 class ConditionalTabSubscriber implements EventSubscriberInterface
 {
@@ -51,7 +50,11 @@ public function onTabGroupInitialize(TabGroupEvent $tabGroupEvent)
         $tabGroup = $tabGroupEvent->getData();
         $tabGroupIdentifier = $tabGroupEvent->getData()->getIdentifier();
         $parameters = $tabGroupEvent->getParameters();
-        $tabs = $this->tabService->getTabGroup($tabGroupIdentifier)->getTabs();
+        try {
+            $tabs = $this->tabService->getTabGroup($tabGroupIdentifier)->getTabs();
+        } catch (InvalidArgumentException $e) {
+            $tabs = [];
+        }
 
         foreach ($tabs as $tab) {
             if (!$tab instanceof ConditionalTabInterface || $tab->evaluate($parameters)) {