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

Can select each change to apply on zone

Browse Source
This commit is contained in:
nemunaire 2021-05-24 16:17:34 +02:00
parent 11d9719351
commit 5e9d6e3478
3 changed files with 98 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/src/api/zones.js
View File

@ -36,8 +36,8 @@ export default {
return Api().get('/api/domains/' + encodeURIComponent(domain) + '/zone/' + encodeURIComponent(id))
},
applyZone (domain, id) {
return Api().post('/api/domains/' + encodeURIComponent(domain) + '/zone/' + encodeURIComponent(id) + '/apply_changes')
applyZone (domain, id, selectedDiffs) {
return Api().post('/api/domains/' + encodeURIComponent(domain) + '/zone/' + encodeURIComponent(id) + '/apply_changes', selectedDiffs)
},
diffZone (domain, id1, id2) {

4
ui/src/locales/en.json
View File

@ -78,7 +78,9 @@
"title": "Zone applied successfully!",
"description": "Your zone {zone} have been successfully propagated!"
},
"nochange": "There is no changes to apply! Current zone is in sync with the server."
"modifications": "no modification | {count} modification | {count} modifications",
"nochange": "There is no changes to apply! Current zone is in sync with the server.",
"others": "no other change | {count} other change | {count} others changes"
},
"attached-new": "New domain attached to happyDNS!",
"create-new-key": "Create new {id} key",

106
ui/src/views/domain.vue
View File

@ -134,24 +134,54 @@
</template>
<template #modal-footer="{ ok, cancel }">
<div v-if="zoneDiff">
<span v-if="zoneDiff" class="text-success">
{{ $tc('domains.apply.additions', (zoneDiff || []).length) }}
<span v-if="zoneDiffCreated.length" class="text-success">
{{ $tc('domains.apply.additions', (selectedDiffCreated || []).length) }}
</span>
<span v-if="zoneDiffCreated.length && zoneDiffDeleted.length">
&ndash;
</span>
<span v-if="zoneDiffDeleted.length" class="text-danger">
{{ $tc('domains.apply.deletions', (selectedDiffDeleted || []).length) }}
</span>
<span v-if="(zoneDiffCreated.length || zoneDiffDeleted.length) && zoneDiffModified.length">
&ndash;
</span>
<span v-if="zoneDiffModified.length" class="text-warning">
{{ $tc('domains.apply.modifications', (selectedDiffModified || []).length) }}
</span>
<span v-if="(zoneDiffCreated.length || zoneDiffDeleted.length || zoneDiffModified.length) && (zoneDiff.length - zoneDiffCreated.length - zoneDiffDeleted.length - zoneDiffModified.length !== 0)">
&ndash;
</span>
<span v-if="zoneDiff.length - zoneDiffCreated.length - zoneDiffDeleted.length - zoneDiffModified.length !== 0" class="text-info">
{{ $tc('domains.apply.others', selectedDiff.length - selectedDiffCreated.length - selectedDiffDeleted.length - selectedDiffModified.length) }}
</span>
</div>
<b-button variant="secondary" @click="cancel()">
{{ $t('common.cancel') }}
</b-button>
<b-button variant="success" :disabled="propagationInProgress || zoneDiff === null" @click="ok()">
<b-spinner v-if="propagationInProgress" label="Spinning" />
{{ $t('domains.apply.button') }}
</b-button>
<div class="d-flex">
<b-button class="mr-1" variant="secondary" @click="cancel()">
{{ $t('common.cancel') }}
</b-button>
<b-button variant="success" :disabled="propagationInProgress || zoneDiff === null || selectedDiff.length === 0" @click="ok()">
<b-spinner v-if="propagationInProgress" label="Spinning" />
{{ $t('domains.apply.button') }}
</b-button>
</div>
</template>
<div v-if="zoneDiff === null" class="my-2 text-center">
<b-spinner label="Spinning" />
<p>{{ $t('wait.exporting') }}</p>
</div>
<div v-for="(line, n) in zoneDiffAnalyzed" :key="'diff' + n" :class="'text-monospace ' + line.className" style="padding-left: 1em; text-indent: -1em;">
{{ line.msg }}
<div v-for="(line, n) in zoneDiffAnalyzed" :key="'diff' + n">
<b-form-checkbox
v-model="selectedDiff"
:value="line.msg"
>
<div
:class="'col text-monospace ' + line.className"
style="padding-left: 1em; text-indent: -1em;"
>
{{ line.msg }}
</div>
</b-form-checkbox>
</div>
</b-modal>
</b-container>
@ -172,6 +202,7 @@ export default {
displayFormat: 'grid',
importInProgress: false,
propagationInProgress: false,
selectedDiff: [],
selectedHistory: null,
zoneContent: null,
zoneDiff: null
@ -183,6 +214,30 @@ export default {
return this.domains_getDetailed[this.$route.params.domain]
},
selectedDiffCreated () {
if (!this.selectedDiff) {
return null
}
return this.selectedDiff.filter((msg) => (/^CREATE/.test(msg)))
},
selectedDiffDeleted () {
if (!this.selectedDiff) {
return null
}
return this.selectedDiff.filter((msg) => (/^DELETE/.test(msg)))
},
selectedDiffModified () {
if (!this.selectedDiff) {
return null
}
return this.selectedDiff.filter((msg) => (/^MODIFY/.test(msg)))
},
zoneDiffAnalyzed () {
if (!this.zoneDiff) {
return null
@ -190,7 +245,7 @@ export default {
return this.zoneDiff.map(
(msg) => {
var className = ''
let className = ''
if (/^MODIFY/.test(msg)) {
className = 'text-warning'
} else if (/^CREATE/.test(msg)) {
@ -209,6 +264,30 @@ export default {
)
},
zoneDiffCreated () {
if (!this.zoneDiff) {
return null
}
return this.zoneDiff.filter((msg) => (/^CREATE/.test(msg)))
},
zoneDiffDeleted () {
if (!this.zoneDiff) {
return null
}
return this.zoneDiff.filter((msg) => (/^DELETE/.test(msg)))
},
zoneDiffModified () {
if (!this.zoneDiff) {
return null
}
return this.zoneDiff.filter((msg) => (/^MODIFY/.test(msg)))
},
...mapGetters('domains', ['domains_getDetailed', 'sortedDomains']),
...mapGetters('providers', ['providers_getAll'])
},
@ -327,6 +406,7 @@ export default {
this.$bvModal.msgBoxOk(this.$t('domains.apply.nochange'))
} else {
this.zoneDiff = response.data
this.selectedDiff = response.data
}
},
(error) => {
@ -344,7 +424,7 @@ export default {
applyDiff () {
this.propagationInProgress = true
ZonesApi.applyZone(this.domain.domain, this.selectedHistory)
ZonesApi.applyZone(this.domain.domain, this.selectedHistory, this.selectedDiff)
.then(
(response) => {
this.$bvModal.hide('modal-applyZone')