From 92d52ab430dc6f8422ed71ba6a357075cd24fc5d Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Mon, 11 Dec 2023 19:15:26 +0100 Subject: [PATCH] ui: New button to display generated records --- .../lib/components/domains/ModalFooter.svelte | 27 +++++++++++++++ ui/src/lib/components/domains/Service.svelte | 15 ++------ .../components/domains/ServiceModal.svelte | 4 +++ .../components/domains/TableRecords.svelte | 34 +++++++++++++++++++ ui/src/lib/locales/en.json | 1 + ui/src/lib/locales/fr.json | 1 + 6 files changed, 69 insertions(+), 13 deletions(-) create mode 100644 ui/src/lib/components/domains/TableRecords.svelte diff --git a/ui/src/lib/components/domains/ModalFooter.svelte b/ui/src/lib/components/domains/ModalFooter.svelte index e0505db..e3a1f2d 100644 --- a/ui/src/lib/components/domains/ModalFooter.svelte +++ b/ui/src/lib/components/domains/ModalFooter.svelte @@ -3,11 +3,14 @@ import { Button, + Icon, ModalFooter, Spinner, } from 'sveltestrap'; + import { getServiceRecords } from '$lib/api/zone'; import HelpButton from '$lib/components/Help.svelte'; + import TableRecords from '$lib/components/domains/TableRecords.svelte'; import type { ServiceCombined } from '$lib/model/service'; import { locale, t } from '$lib/translations'; @@ -17,7 +20,9 @@ export let step: number; export let service: ServiceCombined | null = null; export let form = "addSvcForm"; + export let origin: Domain | DomainInList | undefined; export let update = false; + export let zoneId: number | undefined; export let canDelete = false; export let canContinue = false; @@ -46,9 +51,31 @@ } helpHref = "https://help.happydomain.org/" + $locale + "/" + helpHref; } + + let showRecords = false; +{#if showRecords} + + {#await getServiceRecords(origin, zoneId, service)} + + {:then serviceRecords} + + {/await} + +{/if} + {#if origin && zoneId} + + {/if} +
{#if step === 2} - - - {#each serviceRecords as record} - - {/each} - -
+ {:else} diff --git a/ui/src/lib/components/domains/ServiceModal.svelte b/ui/src/lib/components/domains/ServiceModal.svelte index b902887..7bba2dd 100644 --- a/ui/src/lib/components/domains/ServiceModal.svelte +++ b/ui/src/lib/components/domains/ServiceModal.svelte @@ -112,15 +112,19 @@ {/if} + {#if zone} + {/if} {/if} diff --git a/ui/src/lib/components/domains/TableRecords.svelte b/ui/src/lib/components/domains/TableRecords.svelte new file mode 100644 index 0000000..838e174 --- /dev/null +++ b/ui/src/lib/components/domains/TableRecords.svelte @@ -0,0 +1,34 @@ + + +{#if serviceRecords} + + + {#each serviceRecords as record} + + {/each} + +
+{/if} diff --git a/ui/src/lib/locales/en.json b/ui/src/lib/locales/en.json index bbbd6c8..0ebd06b 100644 --- a/ui/src/lib/locales/en.json +++ b/ui/src/lib/locales/en.json @@ -120,6 +120,7 @@ "provider": "Zone hosted on", "title": "View zone" }, + "see-records": "See corresponding records", "alias-creation": "Add an alias pointing to {{domain}}:", "alias-creation-sample": "This will create the alias:", "placeholder-new": "my.new.domain.", diff --git a/ui/src/lib/locales/fr.json b/ui/src/lib/locales/fr.json index 9f37842..f3d4a42 100644 --- a/ui/src/lib/locales/fr.json +++ b/ui/src/lib/locales/fr.json @@ -120,6 +120,7 @@ "title": "Voir la zone", "provider": "Zone hébergée par" }, + "see-records": "Voir les enregistrements correspondants", "alias-creation": "Ajouter un alias pointant sur {{domain}} :", "alias-creation-sample": "Cela va créer cet alias :", "placeholder-new": "mon.nouveau.domaine.",