From fa3deeffda4596ac4bdb6fc8a2b65dd1862b9166 Mon Sep 17 00:00:00 2001
From: axolotle <nchesnais@mailoo.org>
Date: Fri, 7 Oct 2022 15:59:44 +0200
Subject: [PATCH] domaindns: update DomainDns view to be included in DomainInfo
 dns panel

---
 app/src/views/domain/DomainDns.vue  | 74 +++++++++++++++++------------
 app/src/views/domain/DomainInfo.vue | 14 +++++-
 2 files changed, 56 insertions(+), 32 deletions(-)

diff --git a/app/src/views/domain/DomainDns.vue b/app/src/views/domain/DomainDns.vue
index 5408fa42..c33ac244 100644
--- a/app/src/views/domain/DomainDns.vue
+++ b/app/src/views/domain/DomainDns.vue
@@ -3,10 +3,16 @@
     :queries="queries" @queries-response="onQueriesResponse" :loading="loading"
     skeleton="card-info-skeleton"
   >
-    <card v-if="showAutoConfigCard" :title="$t('domain.dns.auto_config')" icon="wrench">
-      <b-alert variant="warning">
-        <icon iname="flask" /> <icon iname="warning" /> <span v-html="$t('domain.dns.info')" />
-      </b-alert>
+    <section v-if="showAutoConfigCard" class="panel-section">
+      <b-card-title title-tag="h3">
+        {{ $t('domain.dns.auto_config') }}
+      </b-card-title>
+
+      <read-only-alert-item
+        :label="$t('domain.dns.info')"
+        type="warning"
+        icon="flask"
+      />
 
       <!-- AUTO CONFIG CHANGES -->
       <template v-if="dnsChanges">
@@ -32,27 +38,32 @@
       </template>
 
       <!-- CONFIG OK ALERT -->
-      <b-alert v-else-if="dnsChanges === null" variant="success" class="m-0">
-        <icon iname="thumbs-up" /> {{ $t('domain.dns.auto_config_ok') }}
-      </b-alert>
+      <read-only-alert-item
+        v-else-if="dnsChanges === null"
+        :label="$t('domain.dns.auto_config_ok')"
+        type="success"
+        icon="thumbs-up"
+      />
 
       <!-- CONFIG ERROR ALERT -->
       <template v-if="dnsErrors && dnsErrors.length">
-        <b-alert
+        <read-only-alert-item
           v-for="({ variant, icon, message }, i) in dnsErrors" :key="i"
-          :variant="variant" :class="dnsErrors.length === 1 ? 'm-0' : ''"
-        >
-          <icon :iname="icon" /> <span v-html="message" />
-        </b-alert>
+          :label="message"
+          :type="variant"
+          :icon="icon"
+        />
       </template>
 
       <!-- CONFIG OVERWRITE DISCLAIMER -->
-      <b-alert v-if="force !== null" variant="warning">
-        <icon iname="warning" /> <span v-html="$t('domain.dns.push_force_warning')" />
-      </b-alert>
+      <read-only-alert-item
+        v-if="force !== null"
+        :label="$t('domain.dns.push_force_warning')"
+        type="warning"
+      />
 
       <!-- CONFIG PUSH SUBMIT -->
-      <template v-if="dnsChanges" #buttons>
+      <template v-if="dnsChanges">
         <b-form-checkbox v-if="force !== null" v-model="force">
           {{ $t('domain.dns.push_force') }}
         </b-form-checkbox>
@@ -61,13 +72,14 @@
           {{ $t('domain.dns.push') }}
         </b-button>
       </template>
-    </card>
+    </section>
 
     <!-- CURRENT DNS ZONE -->
-    <card
-      v-if="showAutoConfigCard && dnsZone && dnsZone.length"
-      :title="$t('domain.dns.auto_config_zone')" icon="globe" no-body
-    >
+    <section v-if="showAutoConfigCard && dnsZone && dnsZone.length" class="panel-section">
+      <b-card-title title-tag="h3">
+        {{ $t('domain.dns.auto_config_zone') }}
+      </b-card-title>
+
       <div class="log">
         <div v-for="({ name: record, spaces, content, type }, i) in dnsZone" :key="'zone-' + i" class="records">
           {{ record }}
@@ -75,19 +87,21 @@
           <span>{{ content }}</span>
         </div>
       </div>
-    </card>
+    </section>
 
     <!-- MANUAL CONFIG CARD -->
-    <card
-      v-if="showManualConfigCard"
-      :title="$t('domain.dns.manual_config')" icon="globe" no-body
-    >
-      <b-alert variant="warning" class="m-0">
-        <icon iname="warning" /> {{ $t('domain_dns_conf_is_just_a_recommendation') }}
-      </b-alert>
+    <section v-if="showManualConfigCard" class="panel-section">
+      <b-card-title title-tag="h3">
+        {{ $t('domain.dns.manual_config') }}
+      </b-card-title>
+
+      <read-only-alert-item
+        :label="$t('domain_dns_conf_is_just_a_recommendation')"
+        type="warning"
+      />
 
       <pre class="log">{{ dnsConfig }}</pre>
-    </card>
+    </section>
   </view-base>
 </template>
 
diff --git a/app/src/views/domain/DomainInfo.vue b/app/src/views/domain/DomainInfo.vue
index 6a4331cf..ff8309c7 100644
--- a/app/src/views/domain/DomainInfo.vue
+++ b/app/src/views/domain/DomainInfo.vue
@@ -71,7 +71,11 @@
       </description-row>
     </card>
 
-    <config-panels v-if="config.panels" v-bind="config" @submit="onConfigSubmit" />
+    <config-panels v-if="config.panels" v-bind="config" @submit="onConfigSubmit">
+      <template v-if="currentTab === 'dns'" #tab-after>
+        <domain-dns :name="name" />
+      </template>
+    </config-panels>
   </view-base>
 </template>
 
@@ -84,13 +88,15 @@ import {
   formatYunoHostConfigPanels
 } from '@/helpers/yunohostArguments'
 import ConfigPanels from '@/components/ConfigPanels'
+import DomainDns from './DomainDns.vue'
 
 
 export default {
   name: 'DomainInfo',
 
   components: {
-    ConfigPanels
+    ConfigPanels,
+    DomainDns
   },
 
   props: {
@@ -112,6 +118,10 @@ export default {
   computed: {
     ...mapGetters(['mainDomain']),
 
+    currentTab () {
+      return this.$route.params.tabId
+    },
+
     domain () {
       return this.$store.getters.domain(this.name)
     },