Merge remote-tracking branch 'origin/AC-4958' into spartans_pr_29052025

Author: glo60612

app/code/Magento/Catalog/ViewModel/Attribute/ProductAttributeHelper.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\ViewModel\Attribute;
+
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Catalog\Helper\Data as CatalogHelper;
+
+class ProductAttributeHelper implements ArgumentInterface
+{
+    /**
+     * @var CatalogHelper
+     */
+    private CatalogHelper $catalogHelper;
+
+    /**
+     * @param CatalogHelper $catalogHelper
+     */
+    public function __construct(CatalogHelper $catalogHelper)
+    {
+        $this->catalogHelper = $catalogHelper;
+    }
+
+    /**
+     * Retrieve the Catalog Helper instance
+     *
+     * @return CatalogHelper
+     */
+    public function getCatalogHelper(): CatalogHelper
+    {
+        return $this->catalogHelper;
+    }
+}

app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright 2013 Adobe
+ * Copyright 2014 Adobe
  * All Rights Reserved.
  */
 -->
@@ -22,7 +22,11 @@
             <block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit" name="attribute_edit_content"/>
         </referenceContainer>
         <referenceContainer name="js">
-            <block class="Magento\Backend\Block\Template" name="attribute_edit_js" template="Magento_Catalog::catalog/product/attribute/js.phtml"/>
+            <block class="Magento\Backend\Block\Template" name="attribute_edit_js" template="Magento_Catalog::catalog/product/attribute/js.phtml">
+                <arguments>
+                    <argument name="view_model" xsi:type="object">Magento\Catalog\ViewModel\Attribute\ProductAttributeHelper</argument>
+                </arguments>
+            </block>
         </referenceContainer>
     </body>
 </page>

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml

@@ -13,6 +13,11 @@ use Magento\Catalog\Helper\Data;
 <?php
 /** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
 $jsonHelper = $block->getData('jsonHelper');
+if (!method_exists($jsonHelper, 'getAttributeHiddenFields')) {
+    /** @var \Magento\Catalog\ViewModel\Attribute\ProductAttributeHelper $viewModel */
+    $viewModel = $block->getViewModel();
+    $jsonHelper = $viewModel->getCatalogHelper();
+}
 $scriptString = <<<script
 require([
     "jquery",