Skip to content

Commit 3b58d96

Browse files
ENGCOM-8042: Correctly revert default mode after mass image deletion #29684
- Merge Pull Request #29684 from Nazar65/magento2:ASI-1769 - Merged commits: 1. 4e11232 2. f648b8b 3. fe78100
2 parents 7fbae46 + fe78100 commit 3b58d96

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertMassActionModeNotActiveActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<annotations>
1313
<description>Asserts that massaction mode is terminated</description>
1414
</annotations>
15-
1615

16+
<dontSeeElement selector="{{AdminMediaGalleryHeaderButtonsSection.addSelected}}" stepKey="verifyAddSelectedButtonNotVisible"/>
1717
<dontSeeElement selector="{{AdminEnhancedMediaGalleryMassActionSection.totalSelected}}" stepKey="verifyTeminateMassAction"/>
1818
</actionGroup>
1919
</actionGroups>

app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryDeleteImagesInBulkTest.xml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,17 @@
1919
<group value="media_gallery_ui"/>
2020
</annotations>
2121
<before>
22+
<createData entity="SimpleSubCategory" stepKey="category"/>
2223
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
23-
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
24+
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openCategoryPage"/>
25+
<actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="openCategory">
26+
<argument name="category" value="$$category$$"/>
27+
</actionGroup>
28+
<actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
2429
</before>
30+
<after>
31+
<deleteData createDataKey="category" stepKey="deleteCategory"/>
32+
</after>
2533
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
2634
<argument name="image" value="ImageUpload"/>
2735
</actionGroup>
@@ -34,7 +42,7 @@
3442
<argument name="imageName" value="{{ImageUpload.fileName}}"/>
3543
</actionGroup>
3644
<actionGroup ref="AdminEnhancedMediaGalleryDisableMassactionModeActionGroup" stepKey="disableMassActionMode"/>
37-
45+
3846
<actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
3947
<actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
4048
<argument name="imageName" value="{{ImageUpload.fileName}}"/>

app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/massaction/massactions.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,8 @@ define([
141141
if (response.status === 'canceled') {
142142
return;
143143
}
144-
this.imageModel().selected({});
145-
this.massActionMode(false);
146-
this.switchMode();
147-
}.bind(this));
144+
$(window).trigger('terminateMassAction.MediaGallery');
145+
});
148146
}
149147
}.bind(this));
150148
}

0 commit comments

Comments
 (0)