Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IBX-7800: Removed Sub-items tab for non-containers without children #1189

Draft
wants to merge 2 commits into
base: 4.6
Choose a base branch
from
Draft
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix: Code Review
Nattfarinn committed May 16, 2024

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
commit 84fda4f9c22eb290e06e7746b8640f1653a193db
8 changes: 0 additions & 8 deletions src/contracts/Tab/AbstractEventDispatchingTab.php
Original file line number Diff line number Diff line change
@@ -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;

/**
9 changes: 0 additions & 9 deletions src/lib/Component/TabsComponent.php
Original file line number Diff line number Diff line change
@@ -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 @@
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(
@@ -92,7 +83,7 @@
return $tabEvent;
}

private function composeTabParameters(TabInterface $tab, array $parameters): array

Check failure on line 86 in src/lib/Component/TabsComponent.php

GitHub Actions / Tests (8.3)

Method Ibexa\AdminUi\Component\TabsComponent::composeTabParameters() is unused.
{
return [
'name' => $tab->getName(),
5 changes: 3 additions & 2 deletions src/lib/Tab/LocationView/SubItemsTab.php
Original file line number Diff line number Diff line change
@@ -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'];