MAGETWO-69499: Update select.js #9475

Author: ishakhsuvarov

app/code/Magento/Ui/view/base/web/js/grid/columns/select.js

@@ -27,7 +27,7 @@ define([
                 values = values.split(',');
             }
 
-            if (!Array.isArray(values)) {
+            if (!_.isArray(values)) {
                 values = [values];
             }
 
@@ -55,6 +55,10 @@ define([
         flatOptions: function (options) {
             var self = this;
 
+            if (!_.isArray(options)) {
+                options = _.values(options);
+            }
+
             return options.reduce(function (opts, option) {
                 if (_.isArray(option.value)) {
                     opts = opts.concat(self.flatOptions(option.value));

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/select.test.js

@@ -1,5 +1,5 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 /*eslint max-nested-callbacks: 0*/
@@ -10,15 +10,57 @@ define([
     'use strict';
 
     describe('Ui/js/grid/columns/select', function () {
-        var select;
+        var fieldName    = 'selectField',
+            opts         = [{
+                label: 'a', value: 1
+            }, {
+                label: 'b', value: 2
+            }],
+            optsAsObject = {
+                1: {
+                    label: 'a', value: 1
+                },
+                2: {
+                    label: 'b', value: 2
+                },
+                4: {
+                    label: 'c', value: 3
+                }
+            },
+            select;
 
         beforeEach(function () {
-            select = new Select();
+            select = new Select({
+                index: fieldName
+            });
         });
 
         describe('getLabel method', function () {
             it('get label while options empty', function () {
-                expect(select.getLabel(2)).toBe('');
+                expect(select.getLabel({
+                    selectField: '2'
+                })).toBe('');
+            });
+
+            it('get label for existed value', function () {
+                select.options = opts;
+                expect(select.getLabel({
+                    selectField: '2'
+                })).toBe('b');
+            });
+
+            it('get label for existed value in case the options are initialized as an object', function () {
+                select.options = optsAsObject;
+                expect(select.getLabel({
+                    selectField: '3'
+                })).toBe('c');
+            });
+
+            it('get labels for existed values in case the options are initialized as an object', function () {
+                select.options = optsAsObject;
+                expect(select.getLabel({
+                    selectField: '1,3'
+                })).toBe('a, c');
             });
         });
     });