forked from magento/magento2-page-builder
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' of https://github.com/mage-os/mirror-magento2-…
…page-builder into develop
- Loading branch information
Showing
18 changed files
with
265 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
...ctionGroup/StageActionGroup/UploadNewBackgroundImageToContentTypeFromStageActionGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright 2024 Adobe | ||
| * All Rights Reserved. | ||
| */ | ||
| --> | ||
| <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> | ||
| <actionGroup name="UploadNewBackgroundImageToContentTypeFromStageActionGroup"> | ||
| <annotations> | ||
| <description>Loads background image from Stage</description> | ||
| </annotations> | ||
| <arguments> | ||
| <argument name="backgroundImage" defaultValue="PageBuilderImageProperty_JPG"/> | ||
| <argument name="section"/> | ||
| <argument name="index" defaultValue="1" type="string"/> | ||
| </arguments> | ||
| <attachFile userInput="{{backgroundImage.value}}" selector="{{section.uploadNewImageInputWithUploaderId(index)}}" stepKey="attachBackgroundImageFromLocalToStage"/> | ||
| <waitForPageLoad stepKey="waitForLoadingMaskToDisappear"/> | ||
| <executeJS function="return window.getComputedStyle(document.evaluate('{{section.backgroundPath(index)}}', document.body).iterateNext()).backgroundImage" stepKey="backgroundImageRawValue"/> | ||
| <!-- Return the string value of background-image --> | ||
| <executeJS function="return '{{backgroundImage.value}}' ? '{$backgroundImageRawValue}'.match(/(?<=(url\(("|\'))).+(?=("|\')\))/)[0] : ''" stepKey="backgroundImageValue"/> | ||
| <!-- Convert all characters in string variables to regex friendly strings --> | ||
| <executeJS function="return '{{backgroundImage.path}}'.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\\\^\\$\|]/g, '\\\\$&')" stepKey="regexFilePath"/> | ||
| <executeJS function="return '{{backgroundImage.value}}' ? !!'{$backgroundImageValue}'.match(/.*\/(pub\/|\/)?media.*{$regexFilePath}\/{{backgroundImage.fileName}}(_\d+)?\.{{backgroundImage.extension}}/)[0] : '{$backgroundImageRawValue}' === 'none'" stepKey="actualImageResult"/> | ||
| <assertTrue stepKey="assertBackgroundImageContainsFileInformation"> | ||
| <actualResult type="variable">actualImageResult</actualResult> | ||
| </assertTrue> | ||
| </actionGroup> | ||
| </actionGroups> |
20 changes: 20 additions & 0 deletions
20
...est/Mftf/ActionGroup/StageActionGroup/UploadNewImageToContentTypeFromStageActionGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright 2024 Adobe | ||
| * All Rights Reserved. | ||
| */ | ||
| --> | ||
| <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> | ||
| <actionGroup name="UploadNewImageToContentTypeFromStageActionGroup"> | ||
| <arguments> | ||
| <argument name="property"/> | ||
| <argument name="section" defaultValue="PageBuilderStage"/> | ||
| <argument name="index" defaultValue="1" type="string"/> | ||
| </arguments> | ||
| <attachFile userInput="{{property.value}}" selector="{{section.uploadNewImageInputWithUploaderId(index)}}" stepKey="attachImageFromLocalToStage"/> | ||
| <waitForPageLoad stepKey="waitForLoadingMaskToDisappear"/> | ||
| <waitForElementVisible selector="{{section.imageSourceByIndex(index, property.fileName)}}" stepKey="waitForMainImageSource1"/> | ||
| </actionGroup> | ||
| </actionGroups> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
137 changes: 137 additions & 0 deletions
137
...er/Test/Mftf/Test/AdminPageBuilderImageTest/ImageAddToImageBannerSliderAndReplaceTest.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright 2024 Adobe | ||
| * All Rights Reserved. | ||
| */ | ||
| --> | ||
| <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> | ||
| <test name="ImageAddToImageBannerSliderAndReplaceTest"> | ||
| <annotations> | ||
| <features value="PageBuilder"/> | ||
| <stories value="Image"/> | ||
| <title value="Add Missing Image Upload functionality to all media components that support image upload in PageBuilder"/> | ||
| <description value="Add Missing Upload Image button for new Media Image, Banner and Slider and allow replacement of image in PageBuilder."/> | ||
| <severity value="AVERAGE"/> | ||
| <useCaseId value="ACP2E-3122"/> | ||
| <testCaseId value="AC-12646"/> | ||
| <group value="pagebuilder"/> | ||
| <group value="pagebuilder-image"/> | ||
| <group value="cloud"/> | ||
| </annotations> | ||
| <before> | ||
| <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/> | ||
| <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery"> | ||
| <argument name="enabled" value="0"/> | ||
| </actionGroup> | ||
| <createData entity="_defaultCmsPage" stepKey="createCMSPage"/> | ||
| </before> | ||
| <after> | ||
| <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery"> | ||
| <argument name="enabled" value="0"/> | ||
| </actionGroup> | ||
| <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage" /> | ||
| <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/> | ||
| </after> | ||
|
|
||
| <!-- Go to CMS Page in Admin --> | ||
| <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage1"> | ||
| <argument name="CMSPage" value="$$createCMSPage$$"/> | ||
| </actionGroup> | ||
|
|
||
| <!-- Switch to PageBuilder stage --> | ||
| <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/> | ||
|
|
||
| <!-- Add a row to PageBuilder stage with image --> | ||
| <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer"> | ||
| <argument name="contentType" value="PageBuilderRowContentType"/> | ||
| <argument name="containerTargetType" value="PageBuilderRootContainerContentType"/> | ||
| </actionGroup> | ||
| <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection"> | ||
| <argument name="contentType" value="PageBuilderImageContentType"/> | ||
| </actionGroup> | ||
| <actionGroup ref="dragContentTypeToStage" stepKey="dragImageIntoStage"> | ||
| <argument name="contentType" value="PageBuilderImageContentType"/> | ||
| </actionGroup> | ||
|
|
||
| <!-- Attach image to PageBuilder stage --> | ||
| <comment userInput="Upload image from stage" stepKey="uploadImageFromStage"/> | ||
| <actionGroup ref="uploadImageToContentTypeFromStage" stepKey="addImageToStage"> | ||
| <argument name="property" value="PageBuilderBackgroundImage_JPG"/> | ||
| <argument name="section" value="ImageOnStageWithoutImageUploaded"/> | ||
| </actionGroup> | ||
|
|
||
| <!-- Reattach image to PageBuilder stage --> | ||
| <comment userInput="Reattach image from stage" stepKey="uploadImageFromStage2"/> | ||
| <actionGroup ref="UploadNewImageToContentTypeFromStageActionGroup" stepKey="addImageToStage2"> | ||
| <argument name="property" value="PageBuilderBackgroundImage_JPG"/> | ||
| <argument name="section" value="ImageOnStageWithoutImageUploaded"/> | ||
| </actionGroup> | ||
|
|
||
| <!-- Remove Image Content --> | ||
| <comment userInput="Remove Image Content" stepKey="commentRemoveImageContent"/> | ||
| <actionGroup ref="removeContentTypeFromStage" stepKey="removeImageContentTypeFromStage"> | ||
| <argument name="contentType" value="PageBuilderImageContentType"/> | ||
| </actionGroup> | ||
|
|
||
| <!-- Add Banner --> | ||
| <comment userInput="Add Banner" stepKey="commentAddBanner"/> | ||
| <actionGroup ref="dragContentTypeToStage" stepKey="dragBannerIntoStage"> | ||
| <argument name="contentType" value="PageBuilderBannerContentType"/> | ||
| </actionGroup> | ||
|
|
||
| <!-- Verify On Hover Upload Button Work--> | ||
| <comment userInput="Verify On Hover Upload Buttons Work" stepKey="commentVerifyButtonsOnBanner"/> | ||
| <actionGroup ref="unFocusOptionMenu" stepKey="unFocusOptionMenuOnBanner"> | ||
| <argument name="contentType" value="PageBuilderBannerContentType"/> | ||
| </actionGroup> | ||
|
|
||
| <!-- Attach image to Banner in PageBuilder stage --> | ||
| <comment userInput="Attach image to Banner in PageBuilder stage" stepKey="commentAttachImageToBanner"/> | ||
| <actionGroup ref="UploadNewBackgroundImageToContentTypeFromStageActionGroup" stepKey="addImageToBannerFromStage"> | ||
| <argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/> | ||
| <argument name="section" value="BannerOnBackend"/> | ||
| </actionGroup> | ||
|
|
||
| <!-- Reattach image to Banner in PageBuilder stage --> | ||
| <comment userInput="Reattach image to Banner in PageBuilder stage" stepKey="commentReattachImageToBanner"/> | ||
| <actionGroup ref="UploadNewBackgroundImageToContentTypeFromStageActionGroup" stepKey="addNewImageToBannerFromStage"> | ||
| <argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/> | ||
| <argument name="section" value="BannerOnBackend"/> | ||
| </actionGroup> | ||
|
|
||
| <!-- Remove Banner Content --> | ||
| <comment userInput="Remove Banner Content" stepKey="commentRemoveBannerContent"/> | ||
| <actionGroup ref="removeContentTypeFromStage" stepKey="removeBannerContentTypeFromStage"> | ||
| <argument name="contentType" value="PageBuilderBannerContentType"/> | ||
| </actionGroup> | ||
|
|
||
| <!-- Add Slider --> | ||
| <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle"> | ||
| <argument name="contentType" value="PageBuilderSliderContentType"/> | ||
| </actionGroup> | ||
| <actionGroup ref="dragContentTypeToStage" stepKey="dragSliderIntoStage"> | ||
| <argument name="contentType" value="PageBuilderSliderContentType"/> | ||
| </actionGroup> | ||
|
|
||
| <!-- Verify On Hover Upload Button Work--> | ||
| <comment userInput="Verify On Hover Upload Buttons Work" stepKey="commentVerifyButtonsOnSlider"/> | ||
| <click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusSlider"/> | ||
| <actionGroup ref="verifyUploadImageButtons" stepKey="verifyUploadImageButtons"> | ||
| <argument name="contentType" value="PageBuilderSliderContentType"/> | ||
| </actionGroup> | ||
|
|
||
| <!-- Attach image to Slider in PageBuilder stage --> | ||
| <actionGroup ref="UploadNewBackgroundImageToContentTypeFromStageActionGroup" stepKey="addNewImageToSliderFromStage"> | ||
| <argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/> | ||
| <argument name="section" value="SlideOnBackend"/> | ||
| </actionGroup> | ||
|
|
||
| <!-- Remove Slider Content --> | ||
| <comment userInput="Remove Slider Content" stepKey="commentRemoveSliderContent"/> | ||
| <actionGroup ref="removeContentTypeFromStage" stepKey="removeSliderContentTypeFromStage"> | ||
| <argument name="contentType" value="PageBuilderSliderContentType"/> | ||
| </actionGroup> | ||
| </test> | ||
| </tests> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/file-uploader.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /** | ||
| * Copyright 2024 Adobe | ||
| * All Rights Reserved. | ||
| */ | ||
|
|
||
| define([ | ||
| 'jquery' | ||
| ], function ($) { | ||
| 'use strict'; | ||
|
|
||
| return function (Element) { | ||
| return Element.extend({ | ||
|
|
||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
| replaceInputTypeFile: function (fileInput) { | ||
| let fileId = fileInput.id, fileName = fileInput.name, fileClass = fileInput.className, | ||
| spanElement = '<span id=\'' + fileId + fileClass + '\' ></span>'; | ||
|
|
||
| $('#' + fileId).closest('.file-uploader-area').attr('upload-area-id', fileName); | ||
| $('#' + fileId + fileClass).closest('.file-uploader-area').attr('upload-area-id', fileName); | ||
|
|
||
| $(fileInput).replaceWith(spanElement); | ||
|
|
||
| $('#' + fileId).closest('.file-uploader-area').find('.file-uploader-button:first').on('click', function () { | ||
| $(this).closest('.file-uploader-area').find('.uppy-Dashboard-browse').trigger('click'); | ||
| }); | ||
|
|
||
| $('#' + fileId + fileClass).closest('.file-uploader-area').find('.action-upload-image').on('click', function () { | ||
| $(this).closest('.file-uploader-area').find('.uppy-Dashboard-browse').trigger('click'); | ||
| }); | ||
| }, | ||
| }); | ||
| }; | ||
| }); |
Oops, something went wrong.