Merge branch 'platform-health' of https://github.com/andrewbess/magento2 into improvement/CE-32868-update-monolog-to-latest-version

� Conflicts:
�	composer.json
�	composer.lock

Author: andrewbess

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

@@ -0,0 +1,3 @@
+"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"
+"<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>"
+

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

@@ -19,4 +19,4 @@
             </block>
         </referenceContainer>
     </body>
-</page>
+</page>

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

@@ -49,7 +49,7 @@
             <state>true</state>
             <options>
                 <option name="modalClass" xsi:type="string">admin-usage-notification</option>
-                <option name="title" xsi:type="string" translate="true">Allow admin usage data collection</option>
+                <option name="title" xsi:type="string" translate="true">Allow Adobe to collect usage data to improve user experience and offer in-product guidance</option>
                 <option name="autoOpen" xsi:type="boolean">true</option>
                 <option name="type" xsi:type="string">popup</option>
                 <option name="clickableOverlay" xsi:type="boolean">false</option>
@@ -82,11 +82,7 @@
                     <item name="config" xsi:type="array">
                         <item name="label" xsi:type="string"/>
                         <item name="additionalClasses" xsi:type="string">release-notification-text</item>
-                        <item name="text" xsi:type="string" translate="true"><![CDATA[
-                        <p>Help us improve Magento Admin by allowing us to collect usage data.</p>
-                        <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>
-                        <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>
-]]></item>
+                        <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>
                     </item>
                 </argument>
             </container>

app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml

@@ -91,7 +91,7 @@ if ($isField) {
 
         <?php if ($element->hasAdvanced() && !$isField) : ?>
             <?= (!$element->getNoContainer() && $advancedAfter)  ? '</fieldset>' : '' ?>
-            <details data-mage-init='{"details": {}}' class="details admin__collapsible-block-wrapper" id="details<?= /* @noEscape */ $id ?>">
+            <details class="details admin__collapsible-block-wrapper" id="details<?= /* @noEscape */ $id ?>">
                 <summary class="details-summary admin__collapsible-title" id="details-summary<?= /* @noEscape */ $id ?>">
                     <span><?= $block->escapeHtml($advancedLabel) ?></span>
                 </summary>

app/code/Magento/Backend/view/adminhtml/web/js/dashboard/chart.js

@@ -9,6 +9,7 @@ define([
     'jquery',
     'chartJs',
     'jquery-ui-modules/widget',
+    'chartjs/chartjs-adapter-moment',
     'moment'
 ], function ($, Chart) {
     'use strict';
@@ -74,7 +75,7 @@ define([
             $(this.element).toggle(response.data.length > 0);
             $(this.element).next('.dashboard-diagram-nodata').toggle(response.data.length === 0);
 
-            this.chart.options.scales.xAxes[0].time.unit = this.options.periodUnits[this.period] ?
+            this.chart.options.scales.xAxis.time.unit = this.options.periodUnits[this.period] ?
                 this.options.periodUnits[this.period] : 'hour';
             this.chart.data.datasets[0].data = response.data;
             this.chart.data.datasets[0].label = response.label;
@@ -89,6 +90,8 @@ define([
                 type: 'bar',
                 data: {
                     datasets: [{
+                        yAxisID: 'yAxis',
+                        xAxisID: 'xAxis',
                         data: [],
                         backgroundColor: '#f1d4b3',
                         borderColor: '#eb5202',
@@ -101,20 +104,19 @@ define([
                         position: 'bottom'
                     },
                     scales: {
-                        xAxes: [{
+                        xAxis: {
                             offset: true,
                             type: 'time',
                             ticks: {
-                                autoSkip: true,
                                 source: 'data'
                             }
-                        }],
-                        yAxes: [{
+                        },
+                        yAxis: {
                             ticks: {
                                 beginAtZero: true,
                                 precision: this.options.precision
                             }
-                        }]
+                        }
                     }
                 }
             };

app/code/Magento/Bundle/view/frontend/web/js/float.js

@@ -19,7 +19,6 @@
         <element name="Save" type="button" selector="#save" timeout="30"/>
         <element name="DeleteAttribute" type="button" selector="#delete" timeout="30"/>
         <element name="SaveAndEdit" type="button" selector="#save_and_edit_button" timeout="30"/>
-        <element name="TinyMCE4" type="button" selector="//span[text()='Default Value']/parent::label/following-sibling::div//*[contains(@class,'mce-branding')]"/>
         <element name="checkIfTabOpen" selector="//div[@id='advanced_fieldset-wrapper' and not(contains(@class,'opened'))]" type="button"/>
         <element name="useInLayeredNavigation" type="select" selector="#is_filterable"/>
         <element name="addSwatch" type="button" selector="#add_new_swatch_text_option_button"/>