From f11fd19288a44faedec8df09232a97badd3bd4df Mon Sep 17 00:00:00 2001
From: 0xJacky <me@jackyu.cn>
Date: Tue, 9 Aug 2022 19:33:40 +0800
Subject: [PATCH] fix v-model issue for IssueCert switch

---
 frontend/src/version.json                     |  2 +-
 frontend/src/views/domain/DomainEdit.vue      | 10 +++++-
 frontend/src/views/domain/cert/Cert.vue       | 14 ++++++--
 frontend/src/views/domain/cert/IssueCert.vue  |  9 +++++
 .../views/domain/ngx_conf/NgxConfigEditor.vue | 33 ++++++++++++-------
 frontend/version.json                         |  2 +-
 6 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/frontend/src/version.json b/frontend/src/version.json
index 4e27084e..b70ec6a5 100644
--- a/frontend/src/version.json
+++ b/frontend/src/version.json
@@ -1 +1 @@
-{"version":"1.5.0","build_id":32,"total_build":102}
\ No newline at end of file
+{"version":"1.5.0","build_id":40,"total_build":110}
\ No newline at end of file
diff --git a/frontend/src/views/domain/DomainEdit.vue b/frontend/src/views/domain/DomainEdit.vue
index 9ffe4cef..aed2fdbf 100644
--- a/frontend/src/views/domain/DomainEdit.vue
+++ b/frontend/src/views/domain/DomainEdit.vue
@@ -104,6 +104,14 @@ function disable() {
         message.error(interpolate($gettext('Failed to disable %{msg}'), {msg: r.message ?? ''}))
     })
 }
+
+function on_change_enabled(checked: boolean) {
+    if (checked) {
+        enable()
+    } else {
+        disable()
+    }
+}
 </script>
 <template>
     <div>
@@ -138,7 +146,7 @@ function disable() {
 
                 <div class="domain-edit-container" key="basic" v-else>
                     <a-form-item :label="$gettext('Enabled')">
-                        <a-switch v-model:checked="enabled" @change="checked=>{checked?enable():disable()}"/>
+                        <a-switch v-model:checked="enabled" @change="on_change_enabled"/>
                     </a-form-item>
                     <ngx-config-editor
                         ref="ngx_config_editor"
diff --git a/frontend/src/views/domain/cert/Cert.vue b/frontend/src/views/domain/cert/Cert.vue
index 2332ac18..ba246a0e 100644
--- a/frontend/src/views/domain/cert/Cert.vue
+++ b/frontend/src/views/domain/cert/Cert.vue
@@ -5,7 +5,7 @@ import {computed, ref} from 'vue'
 
 const props = defineProps(['directivesMap', 'current_server_directives', 'enabled'])
 
-const emit = defineEmits(['callback'])
+const emit = defineEmits(['callback', 'update:enabled'])
 
 const info = ref(null)
 
@@ -22,6 +22,16 @@ function callback() {
 const name = computed(() => {
     return props.directivesMap['server_name'][0].params.trim()
 })
+
+const enabled = computed({
+    get() {
+        return props.enabled
+    },
+    set(value) {
+        emit('update:enabled', value)
+    }
+})
+
 </script>
 
 <template>
@@ -30,7 +40,7 @@ const name = computed(() => {
         <issue-cert
             :current_server_directives="props.current_server_directives"
             :directives-map="props.directivesMap"
-            v-model:enabled="props.enabled"
+            v-model:enabled="enabled"
             @callback="callback"
         />
     </div>
diff --git a/frontend/src/views/domain/cert/IssueCert.vue b/frontend/src/views/domain/cert/IssueCert.vue
index 8f635f46..2175aced 100644
--- a/frontend/src/views/domain/cert/IssueCert.vue
+++ b/frontend/src/views/domain/cert/IssueCert.vue
@@ -125,6 +125,15 @@ const name = computed(() => {
     return props.directivesMap['server_name'][0].params.trim()
 })
 
+const enabled = computed({
+    get() {
+        return props.enabled
+    },
+    set(value) {
+        emit('update:enabled', value)
+    }
+})
+
 watch(server_name_more_than_one, () => {
     emit('update:enabled', false)
     onchange(false)
diff --git a/frontend/src/views/domain/ngx_conf/NgxConfigEditor.vue b/frontend/src/views/domain/ngx_conf/NgxConfigEditor.vue
index f9749c2a..328bb16c 100644
--- a/frontend/src/views/domain/ngx_conf/NgxConfigEditor.vue
+++ b/frontend/src/views/domain/ngx_conf/NgxConfigEditor.vue
@@ -2,15 +2,15 @@
 import DirectiveEditor from '@/views/domain/ngx_conf/directive/DirectiveEditor.vue'
 import LocationEditor from '@/views/domain/ngx_conf/LocationEditor.vue'
 import {computed, ref} from 'vue'
-import {useRoute, useRouter} from 'vue-router'
+import {useRoute} from 'vue-router'
 import {useGettext} from 'vue3-gettext'
 import Cert from '@/views/domain/cert/Cert.vue'
 
 const {$gettext} = useGettext()
 
-const {ngx_config, auto_cert, enabled} = defineProps(['ngx_config', 'auto_cert', 'enabled'])
+const props = defineProps(['ngx_config', 'auto_cert', 'enabled'])
 
-const emit = defineEmits(['callback'])
+const emit = defineEmits(['callback', 'update:auto_cert'])
 
 const route = useRoute()
 
@@ -20,13 +20,13 @@ const name = ref(route.params.name)
 function change_tls(r: any) {
     if (r) {
         // deep copy servers[0] to servers[1]
-        const server = JSON.parse(JSON.stringify(ngx_config.servers[0]))
+        const server = JSON.parse(JSON.stringify(props.ngx_config.servers[0]))
 
-        ngx_config.servers.push(server)
+        props.ngx_config.servers.push(server)
 
         current_server_index.value = 1
 
-        const servers = ngx_config.servers
+        const servers = props.ngx_config.servers
 
         let i = 0
         while (i < servers[1].directives.length) {
@@ -67,14 +67,14 @@ function change_tls(r: any) {
     } else {
         // remove servers[1]
         current_server_index.value = 0
-        if (ngx_config.servers.length === 2) {
-            ngx_config.servers.splice(1, 1)
+        if (props.ngx_config.servers.length === 2) {
+            props.ngx_config.servers.splice(1, 1)
         }
     }
 }
 
 const current_server_directives = computed(() => {
-    return ngx_config.servers[current_server_index.value].directives
+    return props.ngx_config.servers[current_server_index.value].directives
 })
 
 const directivesMap = computed(() => {
@@ -94,7 +94,7 @@ const directivesMap = computed(() => {
 
 
 const support_ssl = computed(() => {
-    const servers = ngx_config.servers
+    const servers = props.ngx_config.servers
     for (const server_key in servers) {
         for (const k in servers[server_key].directives) {
             const v = servers[server_key].directives[k]
@@ -119,6 +119,15 @@ const current_support_ssl = computed(() => {
 
 })
 
+const autoCertRef = computed({
+    get() {
+        return props.auto_cert
+    },
+    set(value) {
+        emit('update:auto_cert', value)
+    }
+})
+
 </script>
 
 <template>
@@ -128,7 +137,7 @@ const current_support_ssl = computed(() => {
         </a-form-item>
 
         <a-tabs v-model:activeKey="current_server_index">
-            <a-tab-pane :tab="'Server '+(k+1)" v-for="(v,k) in ngx_config.servers" :key="k">
+            <a-tab-pane :tab="'Server '+(k+1)" v-for="(v,k) in props.ngx_config.servers" :key="k">
 
                 <div class="tab-content">
                     <template v-if="current_support_ssl&&enabled">
@@ -136,7 +145,7 @@ const current_support_ssl = computed(() => {
                             v-if="current_support_ssl"
                             :current_server_directives="current_server_directives"
                             :directives-map="directivesMap"
-                            v-model:enabled="auto_cert"
+                            v-model:enabled="autoCertRef"
                             @callback="$emit('callback')"
                         />
                     </template>
diff --git a/frontend/version.json b/frontend/version.json
index 4e27084e..b70ec6a5 100644
--- a/frontend/version.json
+++ b/frontend/version.json
@@ -1 +1 @@
-{"version":"1.5.0","build_id":32,"total_build":102}
\ No newline at end of file
+{"version":"1.5.0","build_id":40,"total_build":110}
\ No newline at end of file