From 5f7f8356b10a4c074124b9b9df174e41c4a7a99d Mon Sep 17 00:00:00 2001
From: Spitap <dev@asdrip.fr>
Date: Mon, 26 Sep 2022 15:05:57 +0200
Subject: [PATCH 1/2] Show pending label when check is pending on GUIv2

---
 frontend/src/components/domains/DNSDetail.vue | 236 ++++++++++--------
 1 file changed, 132 insertions(+), 104 deletions(-)

diff --git a/frontend/src/components/domains/DNSDetail.vue b/frontend/src/components/domains/DNSDetail.vue
index 2c391bf3c..b968a7ff6 100644
--- a/frontend/src/components/domains/DNSDetail.vue
+++ b/frontend/src/components/domains/DNSDetail.vue
@@ -8,113 +8,135 @@
   </v-card-title>
   <v-card-text>
     <translate class="overline">MX records</translate>
-    <v-data-table
-      :headers="mxRecordHeaders"
-      :items="detail.mx_records"
-      hide-default-footer
-      >
-      <template v-slot:item.updated="{ item }">
-        {{ item.updated|date }}
-      </template>
-    </v-data-table>
+    <template v-if="domain.dns_global_status=='pending'">
+      <v-row>
+        <v-col>
+          <v-chip color="info" small>
+            <translate>Pending</translate>
+          </v-chip>
+        </v-col>
+      </v-row>
+    </template>
+    <template v-else>
+      <v-data-table
+        :headers="mxRecordHeaders"
+        :items="detail.mx_records"
+        hide-default-footer
+        >
+        <template v-slot:item.updated="{ item }">
+          {{ item.updated|date }}
+        </template>
+      </v-data-table>
+    </template>
     <translate class="overline">Auto configuration</translate>
-    <v-row>
-      <v-col>
-        <v-chip
-          v-if="detail.autoconfig_record"
-          color="success"
-          >
-          <translate
-            :translate-params="{ value: detail.autoconfig_record.value }"
+    <template v-if="domain.dns_global_status=='pending'">
+      <v-row>
+        <v-col>
+          <v-chip color="info" small>
+            <translate>Pending</translate>
+          </v-chip>
+        </v-col>
+      </v-row>
+    </template>
+    <template v-else>
+      <v-row>
+        <v-col>
+          <v-chip
+            v-if="detail.autoconfig_record"
+            color="success"
             >
-            autoconfig record (Mozilla): %{ value }
-          </translate>
-        </v-chip>
-        <v-chip
-          v-else
-          color="warning"
-          >
-          <translate>autoconfig record (Mozilla) not found</translate>
-        </v-chip>
-      </v-col>
-      <v-col>
-        <v-chip
-          v-if="detail.autodiscover_record"
-          color="success"
-          >
-          <translate
-            :translate-params="{ value: detail.autodiscover_record.value }"
+            <translate
+              :translate-params="{ value: detail.autoconfig_record.value }"
+              >
+              autoconfig record (Mozilla): %{ value }
+            </translate>
+          </v-chip>
+          <v-chip
+            v-else
+            color="warning"
             >
-            autodiscover record (Microsoft): %{ value }
-          </translate>
-        </v-chip>
-        <v-chip
-          v-else
-          color="warning"
-          >
-          <translate>autodiscover record (Microsoft) not found</translate>
-        </v-chip>
-      </v-col>
-    </v-row>
-    <translate class="overline">Authentication</translate>
-    <v-row>
-      <v-col>
-        <v-chip
-          v-if="detail.spf_record"
-          color="success"
-          >
-          <translate>SPF record found</translate>
-        </v-chip>
-        <v-chip
-          v-else
-          color="error"
-          >
-          <translate>SPF record not found</translate>
-        </v-chip>
-      </v-col>
-      <v-col>
-        <v-chip
-          v-if="detail.dkim_record"
-          color="success"
-          >
-          <translate>DKIM record found</translate>
-        </v-chip>
-        <v-chip
-          v-else
-          color="error"
-          >
-          <translate>DKIM record not found</translate>
-        </v-chip>
-      </v-col>
-      <v-col>
-        <v-chip
-          v-if="detail.dmarc_record"
-          color="success"
-          >
-          <translate>DMARC record found</translate>
-        </v-chip>
-        <v-chip
-          v-else
-          color="error"
-          >
-          <translate>DMARC record not found</translate>
-        </v-chip>
-      </v-col>
-    </v-row>
-    <v-row v-if="value.enable_dkim">
-      <v-col cols="3"><translate>DKIM key</translate></v-col>
-      <v-col cols="9">
-        <div v-if="value.dkim_private_key_path && value.dkim_public_key">
-          <v-btn color="primary" small @click="showDKIMKey = true">
-            <translate>Show key</translate>
-          </v-btn>
-          <v-btn icon :title="'Generate a new DKIM key'|translate" @click="generateNewKey">
-            <v-icon>mdi-refresh</v-icon>
-          </v-btn>
-        </div>
-        <translate v-else>Not generated</translate>
-      </v-col>
-    </v-row>
+            <translate>autoconfig record (Mozilla) not found</translate>
+          </v-chip>
+        </v-col>
+        <v-col>
+          <v-chip
+            v-if="detail.autodiscover_record"
+            color="success"
+            >
+            <translate
+              :translate-params="{ value: detail.autodiscover_record.value }"
+              >
+              autodiscover record (Microsoft): %{ value }
+            </translate>
+          </v-chip>
+          <v-chip
+            v-else
+            color="warning"
+            >
+            <translate>autodiscover record (Microsoft) not found</translate>
+          </v-chip>
+        </v-col>
+      </v-row>
+      <translate class="overline">Authentication</translate>
+      <v-row>
+        <v-col>
+          <v-chip
+            v-if="detail.spf_record"
+            color="success"
+            >
+            <translate>SPF record found</translate>
+          </v-chip>
+          <v-chip
+            v-else
+            color="error"
+            >
+            <translate>SPF record not found</translate>
+          </v-chip>
+        </v-col>
+        <v-col>
+          <v-chip
+            v-if="detail.dkim_record"
+            color="success"
+            >
+            <translate>DKIM record found</translate>
+          </v-chip>
+          <v-chip
+            v-else
+            color="error"
+            >
+            <translate>DKIM record not found</translate>
+          </v-chip>
+        </v-col>
+        <v-col>
+          <v-chip
+            v-if="detail.dmarc_record"
+            color="success"
+            >
+            <translate>DMARC record found</translate>
+          </v-chip>
+          <v-chip
+            v-else
+            color="error"
+            >
+            <translate>DMARC record not found</translate>
+          </v-chip>
+        </v-col>
+      </v-row>
+      <v-row v-if="value.enable_dkim">
+        <v-col cols="3"><translate>DKIM key</translate></v-col>
+        <v-col cols="9">
+          <div v-if="value.dkim_private_key_path && value.dkim_public_key">
+            <v-btn color="primary" small @click="showDKIMKey = true">
+              <translate>Show key</translate>
+            </v-btn>
+            <v-btn icon :title="'Generate a new DKIM key'|translate" @click="generateNewKey">
+              <v-icon>mdi-refresh</v-icon>
+            </v-btn>
+          </div>
+          <translate v-else>Not generated</translate>
+        </v-col>
+      </v-row>
+    </template>
   </v-card-text>
   <v-dialog v-model="showConfigHelp"
             max-width="800px"
@@ -145,6 +167,7 @@ export default {
   },
   data () {
     return {
+      domain: { pk: this.$route.params.id },
       detail: {},
       mxRecordHeaders: [
         { text: this.$gettext('Name'), value: 'name' },
@@ -182,6 +205,11 @@ export default {
       },
       immediate: true
     }
+  },
+  mounted () {
+    domains.getDomain(this.$route.params.id).then(resp => {
+      this.domain = resp.data
+    })
   }
 }
 </script>

From 4d83e96b5ec0659d67bf6a922652f301d68f8b27 Mon Sep 17 00:00:00 2001
From: Spitap <dev@asdrip.fr>
Date: Mon, 26 Sep 2022 18:26:46 +0200
Subject: [PATCH 2/2] stopped using useless variable

---
 frontend/src/components/domains/DNSDetail.vue | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/domains/DNSDetail.vue b/frontend/src/components/domains/DNSDetail.vue
index b968a7ff6..e32cef5ba 100644
--- a/frontend/src/components/domains/DNSDetail.vue
+++ b/frontend/src/components/domains/DNSDetail.vue
@@ -8,7 +8,7 @@
   </v-card-title>
   <v-card-text>
     <translate class="overline">MX records</translate>
-    <template v-if="domain.dns_global_status=='pending'">
+    <template v-if="value.dns_global_status=='pending'">
       <v-row>
         <v-col>
           <v-chip color="info" small>
@@ -29,7 +29,7 @@
       </v-data-table>
     </template>
     <translate class="overline">Auto configuration</translate>
-    <template v-if="domain.dns_global_status=='pending'">
+    <template v-if="value.dns_global_status=='pending'">
       <v-row>
         <v-col>
           <v-chip color="info" small>
@@ -167,7 +167,6 @@ export default {
   },
   data () {
     return {
-      domain: { pk: this.$route.params.id },
       detail: {},
       mxRecordHeaders: [
         { text: this.$gettext('Name'), value: 'name' },
@@ -205,11 +204,6 @@ export default {
       },
       immediate: true
     }
-  },
-  mounted () {
-    domains.getDomain(this.$route.params.id).then(resp => {
-      this.domain = resp.data
-    })
   }
 }
 </script>