github
/
nginxconfig.io
mirror of https://github.com/digitalocean/nginxconfig.io
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pass full rendered file path into diff

pull/289/head
MattIPv4 2021-07-27 10:23:38 +01:00
parent 2cb70d908c
commit 90fdd62406
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/nginxconfig/templates/app.vue
View File

@ -193,6 +193,9 @@ THE SOFTWARE.
confFiles() { confFiles() {
return generators(this.$data.domains.filter(d => d !== null), this.$data.global); return generators(this.$data.domains.filter(d => d !== null), this.$data.global);
}, },
fullConfFiles() {
return this.addConfigDirectory(this.confFiles);
},
lang: { lang: {
get() { get() {
return this.$data.global.app.lang.value; return this.$data.global.app.lang.value;
@ -212,7 +215,7 @@ THE SOFTWARE.
}, },
}, },
watch: { watch: {
confFiles(newConf, oldConf) { fullConfFiles(newConf, oldConf) {
if (this.$data.confWatcherWaiting) return; if (this.$data.confWatcherWaiting) return;
// Set that we're waiting for changes to stop // Set that we're waiting for changes to stop
@ -318,22 +321,28 @@ THE SOFTWARE.
}, },
checkChange(oldConf) { checkChange(oldConf) {
// If nothing has changed for a tick, we can use the config files // If nothing has changed for a tick, we can use the config files
if (oldConf === this.confFiles) { if (oldConf === this.fullConfFiles) {
// If this is the initial data load on app start, run the diff logic // If this is the initial data load on app start, run the diff logic
// but with previous as this so that we don't highlight any changes // but with previous as this so that we don't highlight any changes
if (!this.$data.ready) { if (!this.$data.ready) {
this.$data.confFilesPrevious = this.confFiles; this.$data.confFilesPrevious = this.fullConfFiles;
this.$nextTick(() => { this.$data.ready = true; }); this.$nextTick(() => { this.$data.ready = true; });
} }
// Do the diff! // Do the diff!
this.updateDiff(this.confFiles, this.$data.confFilesPrevious); this.updateDiff(this.fullConfFiles, this.$data.confFilesPrevious);
return; return;
} }
// Check next tick to see if anything has changed again // Check next tick to see if anything has changed again
this.$nextTick(() => this.checkChange(this.confFiles)); this.$nextTick(() => this.checkChange(this.confFiles));
}, },
addConfigDirectory(conf) {
return Object.entries(conf).reduce((obj, [ file, content ]) => ({
...obj,
[`${this.$data.global.nginx.nginxConfigDirectory.computed}/${file}`]: content,
}), {});
},
updateDiff(newConf, oldConf) { updateDiff(newConf, oldConf) {
try { try {
// Calculate the diff & highlight after render // Calculate the diff & highlight after render
@ -341,14 +350,14 @@ THE SOFTWARE.
highlightFunction: value => `<mark>${value}</mark>`, highlightFunction: value => `<mark>${value}</mark>`,
}); });
this.$data.confFilesOutput = Object.entries(diffConf).map(([ file, { name, content } ]) => { this.$data.confFilesOutput = Object.entries(diffConf).map(([ file, { name, content } ]) => {
console.log(file, name);
const diffName = name.filter(x => !x.removed).map(x => x.value).join(''); const diffName = name.filter(x => !x.removed).map(x => x.value).join('');
const confName = `${escape(this.$data.global.nginx.nginxConfigDirectory.computed)}/${diffName}`;
const diffContent = content.filter(x => !x.removed).map(x => x.value).join(''); const diffContent = content.filter(x => !x.removed).map(x => x.value).join('');
return [ return [
confName, diffName,
diffContent, diffContent,
`${sha2_256(confName)}-${sha2_256(diffContent)}`, `${sha2_256(diffName)}-${sha2_256(diffContent)}`,
file, file,
]; ];
}); });
@ -356,11 +365,13 @@ THE SOFTWARE.
// If diff generation goes wrong, don't show any diff // If diff generation goes wrong, don't show any diff
console.error(e); console.error(e);
this.$data.confFilesOutput = Object.entries(newConf).map(([ name, content ]) => { this.$data.confFilesOutput = Object.entries(newConf).map(([ name, content ]) => {
const confName = `${escape(this.$data.global.nginx.nginxConfigDirectory.computed)}/${name}`; const safeName = escape(name);
const safeContent = escape(content);
return [ return [
confName, safeName,
content, safeContent,
`${sha2_256(confName)}-${sha2_256(content)}`, `${sha2_256(safeName)}-${sha2_256(safeContent)}`,
name, name,
]; ];
}); });