Transforms diffs module to a namespaced one to avoid console error due to rewire export.
Detailed: Because of rewire we need to export a default empty object in our actions to prevent it to export the wrong default in karma. Vuex getters are global, and because the Vuex store uses several non namespaced moduled, there was already a getter named default, due to the same empty export. In order to solve it I chose to namespace the module. Could also be fixed by importing the getters explicitly instead of all of them.
This commit is contained in:
parent
7a17f8d85d
commit
156a9d3913
11 changed files with 15 additions and 12 deletions
|
@ -63,7 +63,8 @@ export default {
|
||||||
plainDiffPath: state => state.diffs.plainDiffPath,
|
plainDiffPath: state => state.diffs.plainDiffPath,
|
||||||
emailPatchPath: state => state.diffs.emailPatchPath,
|
emailPatchPath: state => state.diffs.emailPatchPath,
|
||||||
}),
|
}),
|
||||||
...mapGetters(['isParallelView', 'isNotesFetched']),
|
...mapGetters('diffs', ['isParallelView']),
|
||||||
|
...mapGetters(['isNotesFetched']),
|
||||||
targetBranch() {
|
targetBranch() {
|
||||||
return {
|
return {
|
||||||
branchName: this.targetBranchName,
|
branchName: this.targetBranchName,
|
||||||
|
@ -115,7 +116,7 @@ export default {
|
||||||
this.adjustView();
|
this.adjustView();
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
...mapActions(['setBaseConfig', 'fetchDiffFiles']),
|
...mapActions('diffs', ['setBaseConfig', 'fetchDiffFiles']),
|
||||||
fetchData() {
|
fetchData() {
|
||||||
this.fetchDiffFiles().catch(() => {
|
this.fetchDiffFiles().catch(() => {
|
||||||
createFlash(__('Something went wrong on our end. Please try again!'));
|
createFlash(__('Something went wrong on our end. Please try again!'));
|
||||||
|
|
|
@ -31,7 +31,7 @@ export default {
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
...mapGetters(['isInlineView', 'isParallelView', 'areAllFilesCollapsed']),
|
...mapGetters('diffs', ['isInlineView', 'isParallelView', 'areAllFilesCollapsed']),
|
||||||
sumAddedLines() {
|
sumAddedLines() {
|
||||||
return this.sumValues('addedLines');
|
return this.sumValues('addedLines');
|
||||||
},
|
},
|
||||||
|
@ -66,7 +66,7 @@ export default {
|
||||||
document.removeEventListener('scroll', this.handleScroll);
|
document.removeEventListener('scroll', this.handleScroll);
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
...mapActions(['setInlineDiffViewType', 'setParallelDiffViewType', 'expandAllFiles']),
|
...mapActions('diffs', ['setInlineDiffViewType', 'setParallelDiffViewType', 'expandAllFiles']),
|
||||||
pluralize,
|
pluralize,
|
||||||
handleScroll() {
|
handleScroll() {
|
||||||
if (!this.updating) {
|
if (!this.updating) {
|
||||||
|
|
|
@ -22,7 +22,7 @@ export default {
|
||||||
projectPath: state => state.diffs.projectPath,
|
projectPath: state => state.diffs.projectPath,
|
||||||
endpoint: state => state.diffs.endpoint,
|
endpoint: state => state.diffs.endpoint,
|
||||||
}),
|
}),
|
||||||
...mapGetters(['isInlineView', 'isParallelView']),
|
...mapGetters('diffs', ['isInlineView', 'isParallelView']),
|
||||||
diffMode() {
|
diffMode() {
|
||||||
const diffModeKey = Object.keys(diffModes).find(key => this.diffFile[`${key}File`]);
|
const diffModeKey = Object.keys(diffModes).find(key => this.diffFile[`${key}File`]);
|
||||||
return diffModes[diffModeKey] || diffModes.replaced;
|
return diffModes[diffModeKey] || diffModes.replaced;
|
||||||
|
|
|
@ -55,7 +55,7 @@ export default {
|
||||||
document.removeEventListener('scroll', this.handleScroll);
|
document.removeEventListener('scroll', this.handleScroll);
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
...mapActions(['loadCollapsedDiff']),
|
...mapActions('diffs', ['loadCollapsedDiff']),
|
||||||
handleToggle() {
|
handleToggle() {
|
||||||
const { collapsed, highlightedDiffLines, parallelDiffLines } = this.file;
|
const { collapsed, highlightedDiffLines, parallelDiffLines } = this.file;
|
||||||
|
|
||||||
|
|
|
@ -108,7 +108,7 @@ export default {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
...mapActions(['loadMoreLines', 'showCommentForm']),
|
...mapActions('diffs', ['loadMoreLines', 'showCommentForm']),
|
||||||
handleCommentButton() {
|
handleCommentButton() {
|
||||||
this.showCommentForm({ lineCode: this.lineCode });
|
this.showCommentForm({ lineCode: this.lineCode });
|
||||||
},
|
},
|
||||||
|
|
|
@ -59,7 +59,8 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
...mapActions(['cancelCommentForm', 'saveNote', 'fetchDiscussions']),
|
...mapActions('diffs', ['cancelCommentForm']),
|
||||||
|
...mapActions(['saveNote', 'fetchDiscussions']),
|
||||||
handleCancelCommentForm() {
|
handleCancelCommentForm() {
|
||||||
this.autosave.reset();
|
this.autosave.reset();
|
||||||
this.cancelCommentForm({
|
this.cancelCommentForm({
|
||||||
|
|
|
@ -36,7 +36,7 @@ export default {
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
...mapGetters(['isInlineView']),
|
...mapGetters('diffs', ['isInlineView']),
|
||||||
isContextLine() {
|
isContextLine() {
|
||||||
return this.line.type === CONTEXT_LINE_TYPE;
|
return this.line.type === CONTEXT_LINE_TYPE;
|
||||||
},
|
},
|
||||||
|
|
|
@ -20,7 +20,7 @@ export default {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
...mapGetters(['commitId']),
|
...mapGetters('diffs', ['commitId']),
|
||||||
normalizedDiffLines() {
|
normalizedDiffLines() {
|
||||||
return this.diffLines.map(line => (line.richText ? trimFirstCharOfLineContent(line) : line));
|
return this.diffLines.map(line => (line.richText ? trimFirstCharOfLineContent(line) : line));
|
||||||
},
|
},
|
||||||
|
|
|
@ -40,7 +40,7 @@ export default {
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
...mapGetters(['isParallelView']),
|
...mapGetters('diffs', ['isParallelView']),
|
||||||
isContextLine() {
|
isContextLine() {
|
||||||
return this.line.left.type === CONTEXT_LINE_TYPE;
|
return this.line.left.type === CONTEXT_LINE_TYPE;
|
||||||
},
|
},
|
||||||
|
|
|
@ -21,7 +21,7 @@ export default {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
...mapGetters(['commitId']),
|
...mapGetters('diffs', ['commitId']),
|
||||||
parallelDiffLines() {
|
parallelDiffLines() {
|
||||||
return this.diffLines.map(line => {
|
return this.diffLines.map(line => {
|
||||||
const parallelLine = Object.assign({}, line);
|
const parallelLine = Object.assign({}, line);
|
||||||
|
|
|
@ -4,6 +4,7 @@ import mutations from '../mutations';
|
||||||
import createState from './diff_state';
|
import createState from './diff_state';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
namespaced: true,
|
||||||
state: createState(),
|
state: createState(),
|
||||||
getters,
|
getters,
|
||||||
actions,
|
actions,
|
||||||
|
|
Loading…
Reference in a new issue