From dee34880724ddeeba749d89928118e45fd01f0b1 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 6 May 2022 14:56:15 +0200
Subject: [PATCH] Frontend fixes

* Domain creation is now possible (#2507)
* Wrong labels in DNS detail page (#2505)
---
 .github/workflows/modoboa.yml                    |  1 +
 frontend/package.json                            |  4 ++--
 frontend/src/components/domains/DNSDetail.vue    | 16 +++++++++++-----
 .../components/domains/DomainCreationForm.vue    |  2 ++
 frontend/src/plugins/vue-gettext.js              |  1 +
 frontend/yarn.lock                               |  4 ++--
 6 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/modoboa.yml b/.github/workflows/modoboa.yml
index 3a3b5b858..acc53e219 100644
--- a/.github/workflows/modoboa.yml
+++ b/.github/workflows/modoboa.yml
@@ -10,6 +10,7 @@ on:
     branches: [ master ]
   release:
     branches: [ master ]
+    types: [ published ]
 
 env:
   POSTGRES_HOST: localhost
diff --git a/frontend/package.json b/frontend/package.json
index 746372a1f..6e6236934 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -16,10 +16,10 @@
     "js-cookie": "^2.2.1",
     "luxon": "^1.26.0",
     "vee-validate": "^3.4.5",
-    "vue": "^2.6.11",
+    "vue": "^2.6.14",
     "vue-apexcharts": "^1.6.0",
     "vue-cookie": "^1.1.4",
-    "vue-gettext": "^2.1.10",
+    "vue-gettext": "^2.1.12",
     "vue-router": "^3.2.0",
     "vuetify": "^2.2.11",
     "vuex": "^3.4.0"
diff --git a/frontend/src/components/domains/DNSDetail.vue b/frontend/src/components/domains/DNSDetail.vue
index 85726d681..ae9d57978 100644
--- a/frontend/src/components/domains/DNSDetail.vue
+++ b/frontend/src/components/domains/DNSDetail.vue
@@ -21,10 +21,14 @@
     <v-row>
       <v-col>
         <v-chip
-          v-if="detail.autoconfig_record"
+          v-if="detail.autoconfig_record !== undefined"
           color="success"
           >
-          <translate>autoconfig record (Mozilla): {{ detail.autoconfig_record.value }}</translate>
+          <translate
+            :translate-params="{ value: detail.autoconfig_record.value }"
+            >
+            autoconfig record (Mozilla): %{ value }
+          </translate>
         </v-chip>
         <v-chip
           v-else
@@ -38,7 +42,11 @@
           v-if="detail.autodiscover_record"
           color="success"
           >
-          <translate>autodiscover record (Microsoft): {{ detail.autodiscover_record.value }}</translate>
+          <translate
+            :translate-params="{ value: detail.autodiscover_record.value }"
+            >
+            autodiscover record (Microsoft): %{ value }
+          </translate>
         </v-chip>
         <v-chip
           v-else
@@ -135,8 +143,6 @@ export default {
       showConfigHelp: false
     }
   },
-  methods: {
-  },
   watch: {
     domain: {
       handler: function (val) {
diff --git a/frontend/src/components/domains/DomainCreationForm.vue b/frontend/src/components/domains/DomainCreationForm.vue
index f64c0f007..18d8d54ef 100644
--- a/frontend/src/components/domains/DomainCreationForm.vue
+++ b/frontend/src/components/domains/DomainCreationForm.vue
@@ -217,6 +217,8 @@ export default {
       }
       if (data.type === 'relaydomain') {
         this.$refs.form_4.checkSettingTypes(data)
+      } else {
+        delete data.transport
       }
       this.$store.dispatch('domains/createDomain', data).then(resp => {
         this.$router.push({ name: 'DomainDetail', params: { id: resp.data.pk } })
diff --git a/frontend/src/plugins/vue-gettext.js b/frontend/src/plugins/vue-gettext.js
index c5569e032..371eee090 100644
--- a/frontend/src/plugins/vue-gettext.js
+++ b/frontend/src/plugins/vue-gettext.js
@@ -3,6 +3,7 @@ import GetTextPlugin from 'vue-gettext'
 import translations from '@/translations.json'
 
 Vue.use(GetTextPlugin, {
+  autoAddKeyAttributes: true,
   availableLanguages: {
     en: 'English',
     fr: 'Français'
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index aad4fcef3..ae0075931 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -9722,7 +9722,7 @@ vue-eslint-parser@^7.0.0:
     esquery "^1.0.1"
     lodash "^4.17.15"
 
-vue-gettext@^2.1.10:
+vue-gettext@^2.1.12:
   version "2.1.12"
   resolved "https://registry.yarnpkg.com/vue-gettext/-/vue-gettext-2.1.12.tgz#444d3220149b17fa4c7caeded3f12d439b698f33"
   integrity sha512-7Kw36xtKvARp8ZafQGPK9WR6EM+dhFUikR5f0+etSkiHuvUM3yf1HsRDLYoLLdJ0AMaXxKwgekumzvCk6KX8rA==
@@ -9778,7 +9778,7 @@ vue-template-es2015-compiler@^1.9.0:
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
   integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
 
-vue@^2.6.11:
+vue@^2.6.14:
   version "2.6.14"
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235"
   integrity sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==