Merge branch 'GL_PR_Arrows_Sep_17_2024' into AC-13229

Author: jayrangnani-gl

app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml

@@ -15,54 +15,36 @@
 <?php
 $isUseMassAction = $block->getUseMassaction() ? 1 : 0;
 $isAnchorOnly = $block->getIsAnchorOnly() ? 1 : 0;
+
 $scriptString = <<<script
 
 require(['jquery', 'jquery/jstree/jquery.jstree'], function($) {
 
-    let tree = $('#tree{$escaper->escapeJs($block->getId())}');
-    let useMassAction = {$isUseMassAction};
-    let isAnchorOnly = {$isAnchorOnly};
-    let isAnchorArr = [];
+    const tree = $('#tree{$block->escapeJs($block->getId())}');
+    const useMassAction = {$isUseMassAction};
+    const isAnchorOnly = {$isAnchorOnly};
     let checkedNodes = [];
-
-    function addLastNodeProperty(nodes) {
-        return nodes.map(node => {
-            return node.children
-                ? { ...node, children: addLastNodeProperty(node.children) }
-                : { ...node, lastNode: true };
-        });
-    }
+    let anchorNodes = [];
+    let nonAnchorNodes = [];
 
     function actionBasedOnIsAnchorOnly() {
-        tree.jstree().get_json('#', { flat: true }).each((node, value) => {
-            const attrId = node.a_attr.id;
-            const rootNode = tree.jstree().get_node("#");
-            const rootId = rootNode.children[0];
-
-            if (isAnchorOnly === 1) {
-                if (1 === isAnchorArr[parseInt(node.id)]) {
-                    tree.jstree(true).enable_node(node);
-                } else {
-                    tree.jstree(true).disable_node(node);
-                }
-            } else {
-                if (0 === isAnchorArr[parseInt(node.id)]) {
-                    tree.jstree(true).enable_node(node);
-                } else {
-                    tree.jstree(true).disable_node(node);
-                }
-            }
-        });
+        if (isAnchorOnly) {
+            tree.jstree(true).disable_node(nonAnchorNodes);
+        } else {
+            tree.jstree(true).disable_node(anchorNodes);
+        }
     }
 
-    function handleLoadedTree(e, data) {
+    function handleLoadedNode(e, data) {
         const container = $(e.target).closest('div.chooser_container');
-        checkedNodes = container.find('input[type="text"].entities').val().split(',').map(item => item.trim());
+        if (container.find('input[type="text"].entities').val() !== '') {
+            checkedNodes = container.find('input[type="text"].entities').val().split(',').map(item => item.trim());
+        }
 
-        data.instance.get_json('#', { flat: true }).forEach(nodeId => {
-            const node = data.instance.get_node(nodeId);
-            getAnchorNodeIds(tree, node);
-        });
+        if (data.status) {
+            tree.jstree(true).select_node(checkedNodes);
+            actionBasedOnIsAnchorOnly();
+        }
     }
 
     function handleChange(e, data) {
@@ -72,18 +54,16 @@ require(['jquery', 'jquery/jstree/jquery.jstree'], function($) {
 
         if (useMassAction) {
             const clickedNodeID = data.node.id;
-            const currentCheckedNodes = data.instance.get_checked();
 
             if (data.action === 'select_node' && !checkedNodes.includes(clickedNodeID)) {
-                checkedNodes = currentCheckedNodes;
+                checkedNodes.push(clickedNodeID);
             } else if (data.action === 'deselect_node') {
-                checkedNodes = currentCheckedNodes.filter(nodeID => nodeID !== clickedNodeID);
+                checkedNodes = checkedNodes.filter(nodeID => nodeID !== clickedNodeID);
             }
 
             checkedNodes.sort((a, b) => a - b);
-
             const container = $(e.target).closest('div.chooser_container');
-            container.find('input[type="text"].entities').val(checkedNodes.join(', '));
+            container.find('input[type="text"].entities').val(checkedNodes.join(','));
         } else {
             node = data.node;
             node.attributes = node.original;
@@ -92,94 +72,55 @@ require(['jquery', 'jquery/jstree/jquery.jstree'], function($) {
         }
     }
 
-    function getCheckedNodeIds(tree, node) {
-        if (node.children_d && node.children_d.length > 0) {
-            const selectChildrenNodes = node.children_d.filter(item => checkedNodes.includes(item));
-
-            if (selectChildrenNodes.length > 0) {
-                tree.jstree(true).select_node(selectChildrenNodes);
+    function updateChildrenKey(treeJson) {
+        treeJson.forEach(node => {
+            if (Array.isArray(node.children) && node.children.length === 0) {
+                node.children = true;
+            } else if (Array.isArray(node.children)) {
+                updateChildrenKey(node.children);
             }
-        }
-    }
 
-    function addLastNodeFlag(treeData) {
-        if (treeData.children) {
-            treeData.children.forEach(child => addLastNodeFlag(child));
-        } else {
-            treeData.lastNode = true;
-        }
-    }
-
-    function getAnchorNodeIds(tree, node) {
-        if (useMassAction) {
-            isAnchorArr[parseInt(node.id)] = node.original.is_anchor;
-            if (checkedNodes.includes(node.id)) {
-                tree.jstree(true).select_node(node.id);
+            if (node.is_anchor === 1) {
+                anchorNodes.push(node.id);
+            } else {
+                nonAnchorNodes.push(node.id);
             }
-            getCheckedNodeIds(tree, node);
-            actionBasedOnIsAnchorOnly();
-        }
+        });
+        return treeJson;
     }
 
-    function handleSuccessResponse(response, childNode, data) {
-        if (response.length > 0) {
-            response.forEach(newNode => {
-                addLastNodeFlag(newNode);
-
-                // Create the new node and execute node callback
-                data.instance.create_node(childNode, newNode, 'last', node => {
-                    if (useMassAction) {
-                        if ($.inArray(childNode.id, isAnchorArr) === -1) {
-                            getAnchorNodeIds(tree, childNode);
-                        }
-                    }
-                });
-            });
-        }
-    }
+    var jstreeConfig = {
+        core: {
+            data: function (obj, callback) {
+                if (obj.id != '#' && obj.children.length === 0) {
+                    let data = {
+                        id: obj.id,
+                        store: obj.original.store,
+                        node: obj.id,
+                        form_key: FORM_KEY
+                    };
 
-    function handleOpenNode(e, data) {
-        let parentNode = data.node;
-        if (parentNode && parentNode.children.length > 0) {
-            parentNode.children.forEach(function(childId) {
-                let childNode = data.instance.get_node(childId, false);
-                if ($.inArray(childNode.id, isAnchorArr) === -1) {
-                    getAnchorNodeIds(tree, childNode);
-                }
-                // Check if the child node has no children (is not yet loaded)
-                if (childNode.children && childNode.children.length === 0
-                    && childNode.original && !childNode.original.lastNode) {
                     $.ajax({
-                        url: '{$block->escapeJs($block->escapeUrl($block->getLoadTreeUrl()))}',
+                        url: '{$block->escapeJs($block->getLoadTreeUrl())}',
                         type: "POST",
-                        data: {
-                            id: childNode.original.id,
-                            store: childNode.original.store,
-                            form_key: FORM_KEY
-                        },
+                        data: data,
                         dataType: 'json',
                         success: function (response) {
-                            handleSuccessResponse(response, childNode, data);
+                            response = updateChildrenKey(response);
+                            callback.call(this, response);
                         },
                         error: function (jqXHR, status, error) {
-                            console.log(status + ': ' + error + 'Response text:' + jqXHR.responseText);
+                            console.log(status + ': ' + error);
                         }
                     });
+                } else {
+                    let defaultTree = updateChildrenKey({$block->getTreeJson()});
+                    callback.call(this, defaultTree);
                 }
-            })
-        }
-        else if ((parentNode.children.length === 0
-                    && parentNode.original && parentNode.original.lastNode)) {
-            getAnchorNodeIds(tree, parentNode);
-        }
-    }
-
-    var jstreeConfig = {
-        core: {
-            data: addLastNodeProperty({$block->getTreeJson()}),
+            },
             check_callback: true
         },
-        plugins: []
+        plugins: ['dnd']
     };
 
     if (useMassAction) {
@@ -192,11 +133,10 @@ require(['jquery', 'jquery/jstree/jquery.jstree'], function($) {
     tree.jstree(jstreeConfig);
 
     if (useMassAction) {
-        tree.on('loaded.jstree', (e, data) => handleLoadedTree(e, data));
+        tree.on('load_node.jstree', (e, data) => handleLoadedNode(e, data));
     }
 
     tree.on('changed.jstree', (e, data) => handleChange(e, data));
-    tree.on('open_node.jstree', (e, data) => handleOpenNode(e, data));
 });
 
 script;

app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartMessageSection.xml

@@ -14,5 +14,6 @@
         <element name="emptyCartMessage" type="text" selector=".cart-empty>p"/>
         <element name="errorMessageText" type="text" selector="//div[contains(@class, 'message-error')]/div[text()='{{var}}']" parameterized="true"/>
         <element name="backorderErrorMessage" type="text" selector=".//*[@class='cart item']//div[@class='cart item message notice']"/>
+        <element name="invalidAddressError" type="text" selector="//div[contains(text(),'{{errorMessageText}}')]" parameterized="true"/>
     </section>
 </sections>

app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutUsingSignInLinkTest.xml

@@ -31,6 +31,12 @@
 
             <!-- Create customer -->
             <createData entity="Simple_US_Customer_With_Different_Billing_Shipping_Addresses" stepKey="createCustomer"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexConfig">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCacheConfig">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
         </before>
         <after>
             <!-- Admin log out -->

app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml

@@ -34,6 +34,32 @@
         <data key="default_billing">true</data>
         <data key="region_qty">66</data>
     </entity>
+    <entity name="CustomerInvalidAddress" type="address">
+        <data key="id">0</data>
+        <data key="customer_id">12</data>
+        <requiredEntity type="region">CustomerRegionOne</requiredEntity>
+        <data key="region_id">0</data>
+        <data key="country_id">US</data>
+        <array key="street">
+            <item>7700 W Parmer Ln</item>
+            <item>Bld D</item>
+        </array>
+        <data key="company">Magento</data>
+        <data key="telephone">Invalid Telephone</data>
+        <data key="fax">1234568910</data>
+        <data key="postcode">Invalid PostCode</data>
+        <data key="city">InvalidCity</data>
+        <data key="state">Texas</data>
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="middlename">string</data>
+        <data key="prefix">Mr</data>
+        <data key="suffix">Sr</data>
+        <data key="vat_id">vatData</data>
+        <data key="default_shipping">true</data>
+        <data key="default_billing">true</data>
+        <data key="region_qty">66</data>
+    </entity>
     <entity name="US_Address_TX" type="address">
         <data key="firstname">John</data>
         <data key="lastname">Doe</data>

app/code/Magento/Customer/Test/Mftf/Test/AdminVerifyThatCustomersMatchesToASectionWithConditionsOrderAddressTest.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontAssertInvalidAddressErrorActionGroup">
+        <annotations>
+            <description>Storefront assert invalid address error through PayPal checkout on Checkout, Cart and Mini Cart page</description>
+        </annotations>
+        <arguments>
+            <argument name="invalidAddressError" type="string"/>
+        </arguments>
+        <waitForElement selector="{{invalidAddressError}}" stepKey="assertErrorMessage"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontAssertInvalidAddressErrorActionGroup.xml

@@ -26,5 +26,6 @@
         <element name="expirationYear" type="input" selector="//input[@id='expdate_year']" timeout="10"/>
         <element name="cvv" type="input" selector="//input[@id='cvv2_number']" timeout="10"/>
         <element name="payNowBtn" type="button" selector="//input[@id='btn_pay_cc']" timeout="10"/>
+        <element name="invalidAddressError" type="text" selector="div.message.message-error.error" timeout="5"/>
     </section>
 </sections>