From 632228477b4585dd899bf53dcd29e5802b80d16a Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Fri, 29 Oct 2021 01:09:13 +0300
Subject: [PATCH] [DE] Use config.customization.layout for left/right menu

---
 apps/api/documents/api.js                               | 7 +++----
 apps/documenteditor/main/app/controller/Main.js         | 6 ++++++
 apps/documenteditor/main/app/template/Viewport.template | 4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js
index 8fe1b7454..c019be657 100644
--- a/apps/api/documents/api.js
+++ b/apps/api/documents/api.js
@@ -157,8 +157,7 @@
                         leftMenu: {
                             navigation: false/true
                         },
-                        rightMenu: {
-                        },
+                        rightMenu: false/true,
                         statusBar: {
                             textLang: false/true
                             docLang: false/true
@@ -174,8 +173,8 @@
                     comments: true,
                     zoom: 100,
                     compactToolbar: false,
-                    leftMenu: true,
-                    rightMenu: true,
+                    leftMenu: true, // must be deprecated. use layout.leftMenu instead
+                    rightMenu: true, // must be deprecated. use layout.rightMenu instead
                     hideRightMenu: false, // hide or show right panel on first loading
                     toolbar: true,
                     statusBar: true,
diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
index 62de93994..2218a12b8 100644
--- a/apps/documenteditor/main/app/controller/Main.js
+++ b/apps/documenteditor/main/app/controller/Main.js
@@ -2050,6 +2050,12 @@ define([
                     if (this.appOptions.canBrandingExt) {
                         Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationExtElements);
                         Common.UI.LayoutManager.applyCustomization();
+                        if (this.appOptions.customization && (typeof (this.appOptions.customization) == 'object')) {
+                            if (this.appOptions.customization.leftMenu!==undefined)
+                                console.log("Obsolete: The 'leftMenu' parameter of the 'customization' section is deprecated. Please use 'leftMenu' parameter in the 'customization.layout' section instead.");
+                            if (this.appOptions.customization.rightMenu!==undefined)
+                                console.log("Obsolete: The 'rightMenu' parameter of the 'customization' section is deprecated. Please use 'rightMenu' parameter in the 'customization.layout' section instead.");
+                        }
                         promise = this.getApplication().getController('Common.Controllers.Plugins').applyUICustomization();
                     }
                 }
diff --git a/apps/documenteditor/main/app/template/Viewport.template b/apps/documenteditor/main/app/template/Viewport.template
index b1fcb9b38..c407ba7a5 100644
--- a/apps/documenteditor/main/app/template/Viewport.template
+++ b/apps/documenteditor/main/app/template/Viewport.template
@@ -7,10 +7,10 @@
         <div id="toolbar" class="layout-item hint-section"></div>
         <div class="layout-item middle">
             <div id="viewport-hbox-layout" class="layout-ct hbox">
-                <div id="left-menu" class="layout-item hint-section" style="width: 40px;"></div>
+                <div id="left-menu" class="layout-item hint-section" data-layout-name="leftMenu" style="width: 40px;"></div>
                 <div id="about-menu-panel" class="left-menu-full-ct" style="display:none;"></div>
                 <div id="editor-container" class="layout-item"><div id="editor_sdk"></div></div>
-                <div id="right-menu" class="layout-item hint-section"></div>
+                <div id="right-menu" class="layout-item hint-section" data-layout-name="rightMenu"></div>
                 <div id="left-panel-history" class="layout-item"></div>
             </div>
         </div>