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

Update and fix diffing logic (#289) 

* Bump files-diff version to ensure HTML escaping works

* Pass full rendered file path into diff

* Cleaner naming, removing pointless method

* Remove console log
pull/290/head
Matt (IPv4) Cowley 2021-07-27 10:49:51 +01:00 committed by GitHub
parent 07cc83ec14
commit ce74e4c226
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package-lock.json generated
View File

@ -10663,9 +10663,9 @@
"optional": true "optional": true
}, },
"files-diff": { "files-diff": {
"version": "0.0.5", "version": "0.0.6",
"resolved": "https://registry.npmjs.org/files-diff/-/files-diff-0.0.5.tgz", "resolved": "https://registry.npmjs.org/files-diff/-/files-diff-0.0.6.tgz",
"integrity": "sha512-0Z/K2aVj19Dxpvl5F5SkINmmnSamMPwSuWh3U7s35ojQ2DzzTvkHjbeuiUgLX8JgyNsV2nk/XAVDangV+Nls3g==", "integrity": "sha512-qf03b6nVKD1xqymd00+fFje5ANk71fxGttKu4vq8VcZThCVpipdrXs6oXf4R6e6T4+zPF/3+CmKM3FPCbgFkSg==",
"requires": { "requires": {
"diff": "^5.0.0", "diff": "^5.0.0",
"escape-html": "^1.0.3", "escape-html": "^1.0.3",
@ -17159,7 +17159,7 @@
"known-css-properties": "^0.3.0", "known-css-properties": "^0.3.0",
"lodash.capitalize": "^4.1.0", "lodash.capitalize": "^4.1.0",
"lodash.kebabcase": "^4.0.0", "lodash.kebabcase": "^4.0.0",
"merge": "^1.2.0", "merge": "^2.1.1",
"path-is-absolute": "^1.0.0", "path-is-absolute": "^1.0.0",
"util": "^0.10.3" "util": "^0.10.3"
}, },

2
package.json
View File

@ -47,7 +47,7 @@
"do-bulma": "git+https://github.com/do-community/do-bulma.git", "do-bulma": "git+https://github.com/do-community/do-bulma.git",
"do-vue": "git+https://github.com/do-community/do-vue.git", "do-vue": "git+https://github.com/do-community/do-vue.git",
"escape-html": "^1.0.3", "escape-html": "^1.0.3",
"files-diff": "0.0.5", "files-diff": "0.0.6",
"json-to-pretty-yaml": "^1.2.2", "json-to-pretty-yaml": "^1.2.2",
"memory-tar-create": "0.0.3", "memory-tar-create": "0.0.3",
"pretty-checkbox-vue": "^1.1.9", "pretty-checkbox-vue": "^1.1.9",

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

@ -193,6 +193,12 @@ 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);
}, },
confFilesWithDirectory() {
return Object.entries(this.confFiles).reduce((obj, [ file, content ]) => ({
...obj,
[`${this.$data.global.nginx.nginxConfigDirectory.computed}/${file}`]: content,
}), {});
},
lang: { lang: {
get() { get() {
return this.$data.global.app.lang.value; return this.$data.global.app.lang.value;
@ -212,7 +218,7 @@ THE SOFTWARE.
}, },
}, },
watch: { watch: {
confFiles(newConf, oldConf) { confFilesWithDirectory(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,21 +324,21 @@ 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.confFilesWithDirectory) {
// 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.confFilesWithDirectory;
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.confFilesWithDirectory, 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.confFilesWithDirectory));
}, },
updateDiff(newConf, oldConf) { updateDiff(newConf, oldConf) {
try { try {
@ -342,13 +348,12 @@ THE SOFTWARE.
}); });
this.$data.confFilesOutput = Object.entries(diffConf).map(([ file, { name, content } ]) => { this.$data.confFilesOutput = Object.entries(diffConf).map(([ file, { name, content } ]) => {
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 +361,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,
]; ];
}); });