Merge pull request #9373 from magento-gl/spartans_pr_19112024

[Spartans] Fixes Delivery

Author: sidolov

app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2024 Adobe
+  * All Rights Reserved.
   */
 -->
 
@@ -18,8 +18,6 @@
             <testCaseId value="MC-115"/>
             <group value="Bundle"/>
             <group value="cloud"/>
-            <!-- Excluded from PR builds due to AC-12124 -->
-            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php

@@ -1,8 +1,8 @@
 <?php
 /**
  *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute;
@@ -269,6 +269,11 @@ public function execute()
 
             unset($data['entity_type_id']);
 
+            if (array_key_exists('reset_is-default_option', $data) && $data['reset_is-default_option']) {
+                unset($data['reset_is-default_option']);
+                $data['default_value'] = null;
+            }
+
             $model->addData($data);
 
             if (!$attributeId) {

app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection/AttributePropertiesSection.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2024 Adobe
+  * All Rights Reserved.
   */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -34,5 +34,6 @@
         <element name="attributeLabelValidationError" type="text" selector=".field-attribute_label .mage-error"/>
         <element name="AttributeCode" type="input" selector="#attribute_code"/>
         <element name="defaultRadioButton" type="radio" selector="//*[@id='swatch_window_option_option_{{position}}']/parent::td/parent::tr/td[@class='col-default']" parameterized="true"/>
+        <element name="resetDefaultSwatchVisualOptionButton" type="button" selector="#reset_default_swatch_visual_option_button" />
     </section>
 </sections>

app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2024 Adobe
+  * All Rights Reserved.
   */
 -->
 
@@ -16,7 +16,7 @@
         <element name="productImageFullscreen" type="text" selector="//*[@data-gallery-role='gallery' and contains(@class, 'fullscreen')]//img[contains(@src, '{{filename}}') and contains(@class, 'full')]" parameterized="true" />
         <element name="closeFullscreenImage" type="button" selector="//*[@data-gallery-role='gallery' and contains(@class, 'fullscreen')]//*[@data-gallery-role='fotorama__fullscreen-icon']" />
         <element name="imageFile" type="text" selector="//div[contains(@class, 'fotorama__active')]//img[contains(@src, '{{filename}}')]" parameterized="true"/>
-        <element name="imageFileInGallery" type="text" selector="//div[contains(@class, 'fotorama__loaded--img')]//img[contains(@src, '{{filename}}')]" parameterized="true"/>
+        <element name="imageFileInGallery" type="text" selector="//div[contains(@class, 'gallery-placeholder')]//img[contains(@src, '{{filename}}')]" parameterized="true"/>
         <element name="productImageActive" type="text" selector=".product.media div[data-active=true] > img[src*='{{filename}}']" parameterized="true"/>
         <element name="productImageInFotorama" type="file" selector=".fotorama__nav__shaft img[src*='{{imageName}}']" parameterized="true" timeout="30"/>
         <element name="fotoramaPrevButton" type="button" selector="//*[@data-gallery-role='gallery']//*[@data-gallery-role='nav-wrap']//*[@data-gallery-role='arrow' and contains(@class, 'fotorama__thumb__arr--left')]" timeout="30"/>

app/code/Magento/Catalog/Test/Mftf/Test/AdminAddRemoveProductImageVirtualProductTest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2024 Adobe
+  * All Rights Reserved.
   */
 -->
 
@@ -18,8 +18,6 @@
             <testCaseId value="MC-103"/>
             <group value="Catalog"/>
             <group value="cloud"/>
-            <!-- Excluded from PR builds due to AC-12124 -->
-            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductImagesTest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2024 Adobe
+  * All Rights Reserved.
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -16,8 +16,6 @@
             <severity value="BLOCKER"/>
             <testCaseId value="MC-189"/>
             <group value="Catalog"/>
-            <!-- Excluded from PR builds due to AC-12124 -->
-            <group value="pr_exclude"/>
         </annotations>
 
         <before>

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductImageWithDotTest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2024 Adobe
+  * All Rights Reserved.
   */
 -->
 
@@ -17,8 +17,6 @@
             <group value="Catalog"/>
             <severity value="AVERAGE"/>
             <group value="cloud"/>
-            <!-- Excluded from PR builds due to AC-12124 -->
-            <group value="pr_exclude"/>
         </annotations>
         <before>
             <magentoCLI command="config:set system/upload_configuration/enable_resize 0" stepKey="disableImageResizing"/>

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

@@ -1,30 +1,35 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 
 // phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
-/** @var $block \Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Options */
+// phpcs:disable Generic.Files.LineLength.TooLong
+/**
+ * @var $block \Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Options
+ * @var \Magento\Framework\Escaper $escaper
+ */
+
 
 $stores = $block->getStoresSortedBySortOrder();
 ?>
 <fieldset class="admin__fieldset fieldset">
     <legend class="legend">
-        <span><?= $block->escapeHtml(__('Manage Options (Values of Your Attribute)')) ?></span>
+        <span><?= $escaper->escapeHtml(__('Manage Options (Values of Your Attribute)')) ?></span>
     </legend><br />
     <div class="admin__control-table-wrapper" id="manage-options-panel" data-index="attribute_options_select_container">
         <table class="admin__control-table" data-index="attribute_options_select">
             <thead>
                 <tr id="attribute-options-table">
                     <th class="col-draggable"></th>
                     <th class="col-default control-table-actions-th">
-                        <span><?= $block->escapeHtml(__('Is Default')) ?></span>
+                        <span><?= $escaper->escapeHtml(__('Is Default')) ?></span>
                     </th>
                     <?php
-                    foreach ($stores as $_store) :?>
-                        <th<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID) :?> class="_required"<?php endif; ?>>
-                            <span><?= $block->escapeHtml(__($_store->getName())) ?></span>
+                    foreach ($stores as $_store):?>
+                        <th<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID):?> class="_required"<?php endif; ?>>
+                            <span><?= $escaper->escapeHtml(__($_store->getName())) ?></span>
                         </th>
                     <?php endforeach;
                     $storetotal = count($stores) + 3;
@@ -38,15 +43,22 @@ $stores = $block->getStoresSortedBySortOrder();
                 <th colspan="<?= (int)$storetotal ?>" class="validation">
                     <input type="hidden" class="required-dropdown-attribute-entry" name="dropdown_attribute_validation"/>
                     <input type="hidden" class="required-dropdown-attribute-unique" name="dropdown_attribute_validation_unique"/>
+                    <input type="hidden" name="reset_is-default_option"/>
                 </th>
             </tr>
             <tr>
                 <th colspan="<?= (int) $storetotal ?>" class="col-actions-add">
-                    <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()) :?>
+                    <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
                         <button id="add_new_option_button" data-action="add_new_row"
-                                title="<?= $block->escapeHtml(__('Add Option')) ?>"
+                                title="<?= $escaper->escapeHtml(__('Add Option')) ?>"
                                 type="button" class="action- scalable add">
-                            <span><?= $block->escapeHtml(__('Add Option')) ?></span>
+                            <span><?= $escaper->escapeHtml(__('Add Option')) ?></span>
+                        </button>
+
+                        <button id="reset_default_options_option_button"
+                                title="<?= $escaper->escapeHtml(__('Reset Is Default')) ?>"
+                                type="button" class="action- scalable reset">
+                            <span><?= $escaper->escapeHtml(__('Reset Is Default')) ?></span>
                         </button>
                     <?php endif; ?>
                 </th>
@@ -58,26 +70,26 @@ $stores = $block->getStoresSortedBySortOrder();
     <script id="row-template" type="text/x-magento-template">
         <tr <% if (data.rowClasses) { %>class="<%- data.rowClasses %>"<% } %>>
             <td class="col-draggable">
-                <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()) :?>
+                <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
                     <div data-role="draggable-handle" class="draggable-handle"
-                         title="<?= $block->escapeHtml(__('Sort Option')) ?>">
+                         title="<?= $escaper->escapeHtml(__('Sort Option')) ?>">
                     </div>
                 <?php endif; ?>
-                <input data-role="order" type="hidden" name="option[order][<%- data.id %>]"  value="<%- data.sort_order %>" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()) :?> disabled="disabled"<?php endif; ?>/>
+                <input data-role="order" type="hidden" name="option[order][<%- data.id %>]"  value="<%- data.sort_order %>" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()):?> disabled="disabled"<?php endif; ?>/>
             </td>
             <td class="col-default control-table-actions-cell">
-                <input class="input-radio" type="<%- data.intype %>" name="default[]" value="<%- data.id %>" <%- data.checked %><?php if ($block->getReadOnly()) :?>disabled="disabled"<?php endif;?>/>
+                <input class="input-radio" type="<%- data.intype %>" name="default[]" value="<%- data.id %>" <%- data.checked %><?php if ($block->getReadOnly()):?>disabled="disabled"<?php endif;?>/>
             </td>
-            <?php foreach ($stores as $_store) :?>
-            <td class="col-<%- data.id %>"><input name="option[value][<%- data.id %>][<?= (int) $_store->getId() ?>]" value="<%- data.store<?= /* @noEscape */ (int) $_store->getId() ?> %>" class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID) :?> required-option required-unique<?php endif; ?>" type="text" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()) :?> disabled="disabled"<?php endif;?>/></td>
+            <?php foreach ($stores as $_store):?>
+            <td class="col-<%- data.id %>"><input name="option[value][<%- data.id %>][<?= (int) $_store->getId() ?>]" value="<%- data.store<?= /* @noEscape */ (int) $_store->getId() ?> %>" class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID):?> required-option required-unique<?php endif; ?>" type="text" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()):?> disabled="disabled"<?php endif;?>/></td>
             <?php endforeach; ?>
             <td id="delete_button_container_<%- data.id %>" class="col-delete">
                 <input type="hidden" class="delete-flag" name="option[delete][<%- data.id %>]" value="" />
-                <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()) :?>
-                    <button id="delete_button_<%- data.id %>" title="<?= $block->escapeHtml(__('Delete')) ?>" type="button"
+                <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
+                    <button id="delete_button_<%- data.id %>" title="<?= $escaper->escapeHtml(__('Delete')) ?>" type="button"
                         class="action- scalable delete delete-option"
                         >
-                        <span><?= $block->escapeHtml(__('Delete')) ?></span>
+                        <span><?= $escaper->escapeHtml(__('Delete')) ?></span>
                     </button>
                 <?php endif;?>
             </td>
@@ -102,7 +114,7 @@ $stores = $block->getStoresSortedBySortOrder();
                 },
                 "Magento_Catalog/catalog/product/attribute/unique-validate": {
                     "element": "required-dropdown-attribute-unique",
-                    "message": "<?= $block->escapeHtml(__("The value of Admin must be unique.")) ?>"
+                    "message": "<?= $escaper->escapeHtml(__("The value of Admin must be unique.")) ?>"
                 }
             }
         }

app/code/Magento/Catalog/view/adminhtml/web/js/options.js

@@ -94,6 +94,11 @@ define([
                         element.remove();
                     }
                 },
+                reset: function () {
+                    jQuery('input[name="default[]"]').prop('checked', false);
+                    jQuery('input[name="reset_is-default_option"]').val(1);
+                },
+
                 updateItemsCountField: function () {
                     $('option-count-check').value = this.totalItems > 0 ? '1' : '';
                 },
@@ -106,6 +111,9 @@ define([
                 bindRemoveButtons: function () {
                     jQuery('#swatch-visual-options-panel').on('click', '.delete-option', this.remove.bind(this));
                 },
+                bindDefaultOptionChanges: function () {
+                    jQuery('#swatch-visual-options-panel').on('change', '.delete-option', this.remove.bind(this));
+                },
                 render: function () {
                     Element.insert($$('[data-role=options-container]')[0], this.elements);
                     this.elements = '';
@@ -151,6 +159,15 @@ define([
         if ($('add_new_option_button')) {
             Event.observe('add_new_option_button', 'click', attributeOption.add.bind(attributeOption, {}, true));
         }
+
+        if ($('reset_default_options_option_button')) {
+            Event.observe(
+                'reset_default_options_option_button',
+                'click',
+                attributeOption.reset.bind(attributeOption, true)
+            );
+        }
+
         $('manage-options-panel').on('click', '.delete-option', function (event) {
             attributeOption.remove(event);
         });
@@ -164,6 +181,7 @@ define([
             jQuery('body').trigger('processStart');
             attributeOption.renderWithDelay(config.attributesData, 0, 100, 300);
             attributeOption.bindRemoveButtons();
+            attributeOption.bindDefaultOptionChanges();
         });
 
         if (config.isSortable) {

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddDefaultImageConfigurableTest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2024 Adobe
+  * All Rights Reserved.
   */
 -->
 
@@ -18,8 +18,6 @@
             <testCaseId value="MC-101"/>
             <group value="ConfigurableProduct"/>
             <group value="cloud"/>
-            <!-- Excluded from PR builds due to AC-12124 -->
-            <group value="pr_exclude"/>
         </annotations>
 
         <before>