From a20f4e7d79437ce29b231bd08b5cf7d6a2219799 Mon Sep 17 00:00:00 2001
From: Valery Kovalev <v.kovalev@reg.ru>
Date: Tue, 4 May 2021 14:51:06 +0300
Subject: [PATCH] #85773 domains section tabs order fixed

---
 src/nginxconfig/templates/app.vue             |  5 +++-
 src/nginxconfig/templates/domain.vue          |  9 ++++--
 .../templates/domain_sections/index.js        | 30 +++++++++++++------
 src/nginxconfig/templates/global.vue          |  5 +++-
 src/nginxconfig/templates/setup.vue           |  5 +++-
 5 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/src/nginxconfig/templates/app.vue b/src/nginxconfig/templates/app.vue
index f3f5215..f298c79 100644
--- a/src/nginxconfig/templates/app.vue
+++ b/src/nginxconfig/templates/app.vue
@@ -61,7 +61,10 @@ THE SOFTWARE.
 
                     <div class="tabs">
                         <ul>
-                            <li v-for="data in activeDomains" :class="data[1] === active ? 'is-active' : undefined">
+                            <li v-for="data in activeDomains"
+                                :key="data[0].server.domain.computed"
+                                :class="data[1] === active ? 'is-active' : undefined"
+                            >
                                 <a class="domain" @click="active = data[1]">
                                     {{ data[0].server.domain.computed }}{{ changes(data[1]) }}
                                 </a>
diff --git a/src/nginxconfig/templates/domain.vue b/src/nginxconfig/templates/domain.vue
index a92cd9b..5c0c6b4 100644
--- a/src/nginxconfig/templates/domain.vue
+++ b/src/nginxconfig/templates/domain.vue
@@ -33,7 +33,10 @@ THE SOFTWARE.
         <div class="panel">
             <div class="tabs">
                 <ul>
-                    <li v-for="tab in tabs" :class="tabClass(tab.key)">
+                    <li v-for="tab in tabs"
+                        :key="tab.key"
+                        :class="tabClass(tab.key)"
+                    >
                         <a @click="showTab(tab.key)">{{ $t(tab.display) }}{{ changes(tab.key) }}</a>
                     </li>
                 </ul>
@@ -63,9 +66,9 @@ THE SOFTWARE.
     import analytics from '../util/analytics';
     import isChanged from '../util/is_changed';
     import Presets from './domain_sections/presets';
-    import * as Sections from './domain_sections';
+    import Sections from './domain_sections';
 
-    const tabs = Object.values(Sections);
+    const tabs = Sections;
     const delegated = {
         hasUserInteraction: false,
         presets: Presets.delegated,
diff --git a/src/nginxconfig/templates/domain_sections/index.js b/src/nginxconfig/templates/domain_sections/index.js
index 8f2269e..90ab1d3 100644
--- a/src/nginxconfig/templates/domain_sections/index.js
+++ b/src/nginxconfig/templates/domain_sections/index.js
@@ -24,12 +24,24 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-export { default as Server } from './server';
-export { default as HTTPS } from './https';
-export { default as PHP } from './php';
-export { default as Python } from './python';
-export { default as ReverseProxy } from './reverse_proxy';
-export { default as Routing } from './routing';
-export { default as Logging } from './logging';
-export { default as Restrict } from './restrict';
-export { default as Onion } from './onion';
+import Server from './server';
+import HTTPS from './https';
+import PHP from './php';
+import Python from './python';
+import ReverseProxy from './reverse_proxy';
+import Routing from './routing';
+import Logging from './logging';
+import Restrict from './restrict';
+import Onion from './onion';
+
+export default [
+    Server,
+    HTTPS,
+    PHP,
+    Python,
+    ReverseProxy,
+    Routing,
+    Logging,
+    Restrict,
+    Onion,
+];
diff --git a/src/nginxconfig/templates/global.vue b/src/nginxconfig/templates/global.vue
index cb3bd2c..777e773 100644
--- a/src/nginxconfig/templates/global.vue
+++ b/src/nginxconfig/templates/global.vue
@@ -28,7 +28,10 @@ THE SOFTWARE.
     <div class="panel">
         <div class="tabs">
             <ul>
-                <li v-for="tab in tabs" :class="tabClass(tab.key)">
+                <li v-for="tab in tabs"
+                    :key="tab.key"
+                    :class="tabClass(tab.key)"
+                >
                     <a @click="showTab(tab.key)">{{ $t(tab.display) }}{{ changes(tab.key) }}</a>
                 </li>
             </ul>
diff --git a/src/nginxconfig/templates/setup.vue b/src/nginxconfig/templates/setup.vue
index deba1e2..e2806a8 100644
--- a/src/nginxconfig/templates/setup.vue
+++ b/src/nginxconfig/templates/setup.vue
@@ -29,7 +29,10 @@ THE SOFTWARE.
         <div class="panel">
             <div class="tabs">
                 <ul>
-                    <li v-for="tab in tabs" :class="tabClass(tab.key)">
+                    <li v-for="tab in tabs"
+                        :key="tab.key"
+                        :class="tabClass(tab.key)"
+                    >
                         <a @click="showTab(tab.key)">{{ $t(tab.display) }}</a>
                     </li>
                 </ul>