From 452cbf26035af6c703f13957536cf1445ec969f1 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Tue, 26 Nov 2019 12:46:58 +0300
Subject: [PATCH] [SSE] Fix settings for sorting by color

---
 .../main/app/template/SortDialog.template     |  4 ++--
 .../main/app/view/SortDialog.js               | 24 +++++++++++++++----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/apps/spreadsheeteditor/main/app/template/SortDialog.template b/apps/spreadsheeteditor/main/app/template/SortDialog.template
index 6c4009ed8..d4f8168b9 100644
--- a/apps/spreadsheeteditor/main/app/template/SortDialog.template
+++ b/apps/spreadsheeteditor/main/app/template/SortDialog.template
@@ -13,8 +13,8 @@
             </tr>
             <tr>
                 <td>
-                    <label id="sort-dialog-label-column" class="header" style="width: 150px;"><%= scope.textColumn %></label>
-                    <label class="header" style="width: 150px;"><%= scope.textSort %></label>
+                    <label id="sort-dialog-label-column" class="header" style="width: 156px;"><%= scope.textColumn %></label>
+                    <label class="header" style="width: 152px;"><%= scope.textSort %></label>
                     <label class="header" style=""><%= scope.textOrder %></label>
                 </td>
             </tr>
diff --git a/apps/spreadsheeteditor/main/app/view/SortDialog.js b/apps/spreadsheeteditor/main/app/view/SortDialog.js
index 8a9199929..461b63241 100644
--- a/apps/spreadsheeteditor/main/app/view/SortDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/SortDialog.js
@@ -236,12 +236,26 @@ define([  'text!spreadsheeteditor/main/app/template/SortDialog.template',
                         order: level.asc_getDescending(),
                         color: level.asc_getColor()
                     });
+                    if (iscolor) {
+                        var color_data = [{ value: -1, displayValue: (level.asc_getSortBy()==Asc.c_oAscSortOptions.ByColorFill) ? this.textNone : this.textAuto , color: null}];
+                        if (levelProps) {
+                            var levelColors = (level.asc_getSortBy()==Asc.c_oAscSortOptions.ByColorFill) ? levelProps.asc_getColorsFill() : levelProps.asc_getColorsFont();
+                            levelColors.forEach(function(item, index) {
+                                item && color_data.push({
+                                    value: Common.Utils.ThemeColor.getHexColor(item.get_r(), item.get_g(), item.get_b()).toLocaleUpperCase(),
+                                    displayValue: Common.Utils.ThemeColor.getHexColor(item.get_r(), item.get_g(), item.get_b()).toLocaleUpperCase(),
+                                    color: item
+                                });
+                            });
+                        }
+                    }
                     this.levels[i] = {
                         levelProps: levelProps,
                         order_data: [
                             { value: Asc.c_oAscSortOptions.Ascending, displayValue: (iscolor) ? (this.sortOptions.sortcol ? this.textTop : this.textLeft) : (istext ? this.textAZ : this.textAsc) },
                             { value: Asc.c_oAscSortOptions.Descending, displayValue: (iscolor) ? (this.sortOptions.sortcol ? this.textBelow : this.textRight): (istext ? this.textZA : this.textDesc)}
-                        ]
+                        ],
+                        color_data: color_data
                     };
                 }
                 this.sortList.store.reset(arr);
@@ -300,10 +314,10 @@ define([  'text!spreadsheeteditor/main/app/template/SortDialog.template',
                     menuStyle   : 'max-height: 135px;',
                     data        : level.color_data
                 }).on('selected', function(combo, record) {
-                    item.set('color', record.value);
+                    item.set('color', record.color);
                 });
                 val = item.get('color');
-                (val!==null) && combo.setValue(val);
+                combo.setValue(val ? Common.Utils.ThemeColor.getHexColor(val.get_r(), val.get_g(), val.get_b()).toLocaleUpperCase() : -1);
                 level.cmbColor = combo;
             }
 
@@ -358,7 +372,7 @@ define([  'text!spreadsheeteditor/main/app/template/SortDialog.template',
                     levelIndex = item.get('levelIndex');
                 item.set('columnIndex', columnIndex, {silent: true} );
                 item.set('order', Asc.c_oAscSortOptions.Ascending, {silent: true} );
-                item.set('color', -1, {silent: true} );
+                item.set('color', null, {silent: true} );
                 me.levels[levelIndex].levelProps = (columnIndex!==null) ? me.props.asc_getLevelProps(columnIndex) : undefined;
                 me.addControls(null, null, item);
                 me.updateOrderList(levelIndex);
@@ -459,7 +473,7 @@ define([  'text!spreadsheeteditor/main/app/template/SortDialog.template',
 
                 var item = this.sortList.store.at(levelIndex);
                 if (item) {
-                    item.set('color', -1);
+                    item.set('color', null);
                 }
             }
         },