Skip to content

IBX-10450: No tooltips for edit join icons on Draft conflict modal #1709

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Oct 4, 2025
Merged

IBX-10450: No tooltips for edit join icons on Draft conflict modal #1709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d446b9e
IBX-10450: No tooltips for edit join icons on Draft conflict modal
OstafinL Sep 10, 2025
df4e828
[Tests] Fixed tests
ciastektk Sep 22, 2025
563803b
Fixed cs
ciastektk Sep 22, 2025
4ea0bd2
After CR
OstafinL Sep 23, 2025
87bef1e
After CR
OstafinL Sep 23, 2025
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
10 changes: 7 additions & 3 deletions src/bundle/Resources/public/js/scripts/helpers/tooltips.helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,12 @@ const isTitleEllipsized = (node) => {

return textHeight > nodeHeight;
};
const getContainer = (tooltipNode) => {
const { tooltipContainerSelector } = tooltipNode.dataset;
const container = tooltipNode.closest(tooltipContainerSelector);

return container ?? doc.body;
};
const initializeTooltip = (tooltipNode, hasEllipsisStyle) => {
const { delayShow, delayHide } = tooltipNode.dataset;
const delay = {
Expand All @@ -134,9 +140,7 @@ const initializeTooltip = (tooltipNode, hasEllipsisStyle) => {
const placement = tooltipNode.dataset.tooltipPlacement ?? 'bottom';
const trigger = tooltipNode.dataset.tooltipTrigger ?? 'hover';
const useHtml = tooltipNode.dataset.tooltipUseHtml !== undefined;
const container = tooltipNode.dataset.tooltipContainerSelector
? tooltipNode.closest(tooltipNode.dataset.tooltipContainerSelector)
: 'body';
const container = getContainer(tooltipNode);
const iframe = document.querySelector(tooltipNode.dataset.tooltipIframeSelector);

new bootstrap.Tooltip(tooltipNode, {
Expand Down
2 changes: 2 additions & 0 deletions src/lib/Menu/Action/VersionListActionMenuBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ private function createEditDraftAction(
bool $isDraftConflict = false
): ItemInterface {
$parameters['attributes']['class'] = self::IBEXA_BTN_CONTENT_DRAFT_EDIT_CLASS;
$parameters['attributes']['data-tooltip-container-selector'] = '.ibexa-modal';

if ($isDraftConflict) {
return $this->createDraftEditLinkAction($versionInfo, self::ITEM_EDIT_DRAFT, $parameters, $locationId);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/lib/Menu/Action/BaseActionMenuBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ protected function assertActionItemSame(
self::assertSame($url, $actionItem->getUri());
self::assertSame($itemName, $actionItem->getLabel());
self::assertSame($extras, $actionItem->getExtras());
self::assertSame($attributes, $actionItem->getAttributes());
self::assertEquals($attributes, $actionItem->getAttributes());
}

protected function createVersionInfo(int $status = ApiVersionInfo::STATUS_DRAFT): ApiVersionInfo
Expand Down
20 changes: 16 additions & 4 deletions tests/lib/Menu/Action/VersionListActionMenuBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,10 @@ public function provideDataForTestBuildVersionListActionMenu(): iterable
self::EDIT_ACTION_ITEM_EXTRAS,
array_merge(
self::EDIT_ACTION_ITEM_ATTRIBUTES,
['data-content-draft-edit-url' => '/content/edit/draft/1/1/eng-GB']
[
'data-tooltip-container-selector' => '.ibexa-modal',
'data-content-draft-edit-url' => '/content/edit/draft/1/1/eng-GB',
]
),
];

Expand All @@ -118,7 +121,10 @@ public function provideDataForTestBuildVersionListActionMenu(): iterable
self::EDIT_ACTION_ITEM_EXTRAS,
array_merge(
self::EDIT_ACTION_ITEM_ATTRIBUTES,
['data-content-draft-edit-url' => '/content/edit/draft/1/1/eng-GB/5']
[
'data-content-draft-edit-url' => '/content/edit/draft/1/1/eng-GB/5',
'data-tooltip-container-selector' => '.ibexa-modal',
]
),
];

Expand All @@ -130,7 +136,10 @@ public function provideDataForTestBuildVersionListActionMenu(): iterable
self::ITEM_EDIT_DRAFT,
'/content/edit/draft/1/1/eng-GB',
self::EDIT_ACTION_ITEM_EXTRAS,
['class' => self::IBEXA_BTN_CONTENT_DRAFT_EDIT_CLASS],
[
'class' => self::IBEXA_BTN_CONTENT_DRAFT_EDIT_CLASS,
'data-tooltip-container-selector' => '.ibexa-modal',
],
];

yield 'Restore version action item' => [
Expand Down Expand Up @@ -166,7 +175,10 @@ public function testAddUserUpdateItemAction(): void
self::EDIT_ACTION_ITEM_EXTRAS,
array_merge(
self::EDIT_ACTION_ITEM_ATTRIBUTES,
['data-content-draft-edit-url' => '/user/update/1/1/eng-GB']
[
'data-tooltip-container-selector' => '.ibexa-modal',
'data-content-draft-edit-url' => '/user/update/1/1/eng-GB',
]
)
);
}
Expand Down
Loading