Merge branch '2.4-develop' into B2B-1847

Author: rganin

app/code/Magento/AdminNotification/view/adminhtml/web/js/grid/columns/message.js

@@ -36,6 +36,16 @@ define([
             return record[this.messageIndex];
         },
 
+        /**
+         * Proxy to getLabel function with UnsanitizedHtml suffix
+         *
+         * @param {Object} record
+         * @returns {String}
+         */
+        getLabelUnsanitizedHtml: function (record) {
+            return this.getLabel(record);
+        },
+
         /** @inheritdoc */
         getFieldClass: function ($row) {
             var status = this.statusMap[$row.status] || 'warning',

app/code/Magento/AdminNotification/view/adminhtml/web/template/grid/cells/message.html

@@ -5,4 +5,4 @@
  */
 -->
 <div css="$col.getFieldClass($row())"
-     html="$col.getLabel($row())"/>
+     html="$col.getLabelUnsanitizedHtml($row())"></div>

app/code/Magento/AsynchronousOperations/Model/AccessValidator.php

@@ -55,6 +55,6 @@ public function isAllowed($bulkUuid)
             $this->bulkSummaryFactory->create(),
             $bulkUuid
         );
-        return $bulkSummary->getUserId() === $this->userContext->getUserId();
+        return ((int) $bulkSummary->getUserId()) === ((int) $this->userContext->getUserId());
     }
 }

app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/form/field.html

@@ -6,4 +6,4 @@
 -->
 <div css="$data.additionalClasses"
      if="error"
-     text="error"/>
+     text="error"></div>

app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/grid/cells/actions.html

@@ -11,5 +11,5 @@
             attr="{
                 title: $action().label
             }"
-    />
+    ></button>
 </div>

app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/grid/listing.html

@@ -31,12 +31,12 @@
                 <a class="action__message-log"
                    href="#"
                    click="dismissAll"
-                   text="dismissAllText"/>
+                   text="dismissAllText"></a>
                 <a class="action__message-log"
                     attr="{
                         href: link
                     }"
-                    text="linkText"/>
+                    text="linkText"></a>
             </div>
         </div>
     </div>

app/code/Magento/Authorization/Model/CompositeUserContext.php

@@ -60,7 +60,7 @@ protected function add(UserContextInterface $userContext)
      */
     public function getUserId()
     {
-        return $this->getUserContext() ? $this->getUserContext()->getUserId() : null;
+        return $this->getUserContext() ? ((int) $this->getUserContext()->getUserId()) : null;
     }
 
     /**

app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html

@@ -16,7 +16,7 @@
                 class="action-secondary"
                 type="button"
                 click="processingAddChild.bind($data, false, false, false)">
-            <span translate="addButtonLabel"/>
+            <span translate="addButtonLabel"></span>
         </button>
     </div>
 
@@ -30,7 +30,7 @@
      css="$data.setClasses($data)"
      attr="'data-index': index">
     <label if="$data.label" class="admin__field-label" attr="for: $data.uid">
-        <span translate="$data.label"/>
+        <span translate="$data.label"></span>
     </label>
 
     <div class="admin__field-control" data-role="grid-wrapper">
@@ -47,14 +47,14 @@
                 <thead if="element.columnsHeader">
                     <tr>
                         <th if="$data.dndConfig.enabled"
-                            class="data-grid-draggable-row-cell"/>
+                            class="data-grid-draggable-row-cell"></th>
 
                         <th repeat="foreach: labels, item: '$label'"
                             class="data-grid-th"
                             visible="$label().visible"
                             disable="$label().disabled"
                             css="setClasses($label())">
-                            <span translate="$label().label"/>
+                            <span translate="$label().label"></span>
                         </th>
                     </tr>
                 </thead>
@@ -65,15 +65,15 @@
                         css="'_odd-row': $index % 2">
                         <td if="dndConfig.enabled"
                             class="data-grid-draggable-row-cell"
-                            template="name: dndConfig.template, data: dnd"/>
+                            template="name: dndConfig.template, data: dnd"></td>
 
                         <!-- ko foreach: { data: $record().elems(), as: 'elem'}  -->
                         <td if="elem.template"
                             visible="elem.visible() && elem.formElement !== 'hidden'"
                             disable="elem.disabled"
                             css="$parent.setClasses(elem)"
                             template="elem.template"
-                            attr="'data-index': index"/>
+                            attr="'data-index': index"></td>
                         <!-- /ko -->
                     </tr>
                 </tbody>

app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml

@@ -69,7 +69,7 @@
                         class="input-text admin__control-text qty validate-greater-than-zero<?php if (!$_canChangeQty) { echo ' qty-disabled'; } ?>"
                         type="text"
                         name="bundle_option_qty[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-                        value="<?= $block->escapeHtmlAttr($_defaultQty) ?>" />
+                        value="<?= $block->escapeHtmlAttr($_defaultQty) ?>"></div>
                 </div>
             </div>
         </div>

app/code/Magento/Bundle/view/base/web/template/product/price/minimal_price.html

@@ -9,14 +9,14 @@
           css="getAdjustmentCssClasses($row())">
         <span if="label"
               class="price-label"
-              text="label"/>
+              text="label"></span>
 
         <span class="price-wrapper"
               css="priceWrapperCssClasses"
               attr="priceWrapperAttr"
               data-price-amount=""
               data-price-type=""
-              html="getMinimalPrice($row())"/>
+              html="getMinimalPriceUnsanitizedHtml($row())"></span>
 
         <each args="data: getAdjustments(), as: '$adj'">
                 <render args="$adj.getBody()"/>