MC-34764: Fix performance degradation cause by CSP

Author: Oleksandr Gorkun

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml

@@ -23,7 +23,8 @@
             <div id="product_composite_configure_form_fields" class="content product-composite-configure-inner"></div>
             <div id="product_composite_configure_form_additional" class="product_composite_configure_form_additional">
             </div>
-            <div id="product_composite_configure_form_confirmed" class="product_composite_configure_form_confirmed"></div>
+            <div id="product_composite_configure_form_confirmed" class="product_composite_configure_form_confirmed">
+            </div>
         </div>
         <input type="hidden" name="as_js_varname" value="iFrameResponse" />
         <input type="hidden" name="form_key" value="<?= $block->escapeHtmlAttr($block->getFormKey()) ?>" />
@@ -44,11 +45,11 @@
         prodCompConfIframe.style.position = "absolute";
         prodCompConfIframe.style.top = "-1000px";
         prodCompConfIframe.style.left = "-1000px";
-        document.querySelector(".product_composite_configure_messages:last-of-type").style.display = "none";
-        document.querySelector(".product_composite_configure_form_additional:last-of-type").style.display = "none";
-        document.querySelector(".product_composite_configure_form_confirmed:last-of-type").style.display = "none";
-        document.querySelector(".product_composite_configure_confirmed:last-of-type").style.display = "none";
-        document.querySelector(".product-configure-popup:last-of-type").style.display = "none";
+        document.querySelectorAll(".product_composite_configure_messages").forEach((e) => e.style.display = "none");
+        document.querySelectorAll(".product_composite_configure_form_additional").forEach((e) => e.style.display = "none");
+        document.querySelectorAll(".product_composite_configure_form_confirmed").forEach((e) => e.style.display = "none");
+        document.querySelectorAll(".product_composite_configure_confirmed").forEach((e) => e.style.display = "none");
+        document.querySelectorAll(".product-configure-popup").forEach((e) => e.style.display = "none");
 
         require([
             "jquery",

app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml

@@ -41,7 +41,8 @@ $padding = $block->getRatio() * 100;
 <?php
 $script = <<<SCRIPT
 document.querySelector('#product-image-container-{$block->getProductId()}').style.width = '{$width}px';
-document.querySelector('#product-image-container-{$block->getProductId()} span.product-image-wrapper').style.paddingBottom = '{$padding}%'
+document.querySelector('#product-image-container-{$block->getProductId()} span.product-image-wrapper')
+    .style.paddingBottom = '{$padding}%'
 SCRIPT;
-echo /* @noEscape */$secureRenderer->renderTag('script', ['type' => 'text/javascript'], $script, false);
 ?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', ['type' => 'text/javascript'], $script, false); ?>

app/code/Magento/Theme/view/frontend/templates/js/cookie_status.phtml

@@ -12,8 +12,8 @@
 </div>
 <?php
 $script = 'document.querySelector("#cookie-status").style.display = "none";';
-echo /* @noEscape */ $secureRenderer->renderTag('script', ['type' => 'text/javascript'], $script, false);
 ?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', ['type' => 'text/javascript'], $script, false); ?>
 
 <script type="text/x-magento-init">
     {