Mirrors/nginxconfig.io
2
0
Fork 0
mirror of https://github.com/digitalocean/nginxconfig.io synced 2024-11-10 12:34:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Gracefully handle diff errors

Browse source
This commit is contained in:
MattIPv4 2020-07-14 16:49:34 +01:00
parent a9cb3e54f6
commit 07673ce319
1 changed files with 29 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/nginxconfig/templates/app.vue
View file

@ -225,21 +225,36 @@ THE SOFTWARE.
this.$nextTick(() => this.checkChange(this.confFiles));
},
updateDiff(newConf, oldConf) {
// Calculate the diff & highlight after render
const diffConf = diff(newConf, oldConf, {
highlightFunction: value => `<mark>${value}</mark>`,
});
this.$data.confFilesOutput = diffConf ? Object.values(diffConf).map(({ name, content }) => {
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('');
try {
// Calculate the diff & highlight after render
const diffConf = diff(newConf, oldConf, {
highlightFunction: value => `<mark>${value}</mark>`,
});
this.$data.confFilesOutput = Object.values(diffConf).map(({ name, content }) => {
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('');
return [
confName,
diffContent,
`${sha2_256(confName)}-${sha2_256(diffContent)}`,
];
}) : [];
return [
confName,
diffContent,
`${sha2_256(confName)}-${sha2_256(diffContent)}`,
];
});
} catch (e) {
// If diff generation goes wrong, don't show any diff
console.error(e);
this.$data.confFilesOutput = Object.entries(newConf).map(([ name, content ]) => {
const confName = `${escape(this.$data.global.nginx.nginxConfigDirectory.computed)}/${name}`;
return [
confName,
content,
`${sha2_256(confName)}-${sha2_256(content)}`,
];
});
}
// Once rendered, begin looking for changes again
this.$nextTick(() => this.$data.confWatcherWaiting = false);
},
splitColumnToggle() {