From dbdad6fce8a1b07124b6c3d9d05cad55199359c3 Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Thu, 12 Jun 2025 00:37:44 +0200
Subject: [PATCH] Allow to overwrite dns if record already exists for an app

---
 dashboard/public/translation/en.json      |  3 ++-
 dashboard/src/components/app/Location.vue | 13 +++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/dashboard/public/translation/en.json b/dashboard/public/translation/en.json
index bfe1f8a05..48e8cc6d1 100644
--- a/dashboard/public/translation/en.json
+++ b/dashboard/public/translation/en.json
@@ -1536,7 +1536,8 @@
             "aliases": "Aliases",
             "addAliasAction": "Add an alias",
             "noAliases": "No alias domains are configured.",
-            "aliasesPlaceholder": "Leave empty to use bare domain"
+            "aliasesPlaceholder": "Leave empty to use bare domain",
+            "dnsoverwrite": "Some DNS records already exist. Agree to overwrite."
         },
         "accessControl": {
             "userManagement": {
diff --git a/dashboard/src/components/app/Location.vue b/dashboard/src/components/app/Location.vue
index 8dcf988e6..96b121f10 100644
--- a/dashboard/src/components/app/Location.vue
+++ b/dashboard/src/components/app/Location.vue
@@ -1,7 +1,7 @@
 <script setup>
 
 import { ref, onMounted, computed } from 'vue';
-import { Button, SingleSelect, InputGroup, FormGroup, TextInput } from 'pankow';
+import { Button, SingleSelect, InputGroup, FormGroup, TextInput, Checkbox } from 'pankow';
 import { isValidDomain } from 'pankow/utils';
 import PortBindings from '../PortBindings.vue';
 import AppsModel from '../../models/AppsModel.js';
@@ -90,15 +90,23 @@ async function onSubmit() {
   for (const d of redirects.value) checkForDomains.push({ domain: d.domain, subdomain: d.subdomain });
 
   for (const d of checkForDomains) {
+    console.log('checking', d.subdomain, d.domain)
     const [error, result] = await domainsModel.checkRecords(d.domain, d.subdomain);
     if (error) {
       errorMessage.value = error.body ? error.body.message : 'Internal error';
       busy.value = false;
       return console.error(error);
     }
-    if (result.needsOverwrite) return needsOverwriteDns.value = true;
+
+    if (result.needsOverwrite && !overwriteDns.value) {
+      busy.value = false;
+      needsOverwriteDns.value = true;
+      return;
+    }
   }
 
+  console.log('checking done')
+
   // only use enabled ports
   const ports = {};
   const portsCombined = Object.assign(tcpPorts.value || {}, udpPorts.value || {});
@@ -245,6 +253,7 @@ onMounted(async () => {
     <div class="has-error" v-if="errorMessage">{{ errorMessage }}</div>
 
     <br/>
+    <Checkbox v-if="needsOverwriteDns" v-model="overwriteDns" :label="$t('app.location.dnsoverwrite')"/>
 
     <Button @click="onSubmit()" :loading="busy" :disabled="busy || app.error || app.taskId || !formValid" v-tooltip="app.error ? 'App is in error state' : (app.taskId ? 'App is busy' : '')">{{ $t('app.location.saveAction') }}</Button>
   </div>