Skip to content

Commit 879d13f

Browse files
paras89paras89
committed
Merge branch '2.4-develop' of github.com:magento-engcom/magento2ce into region-updater-magento2-32996
2 parents 54d838d + 77bfde9 commit 879d13f

File tree

409 files changed

+14868
-12544
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

409 files changed

+14868
-12544
lines changed

‎app/code/Magento/AdminAnalytics/i18n/en_US.csv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
"Allow Adobe to collect usage data to improve user experience and offer in-product guidance", "Allow Adobe to collect usage data to improve user experience and offer in-product guidance"
2+
"<p>By clicking on <b>Allow</b>, you agree that we may collect anonymous usage data from you to:</p> <ol class=""modal-list""> <li>Help us improve the Magento Admin user experience</li> <li>Provide interactive in-product guidance, such as technical support and tips to improve utilization of the product from within the Admin UI. This may include notifications of new features, product support/guidance, onboarding information, tooltips, and more.</li> </ol> <p>All usage data that we collect for this purpose cannot be used to individually identify you and is used only to improve the Magento Admin UI and related products and services.</p> <p>You can learn more and opt-out at any time by following the instructions in <a href=""https://docs.magento.com/user-guide/configuration/advanced/admin.html#admin-usage"">merchant documentation</a>.</p>", "<p>By clicking on <b>Allow</b>, you agree that we may collect anonymous usage data from you to:</p> <ol class=""modal-list""> <li>Help us improve the Magento Admin user experience</li> <li>Provide interactive in-product guidance, such as technical support and tips to improve utilization of the product from within the Admin UI. This may include notifications of new features, product support/guidance, onboarding information, tooltips, and more.</li> </ol> <p>All usage data that we collect for this purpose cannot be used to individually identify you and is used only to improve the Magento Admin UI and related products and services.</p> <p>You can learn more and opt-out at any time by following the instructions in <a href=""https://docs.magento.com/user-guide/configuration/advanced/admin.html#admin-usage"">merchant documentation</a>.</p>"
3+

‎app/code/Magento/AdminAnalytics/view/adminhtml/layout/adminhtml_dashboard_index.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
</block>
2020
</referenceContainer>
2121
</body>
22-
</page>
22+
</page>

‎app/code/Magento/AdminAnalytics/view/adminhtml/ui_component/admin_usage_notification.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<state>true</state>
5050
<options>
5151
<option name="modalClass" xsi:type="string">admin-usage-notification</option>
52-
<option name="title" xsi:type="string" translate="true">Allow admin usage data collection</option>
52+
<option name="title" xsi:type="string" translate="true">Allow Adobe to collect usage data to improve user experience and offer in-product guidance</option>
5353
<option name="autoOpen" xsi:type="boolean">true</option>
5454
<option name="type" xsi:type="string">popup</option>
5555
<option name="clickableOverlay" xsi:type="boolean">false</option>
@@ -82,11 +82,7 @@
8282
<item name="config" xsi:type="array">
8383
<item name="label" xsi:type="string"/>
8484
<item name="additionalClasses" xsi:type="string">release-notification-text</item>
85-
<item name="text" xsi:type="string" translate="true"><![CDATA[
86-
<p>Help us improve Magento Admin by allowing us to collect usage data.</p>
87-
<p>All usage data that we collect for this purpose cannot be used to individually identify you and is used only to improve the Magento Admin and related products and services.</p>
88-
<p>You can learn more and opt out at any time by following the instructions in <a href="https://docs.magento.com/user-guide/stores/admin.html" target="_blank" tabindex="0">merchant documentation</a>.</p>
89-
]]></item>
85+
<item name="text" xsi:type="string" translate="true"><![CDATA[<p>By clicking on <b>Allow</b>, you agree that we may collect anonymous usage data from you to:</p> <ol class="modal-list"> <li>Help us improve the Magento Admin user experience</li> <li>Provide interactive in-product guidance, such as technical support and tips to improve utilization of the product from within the Admin UI. This may include notifications of new features, product support/guidance, onboarding information, tooltips, and more.</li> </ol> <p>All usage data that we collect for this purpose cannot be used to individually identify you and is used only to improve the Magento Admin UI and related products and services.</p> <p>You can learn more and opt-out at any time by following the instructions in <a href="https://docs.magento.com/user-guide/configuration/advanced/admin.html#admin-usage">merchant documentation</a>.</p>]]></item>
9086
</item>
9187
</argument>
9288
</container>

‎app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ define([
5252
tmpl = $(tmpl);
5353

5454
this.element.html(
55-
$('<ul />', {
55+
$('<ul></ul>', {
5656
'class': 'message-system-list'
5757
}).append(tmpl)
5858
).trigger('contentUpdated');

‎app/code/Magento/AwsS3/Test/Mftf/Suite/RemoteStorageAwsS3EnabledSuite.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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+
<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
9+
<suite name="RemoteStorageAwsS3EnabledSuite">
10+
<before>
11+
<!-- Enable AWS S3 Remote Storage -->
12+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage"/>
13+
</before>
14+
<after>
15+
<!-- Disable Remote Storage -->
16+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage"/>
17+
</after>
18+
<include>
19+
<group name="remote_storage_aws_s3"/>
20+
</include>
21+
<exclude>
22+
<group name="remote_storage_disabled"/>
23+
<group name="remote_storage_aws_s3_pagebuilder"/>
24+
</exclude>
25+
</suite>
26+
</suites>

‎app/code/Magento/AwsS3/Test/Mftf/Suite/RemoteStorageDisabledSuite.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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+
<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
9+
<suite name="RemoteStorageDisabledSuite">
10+
<before>
11+
<!-- Disable Remote Storage -->
12+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage"/>
13+
</before>
14+
<after>
15+
<!-- Disable Remote Storage -->
16+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage"/>
17+
</after>
18+
<include>
19+
<group name="remote_storage_disabled"/>
20+
</include>
21+
</suite>
22+
</suites>

‎app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ExportBundleProductTest.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,14 @@
2727
</annotations>
2828

2929
<before>
30-
<!-- Enable AWS S3 Remote Storage -->
31-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" before="firstSimpleProductForDynamic"/>
30+
<comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
3231
</before>
3332

3433
<after>
3534
<helper class="\Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="deleteDirectory" stepKey="deleteExportFileDirectory">
3635
<argument name="path">import_export/export</argument>
3736
</helper>
38-
39-
<!-- Disable AWS S3 Remote Storage -->
40-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
37+
<comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
4138
</after>
4239

4340
<!-- Validate Export File on File System: Dynamic Bundle Product -->

‎app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ExportDownloadableProductWithFileLinksTest.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,14 @@
2828
</annotations>
2929

3030
<before>
31-
<!-- Enable AWS S3 Remote Storage -->
32-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" before="createCategory"/>
31+
<comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
3332
</before>
3433

3534
<after>
3635
<helper class="\Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="deleteDirectory" stepKey="deleteExportFileDirectory">
3736
<argument name="path">import_export/export</argument>
3837
</helper>
39-
40-
<!-- Disable AWS S3 Remote Storage -->
41-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
38+
<comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
4239
</after>
4340

4441
<!-- Validate Export File on S3 -->

‎app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ExportDownloadableProductWithURLLinksTest.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,14 @@
2828
</annotations>
2929

3030
<before>
31-
<!-- Enable AWS S3 Remote Storage -->
32-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" before="addDownloadableDomain"/>
31+
<comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
3332
</before>
3433

3534
<after>
3635
<helper class="\Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="deleteDirectory" stepKey="deleteExportFileDirectory">
3736
<argument name="path">import_export/export</argument>
3837
</helper>
39-
40-
<!-- Disable AWS S3 Remote Storage -->
41-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
38+
<comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
4239
</after>
4340

4441
<!-- Validate Export File on S3 -->

‎app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ExportGroupedProductWithSpecialPriceTest.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,14 @@
2727
</annotations>
2828

2929
<before>
30-
<!-- Enable AWS S3 Remote Storage -->
31-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" before="createFirstSimpleProduct"/>
30+
<comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
3231
</before>
3332

3433
<after>
3534
<helper class="\Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="deleteDirectory" stepKey="deleteExportFileDirectory">
3635
<argument name="path">import_export/export</argument>
3736
</helper>
38-
39-
<!-- Disable AWS S3 Remote Storage -->
40-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
37+
<comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
4138
</after>
4239

4340
<!-- Validate Export File on S3: Grouped Product with Special Price -->

0 commit comments

Comments
 (0)