Skip to content
Snippets Groups Projects
Unverified Commit 512f9624 authored by Phil Hughes's avatar Phil Hughes
Browse files

Fix diff files not rendering

Fixes some diff files not rendering when the renderIt
property is updated.
Previously it was using a local copy of renderIt which meant
Vue wouldn't update it when the files renderIt property was updates
parent 8f2221a8
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -35,7 +35,6 @@ export default {
isLoadingCollapsedDiff: false,
forkMessageVisible: false,
isCollapsed: this.file.viewer.collapsed || false,
renderIt: this.file.renderIt,
};
},
computed: {
Loading
Loading
@@ -53,7 +52,7 @@ export default {
);
},
showLoadingIcon() {
return this.isLoadingCollapsedDiff || (!this.renderIt && !this.isCollapsed);
return this.isLoadingCollapsedDiff || (!this.file.renderIt && !this.isCollapsed);
},
hasDiffLines() {
return (
Loading
Loading
@@ -80,13 +79,13 @@ export default {
eventHub.$on(`loadCollapsedDiff/${this.file.file_hash}`, this.handleLoadCollapsedDiff);
},
methods: {
...mapActions('diffs', ['loadCollapsedDiff', 'assignDiscussionsToDiff']),
...mapActions('diffs', ['loadCollapsedDiff', 'assignDiscussionsToDiff', 'setRenderIt']),
handleToggle() {
if (!this.hasDiffLines) {
this.handleLoadCollapsedDiff();
} else {
this.isCollapsed = !this.isCollapsed;
this.renderIt = true;
this.setRenderIt(this.file);
}
},
handleLoadCollapsedDiff() {
Loading
Loading
@@ -96,7 +95,7 @@ export default {
.then(() => {
this.isLoadingCollapsedDiff = false;
this.isCollapsed = false;
this.renderIt = true;
this.setRenderIt(this.file);
})
.then(() => {
requestIdleCallback(
Loading
Loading
Loading
Loading
@@ -130,6 +130,8 @@ export const startRenderDiffsQueue = ({ state, commit }) => {
return checkItem();
};
 
export const setRenderIt = ({ commit }, file) => commit(types.RENDER_FILE, file);
export const setInlineDiffViewType = ({ commit }) => {
commit(types.SET_DIFF_VIEW_TYPE, INLINE_DIFF_VIEW_TYPE);
 
Loading
Loading
Loading
Loading
@@ -28,8 +28,7 @@ describe('DiffFile', () => {
expect(el.querySelector('.file-title-name').innerText.indexOf(file_path)).toBeGreaterThan(-1);
expect(el.querySelector('.js-syntax-highlight')).toBeDefined();
 
expect(vm.renderIt).toEqual(false);
vm.renderIt = true;
vm.file.renderIt = true;
 
vm.$nextTick(() => {
expect(el.querySelectorAll('.line_content').length).toBeGreaterThan(5);
Loading
Loading
@@ -41,7 +40,7 @@ describe('DiffFile', () => {
expect(vm.$el.querySelectorAll('.diff-content').length).toEqual(1);
expect(vm.isCollapsed).toEqual(false);
vm.isCollapsed = true;
vm.renderIt = true;
vm.file.renderIt = true;
 
vm.$nextTick(() => {
expect(vm.$el.querySelectorAll('.diff-content').length).toEqual(0);
Loading
Loading
Loading
Loading
@@ -29,6 +29,7 @@ import actions, {
renderFileForDiscussionId,
setRenderTreeList,
setShowWhitespace,
setRenderIt,
} from '~/diffs/store/actions';
import eventHub from '~/notes/event_hub';
import * as types from '~/diffs/store/mutation_types';
Loading
Loading
@@ -855,4 +856,10 @@ describe('DiffsStoreActions', () => {
expect(window.history.pushState).toHaveBeenCalled();
});
});
describe('setRenderIt', () => {
it('commits RENDER_FILE', done => {
testAction(setRenderIt, 'file', {}, [{ type: types.RENDER_FILE, payload: 'file' }], [], done);
});
});
});
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment