IBX-7357: Adjusted Authors & Details tabs to modes specification (#1058)

* IBX-7357: Adjusted Authors & Details tabs to modes specification * [Behat] Adapted tests --------- Co-authored-by: Marek Nocoń <[email protected]>
ibexa · Jan 8, 2024 · da3422e · da3422e
1 parent 9323d21
commit da3422e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 33 deletions.
diff --git a/src/lib/Behat/Component/UpperMenu.php b/src/lib/Behat/Component/UpperMenu.php
@@ -52,11 +52,15 @@ public function setFocusMode(bool $expectedModeStatus): void
 
         if ($expectedModeStatus != $isEnabled) {
             $this->getHTMLPage()->find($this->getLocator('userFocusMode'))->click();
-
-            return;
+        } else {
+            $this->getHTMLPage()->find($this->getLocator('userSettingsToggle'))->click();
         }
 
-        $this->getHTMLPage()->find($this->getLocator('userSettingsToggle'))->click();
+        if ($expectedModeStatus) {
+            $this->getHTMLPage()->find($this->getLocator('focusModeBadge'))->assert()->textEquals('Focus mode');
+        } else {
+            $this->getHTMLPage()->findAll($this->getLocator('focusModeBadge'))->assert()->isEmpty();
+        }
     }
 
     public function verifyIsLoaded(): void
@@ -77,6 +81,7 @@ protected function specifyLocators(): array
             new VisibleCSSLocator('searchButton', '.ibexa-main-header .ibexa-input-text-wrapper__action-btn--search'),
             new VisibleCSSLocator('userFocusEnabled', '[name="focus_mode_change"] .ibexa-toggle__label--on'),
             new VisibleCSSLocator('userFocusMode', '[name="focus_mode_change"] .ibexa-toggle__switcher'),
+            new VisibleCSSLocator('focusModeBadge', '.ibexa-user-mode-badge'),
         ];
     }
 }
diff --git a/src/lib/Behat/Page/ContentViewPage.php b/src/lib/Behat/Page/ContentViewPage.php
@@ -185,25 +185,6 @@ public function choosePreview(string $language): void
     public function setFocusMode(bool $expectedModeStatus): void
     {
         $this->upperMenu->setFocusMode($expectedModeStatus);
-
-        // TODO: Rework this after Focus mode label is visible next to Ibexa's logo
-        $focusModeExcludedTab = 'Technical details';
-
-        if ($expectedModeStatus) {
-            $this->getHTMLPage()
-                ->setTimeout(3)
-                ->findAll($this->getLocator('tab'))
-                ->filterBy(new ElementTextCriterion($focusModeExcludedTab))
-                ->assert()
-                ->isEmpty();
-        } else {
-            $this->getHTMLPage()
-                ->setTimeout(3)
-                ->findAll($this->getLocator('tab'))
-                ->getByCriterion(new ElementTextCriterion($focusModeExcludedTab))
-                ->assert()
-                ->isVisible();
-        }
     }
 
     public function goToSubItem(string $contentItemName): void

diff --git 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\IsFocusModeEnabled;
-use Ibexa\AdminUi\UserSetting\FocusMode;
 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 IsFocusModeEnabled::fromUserSettings($this->userSettingService)->isSatisfiedBy(FocusMode::FOCUS_MODE_ON);
+        return true;
     }
 
     /**

diff --git 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
@@ -25,14 +25,13 @@ protected function createTabForVisibilityInGivenUserModeTest(UserSettingService
             $this->createMock(Environment::class),
             $this->createMock(TranslatorInterface::class),
             $this->createMock(UserService::class),
-            $userSettingService,
             $this->createMock(EventDispatcherInterface::class)
         );
     }
 
     public function dataProviderForTestTabVisibilityInGivenUserMode(): iterable
     {
         yield 'focus mode on' => [FocusMode::FOCUS_MODE_ON, [], true];
-        yield 'focus mode off' => [FocusMode::FOCUS_MODE_OFF, [], false];
+        yield 'focus mode off' => [FocusMode::FOCUS_MODE_OFF, [], true];
     }
 }