happyDomain/happyDomain
happyDomain
/
happyDomain
1
0
Fork 0
Code Issues 1 Pull Requests 3 Releases Activity

Refactor import_zone -> retrieve_zone

This commit is contained in:
nemunaire 2023-02-27 23:19:43 +01:00
parent c15fca659f
commit 625b20fa6d
3 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/zones.go
View File

@ -49,7 +49,7 @@ import (
)
func declareZonesRoutes(cfg *config.Options, router *gin.RouterGroup) {
router.POST("/import_zone", importZone)
router.POST("/retrieve_zone", retrieveZone)
router.POST("/diff_zones/:zoneid1/:zoneid2", diffZones)
apiZonesRoutes := router.Group("/zone/:zoneid")
@ -185,7 +185,7 @@ func getZoneService(c *gin.Context) {
c.JSON(http.StatusOK, zone.FindSubdomainService(subdomain, serviceid))
}
func importZone(c *gin.Context) {
func retrieveZone(c *gin.Context) {
user := c.MustGet("LoggedUser").(*happydns.User)
domain := c.MustGet("domain").(*happydns.Domain)

4
ui/src/lib/api/zone.ts
View File

@ -20,9 +20,9 @@ export async function viewZone(domain: Domain | DomainInList, id: string): Promi
return await handleApiResponse<string>(res);
}
export async function importZone(domain: Domain | DomainInList): Promise<ZoneMeta> {
export async function retrieveZone(domain: Domain | DomainInList): Promise<ZoneMeta> {
const dnid = encodeURIComponent(domain.id);
const res = await fetch(`/api/domains/${dnid}/import_zone`, {
const res = await fetch(`/api/domains/${dnid}/retrieve_zone`, {
method: 'POST',
headers: {'Accept': 'application/json'}
});

63
ui/src/routes/domains/[dn]/[[historyid]]/+layout.svelte
View File

@ -25,7 +25,7 @@
import {
applyZone as APIApplyZone,
diffZone as APIDiffZone,
importZone as APIImportZone,
retrieveZone as APIRetrieveZone,
viewZone as APIViewZone,
} from '$lib/api/zone';
import ImgProvider from '$lib/components/providers/ImgProvider.svelte';
@ -70,22 +70,22 @@
goto('/domains/' + encodeURIComponent(selectedDomain) + '/' + encodeURIComponent(selectedHistory));
}
let importInProgress = false;
function importZone(): void {
let retrievalInProgress = false;
function retrieveZone(): void {
if (domain) {
importInProgress = true;
APIImportZone(domain).then(
importZoneDone,
retrievalInProgress = true;
APIRetrieveZone(domain).then(
retrieveZoneDone,
(err: any) => {
importInProgress = false;
retrievalInProgress = false;
throw err;
}
);
}
}
function importZoneDone(zm: ZoneMeta): void {
importInProgress = false;
function retrieveZoneDone(zm: ZoneMeta): void {
retrievalInProgress = false;
refreshDomains();
selectedHistory = zm.id;
}
@ -97,11 +97,11 @@
let domain: null | Domain = null;
$: if ($domains_idx[selectedDomain]) {
if (!$domains_idx[selectedDomain].zone_history || $domains_idx[selectedDomain].zone_history.length == 0) {
importInProgress = true;
APIImportZone($domains_idx[selectedDomain]).then(
importZoneDone,
retrievalInProgress = true;
APIRetrieveZone($domains_idx[selectedDomain]).then(
retrieveZoneDone,
(err: any) => {
importInProgress = false;
retrievalInProgress = false;
throw err;
}
)
@ -198,7 +198,7 @@
propagationInProgress = true;
try {
importZoneDone(await APIApplyZone(domain, selectedHistory, selectedDiff));
retrieveZoneDone(await APIApplyZone(domain, selectedHistory, selectedDiff));
} finally {
applyZoneModalIsOpen = false;
}
@ -261,22 +261,25 @@
{#if domain && domain.zone_history}
<form class="mt-3">
<Button
class="float-end"
outline
color="secondary"
size="sm"
title={$t('domains.actions.reimport')}
disabled={importInProgress}
on:click={importZone}
>
{#if importInProgress}
<Spinner size="sm" />
{:else}
<Icon name="cloud-download" />
{/if}
</Button>
<label class="fw-bolder" for="zhistory">{$t('domains.history')}:</label>
<div class="d-flex justify-content-between">
<label class="fw-bolder" for="zhistory">{$t('domains.history')}:</label>
<div class="d-flex gap-1">
<Button
outline
color="secondary"
size="sm"
title={$t('domains.actions.reimport')}
disabled={retrievalInProgress}
on:click={retrieveZone}
>
{#if retrievalInProgress}
<Spinner size="sm" />
{:else}
<Icon name="cloud-download" />
{/if}
</Button>
</div>
</div>
{#key domain.zone_history}
<select
class="form-select"