Merge branch 'ACP2E-2146' of https://github.com/magento-l3/magento2ce into PR2-L3-09132023

Author: chittima

app/code/Magento/Customer/Block/Adminhtml/Group/AddCustomerGroupButton.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Block\Adminhtml\Group;
+
+use Magento\Customer\Block\Adminhtml\Edit\GenericButton;
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+
+/**
+ * Class to get button details of AddCustomerGroup button
+ */
+class AddCustomerGroupButton extends GenericButton implements ButtonProviderInterface
+{
+    /**
+     * Get button data for AddCustomerGroup button
+     *
+     * @return array
+     */
+    public function getButtonData(): array
+    {
+        return [
+            'label' => __('Add New Customer Group'),
+            'class' => 'primary',
+            'url' => $this->getUrl('*/*/new'),
+            'sort_order' => 80,
+        ];
+    }
+}

app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php

@@ -28,8 +28,8 @@ class GroupActions extends Column
     /**
      * Url path
      */
-    const URL_PATH_EDIT = 'customer/group/edit';
-    const URL_PATH_DELETE = 'customer/group/delete';
+    public const URL_PATH_EDIT = 'customer/group/edit';
+    public const URL_PATH_DELETE = 'customer/group/delete';
 
     /**
      * @var GroupManagementInterface
@@ -99,7 +99,7 @@ public function prepareDataSource(array $dataSource)
                         ],
                     ];
 
-                    if (!$this->groupManagement->isReadonly($item['customer_group_id'])) {
+                    if (!$this->canHideDeleteButton((int) $item['customer_group_id'])) {
                         $item[$this->getData('name')]['delete'] = [
                             'href' => $this->urlBuilder->getUrl(
                                 static::URL_PATH_DELETE,
@@ -124,4 +124,17 @@ public function prepareDataSource(array $dataSource)
 
         return $dataSource;
     }
+
+    /**
+     * Check if delete button can visible
+     *
+     * @param int $customer_group_id
+     * @return bool
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     */
+    public function canHideDeleteButton(int $customer_group_id): bool
+    {
+        return $this->groupManagement->isReadonly($customer_group_id);
+    }
 }

app/code/Magento/Customer/view/adminhtml/ui_component/customer_group_listing.xml

@@ -13,11 +13,7 @@
     </argument>
     <settings>
         <buttons>
-            <button name="add">
-                <url path="*/*/new"/>
-                <class>primary</class>
-                <label translate="true">Add New Customer Group</label>
-            </button>
+            <button name="add" class="Magento\Customer\Block\Adminhtml\Group\AddCustomerGroupButton"/>
         </buttons>
         <spinner>customer_group_columns</spinner>
         <deps>