MAGETWO-59467: Checkbox "User Defined" is visible for bundle product option with input type checkbox and multi select

Author: AVoskoboinikov

app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php

@@ -518,7 +518,7 @@ protected function getOptionInfo()
                                 'dataType' => Form\Element\DataType\Text::NAME,
                                 'formElement' => Form\Element\Select::NAME,
                                 'componentType' => Form\Field::NAME,
-                                'component' => 'Magento_Bundle/js/components/bundle-input-type',
+                                'component' => 'Magento_Ui/js/form/element/select',
                                 'parentContainer' => 'product_bundle_container',
                                 'selections' => 'bundle_selections',
                                 'isDefaultIndex' => 'is_default',
@@ -594,8 +594,11 @@ protected function getBundleSelections()
                     'config' => [
                         'componentType' => Container::NAME,
                         'isTemplate' => true,
-                        'component' => 'Magento_Ui/js/dynamic-rows/record',
-                        'is_collection' => true
+                        'component' => 'Magento_Bundle/js/components/bundle-record',
+                        'is_collection' => true,
+                        'imports' => [
+                            'onTypeChanged' => '${ $.provider }:${ $.bundleOptionsDataScope }.type'
+                        ]
                     ],
                 ],
             ],

app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-checkbox.js

@@ -58,6 +58,10 @@ define([
 
             this.prefer = typeMap[type];
             this.elementTmpl(this.templates[typeMap[type]]);
+
+            if (this.prefer === 'radio' && this.checked()) {
+                this.clearValues();
+            }
         },
 
         /**

app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows-grid.js

@@ -29,6 +29,7 @@ define([
                 recordIndex;
 
             this.parsePagesData(data);
+            this.templates.record.bundleOptionsDataScope = this.dataScope;
 
             if (newData.length) {
                 if (this.insertData().length) {

app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-input-type.js

@@ -3,6 +3,11 @@
  * See COPYING.txt for license details.
  */
 
+/**
+ * @deprecated Not used anymore
+ * @see Magento_Bundle/js/components/bundle-record
+ * @see Magento_Bundle/js/components/bundle-checkbox
+ */
 define([
     'Magento_Ui/js/form/element/select',
     'uiRegistry'

app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-record.js

@@ -0,0 +1,23 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'Magento_Ui/js/dynamic-rows/record',
+    'uiRegistry'
+], function (Record, registry) {
+    'use strict';
+
+    return Record.extend({
+        /**
+         * @param {String} val - type of Input Type
+         */
+        onTypeChanged: function (val) {
+            var columnVisibility  = !(val === 'multi' || val === 'checkbox');
+
+            registry.async(this.name + '.' + 'selection_can_change_qty')(function (elem) {
+                elem.visible(columnVisibility);
+            });
+        }
+    });
+});

dev/tests/js/jasmine/tests/app/code/Magento/Bundle/adminhtml/js/components/bundle-checkbox.test.js

@@ -0,0 +1,63 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*eslint max-nested-callbacks: 0*/
+
+define(['Magento_Bundle/js/components/bundle-checkbox', 'uiRegistry'], function (BundleCheckbox, registry) {
+    'use strict';
+
+    describe('Magento_Bundle/js/components/bundle-checkbox', function () {
+
+        var unit,
+            typeMap = {
+                typeMap: {
+                    select: 'radio',
+                    radio: 'radio',
+                    checkbox: 'checkbox',
+                    multi: 'checkbox'
+                }
+            };
+
+        beforeEach(function () {
+            unit = new BundleCheckbox({
+                dataScope: 'bundle-checkbox',
+                elementTmpl: jasmine.createSpy(),
+                clearValues: jasmine.createSpy()
+            });
+        });
+
+        describe('test changeType method', function () {
+            it('Do not clear values for "multi" select type', function () {
+                spyOn(registry, 'get').and.returnValue(typeMap);
+                spyOn(unit, 'checked').and.returnValue(false);
+
+                unit.changeType('multi');
+
+                expect(unit.prefer).toBe('checkbox');
+                expect(unit.clearValues).not.toHaveBeenCalled();
+            });
+
+            it('Do not clear values for "radio" select type if item not checked', function () {
+                spyOn(registry, 'get').and.returnValue(typeMap);
+                spyOn(unit, 'checked').and.returnValue(false);
+
+                unit.changeType('select');
+
+                expect(unit.prefer).toBe('radio');
+                expect(unit.clearValues).not.toHaveBeenCalled();
+            });
+
+            it('Clear values for "radio" select type', function () {
+                spyOn(registry, 'get').and.returnValue(typeMap);
+                spyOn(unit, 'checked').and.returnValue(true);
+
+                unit.changeType('select');
+
+                expect(unit.prefer).toBe('radio');
+                expect(unit.clearValues).toHaveBeenCalled();
+            });
+        });
+    });
+});