From b93c683d6296913f7ec8dee4f6c9bf56e56fc5ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Parafi=C5=84ski?= Date: Thu, 14 Dec 2023 11:46:38 +0100 Subject: [PATCH] IBX-7357: Adjusted Authors & Details tabs to modes specification --- src/lib/Tab/LocationView/AuthorsTab.php | 9 +-------- src/lib/Tab/LocationView/DetailsTab.php | 2 +- tests/lib/Tab/LocationView/AuthorsTabVisibilityTest.php | 3 +-- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/lib/Tab/LocationView/AuthorsTab.php b/src/lib/Tab/LocationView/AuthorsTab.php index 8e701c4af3..9e31bfd263 100644 --- a/src/lib/Tab/LocationView/AuthorsTab.php +++ b/src/lib/Tab/LocationView/AuthorsTab.php @@ -9,15 +9,12 @@ namespace Ibexa\AdminUi\Tab\LocationView; use Ibexa\AdminUi\Specification\UserExists; -use Ibexa\AdminUi\Specification\UserMode\IsUserModeEnabled; -use Ibexa\AdminUi\UserSetting\UserMode; use Ibexa\Contracts\AdminUi\Tab\AbstractEventDispatchingTab; use Ibexa\Contracts\AdminUi\Tab\ConditionalTabInterface; use Ibexa\Contracts\AdminUi\Tab\OrderedTabInterface; use Ibexa\Contracts\Core\Repository\UserService; use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo; use Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo; -use Ibexa\User\UserSetting\UserSettingService; use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Contracts\Translation\TranslatorInterface; @@ -29,19 +26,15 @@ class AuthorsTab extends AbstractEventDispatchingTab implements OrderedTabInterf private UserService $userService; - private UserSettingService $userSettingService; - public function __construct( Environment $twig, TranslatorInterface $translator, UserService $userService, - UserSettingService $userSettingService, EventDispatcherInterface $eventDispatcher ) { parent::__construct($twig, $translator, $eventDispatcher); $this->userService = $userService; - $this->userSettingService = $userSettingService; } public function getIdentifier(): string @@ -92,7 +85,7 @@ public function getTemplateParameters(array $contextParameters = []): array public function evaluate(array $parameters): bool { - return IsUserModeEnabled::fromUserSettings($this->userSettingService)->isSatisfiedBy(UserMode::SMART); + return true; } /** diff --git a/src/lib/Tab/LocationView/DetailsTab.php b/src/lib/Tab/LocationView/DetailsTab.php index d2d99dd7ea..635040d8bb 100644 --- a/src/lib/Tab/LocationView/DetailsTab.php +++ b/src/lib/Tab/LocationView/DetailsTab.php @@ -79,7 +79,7 @@ public function getName(): string public function getOrder(): int { - return 200; + return 750; } public function evaluate(array $parameters): bool diff --git a/tests/lib/Tab/LocationView/AuthorsTabVisibilityTest.php b/tests/lib/Tab/LocationView/AuthorsTabVisibilityTest.php index c40700c65a..4f6e17132a 100644 --- a/tests/lib/Tab/LocationView/AuthorsTabVisibilityTest.php +++ b/tests/lib/Tab/LocationView/AuthorsTabVisibilityTest.php @@ -25,7 +25,6 @@ protected function createTabForVisibilityInGivenUserModeTest(UserSettingService $this->createMock(Environment::class), $this->createMock(TranslatorInterface::class), $this->createMock(UserService::class), - $userSettingService, $this->createMock(EventDispatcherInterface::class) ); } @@ -33,6 +32,6 @@ protected function createTabForVisibilityInGivenUserModeTest(UserSettingService public function dataProviderForTestTabVisibilityInGivenUserMode(): iterable { yield 'smart mode' => [UserMode::SMART, [], true]; - yield 'expert mode' => [UserMode::EXPERT, [], false]; + yield 'expert mode' => [UserMode::EXPERT, [], true]; } }