Skip to content

Commit 6f55df0

Browse files
magento-engcom-teammagento-engcom-team
committed
ENGCOM-8015: #1703: The deleted tags are not removed from Tags drop-down until the web page is refreshed #29400
- Merge Pull Request #29400 from yolouiese/magento2:1703-deleted-tags-not-removed - Merged commits: 1. b2b45e6 2. c716884 3. 9a2f265 4. 8d9d0a5 5. 512942e 6. 7e34bc9 7. 0f9189e 8. c4055cc 9. 3b350fd 10. bf77de0 11. 5f1d43a
2 parents 4930963 + 5f1d43a commit 6f55df0

6 files changed

+111
-1
lines changed

‎app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryEditAssetRemoveKeywordActionGroup.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminMediaGalleryEditAssetRemoveKeywordActionGroup">
12+
<annotations>
13+
<description>Remove Keywords on the Edit Details panel</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="keyword" type="string"/>
17+
</arguments>
18+
19+
<click selector="{{AdminEnhancedMediaGalleryEditDetailsSection.removeSelectedKeyword(keyword)}}" stepKey="removeKeyword"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssetAdminEnhancedMediaGalleryAssetDetailsKeywordsAbsentActionGroup.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AssetAdminEnhancedMediaGalleryAssetDetailsKeywordsAbsentActionGroup">
12+
<annotations>
13+
<description>Verifies that the passed comma-separated list of keywords are not present on the View Details panel</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="keywords" type="string"/>
17+
</arguments>
18+
19+
<grabTextFrom selector="{{AdminEnhancedMediaGalleryViewDetailsSection.keywords}}" stepKey="grabKeywords"/>
20+
<assertStringNotContainsString stepKey="verifyKeywords">
21+
<actualResult type="variable">grabKeywords</actualResult>
22+
<expectedResult type="string">{{keywords}}</expectedResult>
23+
</assertStringNotContainsString>
24+
</actionGroup>
25+
</actionGroups>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryEditDetailsSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<element name="description" type="textarea" selector="#description"/>
1515
<element name="newKeyword" type="input" selector="[data-ui-id='keyword']"/>
1616
<element name="addNewKeyword" type="input" selector="[data-ui-id='add-keyword']"/>
17+
<element name="removeSelectedKeyword" type="button" selector="//span[contains(text(), '{{keyword}}')]/following-sibling::button[@data-action='remove-selected-item']" parameterized="true"/>
1718
<element name="cancel" type="button" selector="#image-details-action-cancel"/>
1819
<element name="save" type="button" selector="#image-details-action-save"/>
1920
</section>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyUpdatedTagsTest.xml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
9+
<test name="AdminEnhancedMediaGalleryVerifyUpdatedTagsTest">
10+
<annotations>
11+
<features value="MediaGallery"/>
12+
<useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1703"/>
13+
<title value="User checks if the deleted tags are removed from Edit page, Tags field"/>
14+
<stories value="User checks if the deleted tags are removed from Edit page, Tags field"/>
15+
<testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1337102/scenarios/5064888"/>
16+
<description value="User checks if changes made on the tags are updated from Edit page, Tags field"/>
17+
<severity value="CRITICAL"/>
18+
<group value="media_gallery_ui"/>
19+
</annotations>
20+
<before>
21+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
22+
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
23+
</before>
24+
<after>
25+
<actionGroup ref="AdminEnhancedMediaGalleryImageDetailsDeleteActionGroup" stepKey="deleteImage"/>
26+
</after>
27+
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
28+
<argument name="image" value="ImageUpload3"/>
29+
</actionGroup>
30+
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="viewImageDetails"/>
31+
<actionGroup ref="AdminEnhancedMediaGalleryImageDetailsEditActionGroup" stepKey="editImage"/>
32+
<actionGroup ref="AdminMediaGalleryEditAssetAddKeywordActionGroup" stepKey="setKeywords">
33+
<argument name="keyword" value="UpdatedImageDetails.keyword"/>
34+
</actionGroup>
35+
<actionGroup ref="AdminEnhancedMediaGalleryImageDetailsSaveActionGroup" stepKey="saveImage">
36+
<argument name="image" value="UpdatedImageDetails"/>
37+
</actionGroup>
38+
<actionGroup ref="AdminEnhancedMediaGalleryVerifyImageKeywordsActionGroup" stepKey="verifyAddedKeywords">
39+
<argument name="keywords" value="UpdatedImageDetails.keyword"/>
40+
</actionGroup>
41+
<actionGroup ref="AdminEnhancedMediaGalleryImageDetailsEditActionGroup" stepKey="updateImageDetails"/>
42+
<actionGroup ref="AdminMediaGalleryEditAssetRemoveKeywordActionGroup" stepKey="removeKeywords">
43+
<argument name="keyword" value="{{UpdatedImageDetails.keyword}}"/>
44+
</actionGroup>
45+
<actionGroup ref="AdminEnhancedMediaGalleryImageDetailsSaveActionGroup" stepKey="saveUpdatedImage">
46+
<argument name="image" value="UpdatedImageDetails"/>
47+
</actionGroup>
48+
<actionGroup ref="AssetAdminEnhancedMediaGalleryAssetDetailsKeywordsAbsentActionGroup" stepKey="verifyRemovedKeywords">
49+
<argument name="keywords" value="{{UpdatedImageDetails.keyword}}"/>
50+
</actionGroup>
51+
</test>
52+
</tests>

‎app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-actions.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ define([
8686
form = modalElement.find('#image-edit-details-form'),
8787
imageId = this.imageModel().getSelected().id,
8888
keywords = this.mediaGalleryEditDetails().selectedKeywords(),
89-
imageDetails = this.mediaGalleryImageDetails();
89+
imageDetails = this.mediaGalleryImageDetails(),
90+
imageEditDetails = this.mediaGalleryEditDetails();
9091

9192
if (form.validation('isValid')) {
9293
saveDetails(
@@ -98,6 +99,7 @@ define([
9899
this.closeModal();
99100
this.imageModel().reloadGrid();
100101
imageDetails.removeCached(imageId);
102+
imageEditDetails.removeCached(imageId);
101103

102104
if (imageDetails.isActive()) {
103105
imageDetails.showImageDetailsById(imageId);

‎app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-edit.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,15 @@ define([
223223
}
224224

225225
return true;
226+
},
227+
228+
/**
229+
* Remove cached image details in edit form
230+
*
231+
* @param {String} id
232+
*/
233+
removeCached: function (id) {
234+
delete this.images[id];
226235
}
227236
});
228237
});

0 commit comments

Comments
 (0)