Skip to content

Commit 83a2edc

Browse files
author
Hanna Hnida
committed
#557: User access Row action panel with 2+ level nesting - Mftf tests fixes
1 parent 48e609f commit 83a2edc

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnDragAndDropMultipleColumnsResizingThroughBlockContentTypeTest.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,15 @@
4343
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnOntoStage">
4444
<argument name="contentType" value="PageBuilderColumnContentType"/>
4545
</actionGroup>
46-
<actionGroup ref="dragContentTypeToContainer" stepKey="dragNewColumnToFirstColumn">
46+
<actionGroup ref="dragContentTypeToStage" stepKey="dragNewColumnToFirstColumn">
4747
<argument name="contentType" value="PageBuilderColumnContentType"/>
4848
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
4949
<argument name="containerTargetIndex" value="1"/>
50-
<argument name="contentTypeIndex" value="1"/>
5150
</actionGroup>
52-
<actionGroup ref="dragContentTypeToContainer" stepKey="dragNewColumnToSecondColumn">
51+
<actionGroup ref="dragContentTypeToStage" stepKey="dragNewColumnToSecondColumn">
5352
<argument name="contentType" value="PageBuilderColumnContentType"/>
5453
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
5554
<argument name="containerTargetIndex" value="2"/>
56-
<argument name="contentTypeIndex" value="1"/>
5755
</actionGroup>
5856
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
5957
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column-group/preview.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-group/preview.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -837,7 +837,7 @@ export default class Preview extends PreviewCollection {
837837
} else {
838838
// If we're moving to another column group we utilise the existing drop placeholder
839839
this.movePosition = this.dropPositions.find((position) => {
840-
return currentX > position.left && currentX < position.right && position.canShrink;
840+
return currentX > position.left && currentX <= position.right && position.canShrink;
841841
});
842842

843843
if (this.movePosition) {

0 commit comments

Comments
 (0)