From a72a65b0180684bd1e437303dfdfee87e1d1c135 Mon Sep 17 00:00:00 2001
From: "Julia.Svinareva" <julia.svinaryova@onlyoffice.com>
Date: Sat, 27 Apr 2024 17:03:13 +0300
Subject: [PATCH] [SSE] Fix copy move dialog (2)

---
 .../main/app/controller/Statusbar.js          | 57 +++++++++++--------
 .../main/app/view/Statusbar.js                | 24 +++++++-
 2 files changed, 54 insertions(+), 27 deletions(-)

diff --git a/apps/spreadsheeteditor/main/app/controller/Statusbar.js b/apps/spreadsheeteditor/main/app/controller/Statusbar.js
index 2fe543903a..b06b8aefa8 100644
--- a/apps/spreadsheeteditor/main/app/controller/Statusbar.js
+++ b/apps/spreadsheeteditor/main/app/controller/Statusbar.js
@@ -355,25 +355,23 @@ define([
             return name;
         },
 
-        createCopyName: function(orig, curArrNames) {
-            var wc = this.api.asc_getWorksheetsCount(), names = [];
-            while (wc--) {
-                names.push(this.api.asc_getWorksheetName(wc).toLowerCase());
-            }
-
+        createCopyName: function(copy, orig, curNames, names) {
             var re = /^(.*)\((\d)\)$/.exec(orig);
             var first = re ? re[1] : orig + ' ';
 
-            var index = 1, name;
-            while(true) {
+            var index = 1, name = orig;
+            if (copy) {
+                index++;
+                name = first + '(' + index + ')';
+            }
+            while(names.indexOf(name.toLowerCase()) !== -1) {
                 index++;
                 name = first + '(' + index + ')';
-                if (names.indexOf(name.toLowerCase()) < 0) break;
             }
 
-            if (curArrNames && curArrNames.length > 0) {
+            if (curNames && curNames.length > 0) {
                 var arr = [];
-                curArrNames.forEach(function (item) {
+                curNames.forEach(function (item) {
                     arr.push(item.toLowerCase());
                 });
                 while(arr.indexOf(name.toLowerCase()) !== -1) {
@@ -385,6 +383,26 @@ define([
             return name;
         },
 
+        generateSheetNames: function (copy, sheetIndexes, otherWorksheetNames) {
+            var me = this,
+                names = [];
+            if (copy) {
+                var wc = this.api.asc_getWorksheetsCount();
+                while (wc--) {
+                    names.push(this.api.asc_getWorksheetName(wc).toLowerCase());
+                }
+            }
+            otherWorksheetNames && otherWorksheetNames.forEach(function (item) {
+                names.push(item.toLowerCase());
+            });
+
+            var newNames = [];
+            sheetIndexes.forEach(function (item) {
+                newNames.push(me.createCopyName(copy, me.api.asc_getWorksheetName(item), newNames, names));
+            });
+            return newNames;
+        },
+
         deleteWorksheet: function(selectTabs) {
             var me = this;
 
@@ -488,10 +506,7 @@ define([
                     me.api.asc_moveWorksheet(indTo, arrIndex);
                     me.api.asc_enableKeyEvents(true);
                 } else {
-                    var arrNames = [];
-                    arrIndex.forEach(function (item) {
-                        arrNames.push(me.createCopyName(me.api.asc_getWorksheetName(item), arrNames));
-                    });
+                    var arrNames = me.generateSheetNames(!cut, arrIndex);
                     me.api.asc_copyWorksheet(indTo, arrNames, arrIndex);
                 }
                 return;
@@ -502,7 +517,7 @@ define([
                 sheets  : items,
                 spreadsheetName: me.api.asc_getDocumentName(),
                 isDesktopApp: me.statusbar.mode.isDesktopApp,
-                handler : function(btn, i, copy, workbook) {
+                handler : function(btn, i, copy, workbook, names) {
                     if (btn == 'ok') {
                         var arrBooks,
                             arrNames;
@@ -512,19 +527,13 @@ define([
                             else if (workbook !== 'current')
                                 arrBooks = [workbook];
                             if (workbook !== 'current') {
-                                arrNames = [];
-                                arrIndex.forEach(function (item) {
-                                    arrNames.push(me.api.asc_getWorksheetName(item));
-                                });
+                                arrNames = me.generateSheetNames(copy, arrIndex, names);
                             }
                         }
                         if (!copy) {
                             me.api.asc_moveWorksheet(i == -255 ? wc : i, arrIndex, arrNames, arrBooks);
                         } else {
-                            arrNames = [];
-                            arrIndex.forEach(function (item) {
-                                arrNames.push(me.createCopyName(me.api.asc_getWorksheetName(item), arrNames));
-                            });
+                            arrNames = me.generateSheetNames(copy, arrIndex, names);
                             me.api.asc_copyWorksheet(i == -255 ? wc : i, arrNames, arrIndex, arrBooks);
                         }
                     }
diff --git a/apps/spreadsheeteditor/main/app/view/Statusbar.js b/apps/spreadsheeteditor/main/app/view/Statusbar.js
index da0a6b6586..5fa1dcb3d1 100644
--- a/apps/spreadsheeteditor/main/app/view/Statusbar.js
+++ b/apps/spreadsheeteditor/main/app/view/Statusbar.js
@@ -1351,8 +1351,18 @@ define([
                 }
             },
 
+            getSheetNames: function (sheets) {
+                if (sheets) {
+                    var names = [];
+                    sheets.forEach(function (item) {
+                        names.push(item.value);
+                    });
+                    return names;
+                }
+            },
+
             getFocusedComponents: function() {
-                return [this.listNames].concat(this.getFooterButtons());
+                return [this.cmbSpreadsheet, this.listNames, this.chCreateCopy].concat(this.getFooterButtons());
             },
 
             getDefaultFocusableComponent: function () {
@@ -1378,8 +1388,12 @@ define([
                     index = active ? active.get('inindex') : 0;
 
                 if (this.options.handler) {
+                    var record = this.cmbSpreadsheet.getSelectedRecord(),
+                        sheetNames;
+                    if (record.value !== 'current' && record.value !== 'new')
+                        sheetNames = this.getSheetNames(this.sheets[record.index]);
                     this.options.handler.call(this,
-                        event.currentTarget.attributes['result'].value, index, this.chCreateCopy.getValue()==='checked', this.cmbSpreadsheet.getSelectedRecord().value);
+                        event.currentTarget.attributes['result'].value, index, this.chCreateCopy.getValue()==='checked', record.value, sheetNames);
                 }
 
                 this.close();
@@ -1390,7 +1404,11 @@ define([
                     index = active ? active.get('inindex') : 0;
 
                 if (this.options.handler) {
-                    this.options.handler.call(this, 'ok', index, this.chCreateCopy.getValue()==='checked', this.cmbSpreadsheet.getSelectedRecord().value);
+                    var record = this.cmbSpreadsheet.getSelectedRecord(),
+                        sheetNames;
+                    if (record.value !== 'current' && record.value !== 'new')
+                        sheetNames = this.getSheetNames(this.sheets[record.index]);
+                    this.options.handler.call(this, 'ok', index, this.chCreateCopy.getValue()==='checked', record.value, sheetNames);
                 }
 
                 this.close();