From 6888ccb571f289b0afa9f9bbda41a3a2d2c9db97 Mon Sep 17 00:00:00 2001
From: axolotle <nchesnais@mailoo.org>
Date: Wed, 21 Aug 2024 21:52:47 +0200
Subject: [PATCH] fix: use different strategy for domains not available in
 DomainForm in PostInstall

---
 app/src/composables/data.ts            |  3 +--
 app/src/views/PostInstall.vue          |  1 +
 app/src/views/_partials/DomainForm.vue | 10 +++-------
 app/src/views/domain/DomainAdd.vue     |  3 +++
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/src/composables/data.ts b/app/src/composables/data.ts
index ea7cd661..2ee4b8bd 100644
--- a/app/src/composables/data.ts
+++ b/app/src/composables/data.ts
@@ -134,8 +134,7 @@ export function useDomains(
   const { mainDomain, domains: domains_, domainDetails } = useData()
 
   const domains = computed(() => {
-    if (!domains_.value && installed)
-      throw new Error(getNoDataMessage('domains'))
+    if (!domains_.value) throw new Error(getNoDataMessage('domains'))
     return domains_.value
   })
 
diff --git a/app/src/views/PostInstall.vue b/app/src/views/PostInstall.vue
index 6c1f5cf6..f76a4ecd 100644
--- a/app/src/views/PostInstall.vue
+++ b/app/src/views/PostInstall.vue
@@ -163,6 +163,7 @@ async function performPostInstall(force = false) {
     <!-- DOMAIN SETUP STEP -->
     <template v-else-if="step === 'domain'">
       <DomainForm
+        :domains="[]"
         :title="$t('postinstall_set_domain')"
         :submit-text="$t('next')"
         :server-error="serverError"
diff --git a/app/src/views/_partials/DomainForm.vue b/app/src/views/_partials/DomainForm.vue
index a971ec80..0c4d27dd 100644
--- a/app/src/views/_partials/DomainForm.vue
+++ b/app/src/views/_partials/DomainForm.vue
@@ -2,9 +2,7 @@
 import { computed, reactive, ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 
-import { useDomains } from '@/composables/data'
 import { useForm } from '@/composables/form'
-import { useInfos } from '@/composables/useInfos'
 import {
   domain,
   dynDomain,
@@ -21,6 +19,7 @@ defineOptions({
 
 const props = withDefaults(
   defineProps<{
+    domains: string[]
     title: string
     submitText?: string
     serverError?: string
@@ -35,14 +34,11 @@ const emit = defineEmits<{
 }>()
 
 const { t } = useI18n()
-const { installed } = useInfos()
-
-const { domains } = useDomains(undefined, installed.value)
 const dynDomains = ['nohost.me', 'noho.st', 'ynh.fr']
 
 const dynDnsForbiden = computed(() => {
-  if (!domains.value) return false
-  return domains.value.some((domain) => {
+  if (!props.domains) return false
+  return props.domains.some((domain) => {
     return dynDomains.some((dynDomain) => domain.includes(dynDomain))
   })
 })
diff --git a/app/src/views/domain/DomainAdd.vue b/app/src/views/domain/DomainAdd.vue
index 695401cb..56eae2a5 100644
--- a/app/src/views/domain/DomainAdd.vue
+++ b/app/src/views/domain/DomainAdd.vue
@@ -4,12 +4,14 @@ import { useRouter } from 'vue-router'
 
 import api from '@/api'
 import { APIBadRequestError, type APIError } from '@/api/errors'
+import { useDomains } from '@/composables/data'
 import { DomainForm } from '@/views/_partials'
 
 const router = useRouter()
 
 await api.fetch({ uri: 'domains', cachePath: 'domains' })
 
+const { domains } = useDomains()
 const serverError = ref('')
 
 function onSubmit(data: { domain: string; dyndns_recovery_password?: string }) {
@@ -32,6 +34,7 @@ function onSubmit(data: { domain: string; dyndns_recovery_password?: string }) {
 
 <template>
   <DomainForm
+    :domains="domains"
     :title="$t('domain_add')"
     :server-error="serverError"
     :submit-text="$t('add')"