ACP2E-104: [Magento Cloud] Customizable options Drag and drop issue

 - Fixed the functional and static test failure.

Author: devarul

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php

@@ -38,61 +38,61 @@ class CustomOptions extends AbstractModifier
     /**#@+
      * Group values
      */
-    const GROUP_CUSTOM_OPTIONS_NAME = 'custom_options';
-    const GROUP_CUSTOM_OPTIONS_SCOPE = 'data.product';
-    const GROUP_CUSTOM_OPTIONS_PREVIOUS_NAME = 'search-engine-optimization';
-    const GROUP_CUSTOM_OPTIONS_DEFAULT_SORT_ORDER = 31;
+    public const GROUP_CUSTOM_OPTIONS_NAME = 'custom_options';
+    public const GROUP_CUSTOM_OPTIONS_SCOPE = 'data.product';
+    public const GROUP_CUSTOM_OPTIONS_PREVIOUS_NAME = 'search-engine-optimization';
+    public const GROUP_CUSTOM_OPTIONS_DEFAULT_SORT_ORDER = 31;
     /**#@-*/
 
     /**#@+
      * Button values
      */
-    const BUTTON_ADD = 'button_add';
-    const BUTTON_IMPORT = 'button_import';
+    public const BUTTON_ADD = 'button_add';
+    public const BUTTON_IMPORT = 'button_import';
     /**#@-*/
 
     /**#@+
      * Container values
      */
-    const CONTAINER_HEADER_NAME = 'container_header';
-    const CONTAINER_OPTION = 'container_option';
-    const CONTAINER_COMMON_NAME = 'container_common';
-    const CONTAINER_TYPE_STATIC_NAME = 'container_type_static';
+    public const CONTAINER_HEADER_NAME = 'container_header';
+    public const CONTAINER_OPTION = 'container_option';
+    public const CONTAINER_COMMON_NAME = 'container_common';
+    public const CONTAINER_TYPE_STATIC_NAME = 'container_type_static';
     /**#@-*/
 
     /**#@+
      * Grid values
      */
-    const GRID_OPTIONS_NAME = 'options';
-    const GRID_TYPE_SELECT_NAME = 'values';
+    public const GRID_OPTIONS_NAME = 'options';
+    public const GRID_TYPE_SELECT_NAME = 'values';
     /**#@-*/
 
     /**#@+
      * Field values
      */
-    const FIELD_ENABLE = 'affect_product_custom_options';
-    const FIELD_OPTION_ID = 'option_id';
-    const FIELD_TITLE_NAME = 'title';
-    const FIELD_STORE_TITLE_NAME = 'store_title';
-    const FIELD_TYPE_NAME = 'type';
-    const FIELD_IS_REQUIRE_NAME = 'is_require';
-    const FIELD_SORT_ORDER_NAME = 'sort_order';
-    const FIELD_PRICE_NAME = 'price';
-    const FIELD_PRICE_TYPE_NAME = 'price_type';
-    const FIELD_SKU_NAME = 'sku';
-    const FIELD_MAX_CHARACTERS_NAME = 'max_characters';
-    const FIELD_FILE_EXTENSION_NAME = 'file_extension';
-    const FIELD_IMAGE_SIZE_X_NAME = 'image_size_x';
-    const FIELD_IMAGE_SIZE_Y_NAME = 'image_size_y';
-    const FIELD_IS_DELETE = 'is_delete';
-    const FIELD_IS_USE_DEFAULT = 'is_use_default';
+    public const FIELD_ENABLE = 'affect_product_custom_options';
+    public const FIELD_OPTION_ID = 'option_id';
+    public const FIELD_TITLE_NAME = 'title';
+    public const FIELD_STORE_TITLE_NAME = 'store_title';
+    public const FIELD_TYPE_NAME = 'type';
+    public const FIELD_IS_REQUIRE_NAME = 'is_require';
+    public const FIELD_SORT_ORDER_NAME = 'sort_order';
+    public const FIELD_PRICE_NAME = 'price';
+    public const FIELD_PRICE_TYPE_NAME = 'price_type';
+    public const FIELD_SKU_NAME = 'sku';
+    public const FIELD_MAX_CHARACTERS_NAME = 'max_characters';
+    public const FIELD_FILE_EXTENSION_NAME = 'file_extension';
+    public const FIELD_IMAGE_SIZE_X_NAME = 'image_size_x';
+    public const FIELD_IMAGE_SIZE_Y_NAME = 'image_size_y';
+    public const FIELD_IS_DELETE = 'is_delete';
+    public const FIELD_IS_USE_DEFAULT = 'is_use_default';
     /**#@-*/
 
     /**#@+
      * Import options values
      */
-    const IMPORT_OPTIONS_MODAL = 'import_options_modal';
-    const CUSTOM_OPTIONS_LISTING = 'product_custom_options_listing';
+    public const IMPORT_OPTIONS_MODAL = 'import_options_modal';
+    public const CUSTOM_OPTIONS_LISTING = 'product_custom_options_listing';
     /**#@-*/
 
     /**

app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-per-page.js

@@ -102,14 +102,13 @@ define([
          * Handles changes of the page size.
          */
         onPageSizeChange: function () {
-            if(!this.containers.length) {
-                return;
-            }
-            if(this.perPageSize !== undefined) {
-                this.pageSize = this.perPageSize;
-                this.reload();
-            } else {
-                this.perPageSize = this.pageSize;
+            if (!!this.getRecordCount()) {
+                if (this.perPageSize !== undefined) {
+                    this.pageSize = this.perPageSize;
+                    this.reload();
+                } else {
+                    this.perPageSize = this.pageSize;
+                }
             }
         },
     });