From 3536d0cf711e3edc1a8c7de4c5128b429c6d67b4 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Tue, 26 Jul 2022 23:14:11 +0300
Subject: [PATCH] [SSE] Fix Bug 52634

---
 .../main/app/template/PivotSettingsAdvanced.template |  4 ++--
 .../main/app/view/PivotSettingsAdvanced.js           | 12 ++++++++++--
 apps/spreadsheeteditor/main/locale/en.json           |  1 +
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/apps/spreadsheeteditor/main/app/template/PivotSettingsAdvanced.template b/apps/spreadsheeteditor/main/app/template/PivotSettingsAdvanced.template
index cfc007e42..f9621da56 100644
--- a/apps/spreadsheeteditor/main/app/template/PivotSettingsAdvanced.template
+++ b/apps/spreadsheeteditor/main/app/template/PivotSettingsAdvanced.template
@@ -45,12 +45,12 @@
             </tr>
             <tr>
                 <td class="padding-small">
-                    <label class="header"><%= scope.textHeaders %></label>
+                    <div id="pivot-adv-chk-show-headers"></div>
                 </td>
             </tr>
             <tr>
                 <td class="padding-small">
-                    <div id="pivot-adv-chk-show-headers"></div>
+                    <div id="pivot-adv-chk-autofit-col-width"></div>
                 </td>
             </tr>
         </table>
diff --git a/apps/spreadsheeteditor/main/app/view/PivotSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/PivotSettingsAdvanced.js
index c3648e833..3a0d8919d 100644
--- a/apps/spreadsheeteditor/main/app/view/PivotSettingsAdvanced.js
+++ b/apps/spreadsheeteditor/main/app/view/PivotSettingsAdvanced.js
@@ -148,6 +148,11 @@ define([    'text!spreadsheeteditor/main/app/template/PivotSettingsAdvanced.temp
                 labelText: this.textShowHeaders
             });
 
+            this.chAutofitColWidth = new Common.UI.CheckBox({
+                el: $('#pivot-adv-chk-autofit-col-width'),
+                labelText: this.textAutofitColWidth
+            });
+
             this.txtDataRange = new Common.UI.InputFieldBtn({
                 el          : $('#pivot-adv-txt-range'),
                 name        : 'range',
@@ -183,7 +188,7 @@ define([    'text!spreadsheeteditor/main/app/template/PivotSettingsAdvanced.temp
 
         getFocusedComponents: function() {
             return [
-                this.inputName, this.chRows, this.chCols, this.radioDown, this.radioOver, this.numWrap, this.chHeaders, // 0 tab
+                this.inputName, this.chRows, this.chCols, this.radioDown, this.radioOver, this.numWrap, this.chHeaders, this.chAutofitColWidth, // 0 tab
                 this.txtDataRange,  // 1 tab
                 this.inputAltTitle, this.textareaAltDescription  // 2 tab
             ];
@@ -234,6 +239,7 @@ define([    'text!spreadsheeteditor/main/app/template/PivotSettingsAdvanced.temp
                 this.numWrap.setValue(props.asc_getPageWrap());
 
                 this.chHeaders.setValue(props.asc_getShowHeaders(), true);
+                this.chAutofitColWidth.setValue(props.asc_getUseAutoFormatting(), true);
 
                 var value = props.asc_getDataRef();
                 this.txtDataRange.setValue((value) ? value : '');
@@ -260,6 +266,7 @@ define([    'text!spreadsheeteditor/main/app/template/PivotSettingsAdvanced.temp
             props.asc_setPageOverThenDown(this.radioOver.getValue());
             props.asc_setPageWrap(this.numWrap.getNumberValue());
             props.asc_setShowHeaders(this.chHeaders.getValue() == 'checked');
+            props.asc_setUseAutoFormatting(this.chAutofitColWidth.getValue() == 'checked');
             props.asc_setDataRef(this.txtDataRange.getValue());
 
             if (this.isAltTitleChanged)
@@ -340,7 +347,8 @@ define([    'text!spreadsheeteditor/main/app/template/PivotSettingsAdvanced.temp
         textWrapCol: 'Report filter fields per column',
         textWrapRow: 'Report filter fields per row',
         textHeaders: 'Field Headers',
-        textShowHeaders: 'Show field headers for rows and columns'
+        textShowHeaders: 'Show field headers for rows and columns',
+        textAutofitColWidth: 'Autofit column widths on update'
 
     }, SSE.Views.PivotSettingsAdvanced || {}))
 });
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index 02a0f364e..d711ad833 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -2735,6 +2735,7 @@
   "SSE.Views.PivotSettingsAdvanced.textWrapRow": "Report filter fields per row",
   "SSE.Views.PivotSettingsAdvanced.txtEmpty": "This field is required",
   "SSE.Views.PivotSettingsAdvanced.txtName": "Name",
+  "SSE.Views.PivotSettingsAdvanced.textAutofitColWidth": "Autofit column widths on update",
   "SSE.Views.PivotTable.capBlankRows": "Blank Rows",
   "SSE.Views.PivotTable.capGrandTotals": "Grand Totals",
   "SSE.Views.PivotTable.capLayout": "Report Layout",