7x31/nginxconfig.io
1
0
Fork 0
mirror of https://github.com/digitalocean/nginxconfig.io.git synced 2025-09-20 10:49:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor diffing & track conf file renames in diff

Browse Source
This commit is contained in:
MattIPv4
2020-06-08 17:31:01 +01:00
parent c68ff23e3e
commit 8b10ed3e05
6 changed files with 187 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,11 +97,10 @@ THE SOFTWARE.
<script>
import clone from 'clone';
import { diffLines } from 'diff';
import escape from 'escape-html';
import sha2_256 from 'simple-js-sha2-256';
import Header from 'do-vue/src/templates/header';
import Footer from 'do-vue/src/templates/footer';
import diff from '../util/diff';
import isChanged from '../util/is_changed';
import importData from '../util/import_data';
import isObject from '../util/is_object';
@@ -218,61 +217,8 @@ THE SOFTWARE.
this.$nextTick(() => this.checkChange(this.confFiles));
},
updateDiff(newConf, oldConf) {
const newFiles = {};
// Work through each file in the new config
for (const newFileName in newConf) {
if (!Object.prototype.hasOwnProperty.call(newConf, newFileName)) continue;
const newFileConf = newConf[newFileName];
// If a file with the same name existed before, diff!
// TODO: Handle diffing across file renames (eg. when a user changes a domain name)
const old = oldConf && oldConf[newFileName];
if (old && old !== newFileConf) {
console.info(`Diffing ${newFileName}...`);
// Get the diff
const diff = diffLines(old, newFileConf);
// Wrap additions in <mark>, drop removals
const output = diff.map((change, index, array) => {
if (change.removed) return '';
const escaped = escape(change.value);
// Don't mark as diff if nothing changed
if (!change.added) return escaped;
// Don't mark as diff if only whitespace changed
if (index > 0 && array[index - 1].removed) {
if (array[index - 1].value.replace(/\s/g, '') === change.value.replace(/\s/g, '')) {
return escaped;
}
}
if (index < array.length - 1 && array[index + 1].removed) {
if (array[index + 1].value.replace(/\s/g, '') === change.value.replace(/\s/g, '')) {
return escaped;
}
}
// Mark the diff, without highlighting whitespace
return escaped
.split('\n')
.map(part => part.replace(/^(\s*)(.*)(\s*)$/, '$1<mark>$2</mark>$3'))
.join('\n');
}).join('');
// Store
newFiles[newFileName] = output;
continue;
}
// No diffing, just store the new file
newFiles[newFileName] = newFileConf;
}
// Store
this.$data.confFilesOutput = newFiles;
// Calculate the diff & highlight after render
this.$data.confFilesOutput = diff(newConf, oldConf);
this.$nextTick(() => this.$data.confWatcherWaiting = false);
},
sha2_256,