Merge branch '2.4-develop' into B2B-1887-1889

Author: rganin

.github/CONTRIBUTING.md

@@ -33,7 +33,7 @@ This will allow you to collaborate with the Magento 2 development team, fork the
 1. Search current [listed issues](https://github.com/magento/magento2/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
 2. Review the [Contributor License Agreement](https://opensource.adobe.com/cla.html) if this is your first time contributing.
 3. Create and test your work.
-4. Fork the Magento 2 repository according to the [Fork A Repository instructions](https://devdocs.magento.com/guides/v2.4/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](https://devdocs.magento.com/guides/v2.4/contributor-guide/contributing.html#pull_request).
+4. Follow the [Forks And Pull Requests Instructions](https://devdocs.magento.com/contributor-guide/contributing.html#forks-and-pull-requests) to fork the Magento 2 repository and send us a pull request.
 5. Once your contribution is received the Magento 2 development team will review the contribution and collaborate with you as needed.
 
 ## Code of Conduct
@@ -43,6 +43,6 @@ The full text is available in the repository [Wiki](https://github.com/magento/m
 
 ## Connecting with Community!
 
-If you have any questions, join us in [#beginners](https://magentocommeng.slack.com/messages/CH8BGFX9D) Slack chat. If you are not on our slack, [click here](http://tinyurl.com/engcom-slack) to join.
+If you have any questions, join us in [#beginners](https://magentocommeng.slack.com/archives/CH8BGFX9D) Slack chat. If you are not on our slack, [click here](http://tinyurl.com/engcom-slack) to join.
 
 Need to find a project? Check out the [Slack Channels](https://github.com/magento/magento2/wiki/Slack-Channels) (with listed project info) and the [Magento Community Portal](https://opensource.magento.com/).

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

@@ -1432,4 +1432,18 @@
         <data key="name" unique="suffix">ProductWithSku24MB06-</data>
         <data key="sku" unique="suffix">24 MB06 </data>
     </entity>
+    <entity name="SimpleProduct50" type="product">
+        <data key="name" unique="suffix">Simple Product </data>
+        <data key="sku" unique="suffix">SimpleProduct</data>
+        <data key="urlKey" unique="suffix">simple-product-</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="price">50.00</data>
+        <data key="visibility">4</data>
+        <data key="status">1</data>
+        <data key="quantity">1000</data>
+        <data key="weight">1</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
 </entities>