Use returned discussion from API
We now use the returned discussion instead of re-fetching all of the discussions and filtering out the ones we don't need. This speeds up the process of creating a diff discussions by saving us another API request before we can render the discussion
This commit is contained in:
parent
2036458e15
commit
2497c29ef0
|
@ -1,12 +1,9 @@
|
||||||
<script>
|
<script>
|
||||||
import { mapState, mapGetters, mapActions } from 'vuex';
|
import { mapState, mapGetters, mapActions } from 'vuex';
|
||||||
import createFlash from '~/flash';
|
|
||||||
import { s__ } from '~/locale';
|
import { s__ } from '~/locale';
|
||||||
import noteForm from '../../notes/components/note_form.vue';
|
import noteForm from '../../notes/components/note_form.vue';
|
||||||
import { getNoteFormData } from '../store/utils';
|
|
||||||
import autosave from '../../notes/mixins/autosave';
|
import autosave from '../../notes/mixins/autosave';
|
||||||
import { DIFF_NOTE_TYPE } from '../constants';
|
import { DIFF_NOTE_TYPE } from '../constants';
|
||||||
import { reduceDiscussionsToLineCodes } from '../../notes/stores/utils';
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
|
@ -39,6 +36,16 @@ export default {
|
||||||
}),
|
}),
|
||||||
...mapGetters('diffs', ['getDiffFileByHash']),
|
...mapGetters('diffs', ['getDiffFileByHash']),
|
||||||
...mapGetters(['isLoggedIn', 'noteableType', 'getNoteableData', 'getNotesDataByProp']),
|
...mapGetters(['isLoggedIn', 'noteableType', 'getNoteableData', 'getNotesDataByProp']),
|
||||||
|
formData() {
|
||||||
|
return {
|
||||||
|
noteableData: this.noteableData,
|
||||||
|
noteableType: this.noteableType,
|
||||||
|
noteTargetLine: this.noteTargetLine,
|
||||||
|
diffViewType: this.diffViewType,
|
||||||
|
diffFile: this.getDiffFileByHash(this.diffFileHash),
|
||||||
|
linePosition: this.linePosition,
|
||||||
|
};
|
||||||
|
},
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
if (this.isLoggedIn) {
|
if (this.isLoggedIn) {
|
||||||
|
@ -53,8 +60,7 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
...mapActions('diffs', ['cancelCommentForm', 'assignDiscussionsToDiff']),
|
...mapActions('diffs', ['cancelCommentForm', 'assignDiscussionsToDiff', 'saveDiffDiscussion']),
|
||||||
...mapActions(['saveNote', 'refetchDiscussionById']),
|
|
||||||
handleCancelCommentForm(shouldConfirm, isDirty) {
|
handleCancelCommentForm(shouldConfirm, isDirty) {
|
||||||
if (shouldConfirm && isDirty) {
|
if (shouldConfirm && isDirty) {
|
||||||
const msg = s__('Notes|Are you sure you want to cancel creating this comment?');
|
const msg = s__('Notes|Are you sure you want to cancel creating this comment?');
|
||||||
|
@ -73,35 +79,9 @@ export default {
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
handleSaveNote(note) {
|
handleSaveNote(note) {
|
||||||
const selectedDiffFile = this.getDiffFileByHash(this.diffFileHash);
|
return this.saveDiffDiscussion({ note, formData: this.formData }).then(() =>
|
||||||
const postData = getNoteFormData({
|
this.handleCancelCommentForm(),
|
||||||
note,
|
);
|
||||||
noteableData: this.noteableData,
|
|
||||||
noteableType: this.noteableType,
|
|
||||||
noteTargetLine: this.noteTargetLine,
|
|
||||||
diffViewType: this.diffViewType,
|
|
||||||
diffFile: selectedDiffFile,
|
|
||||||
linePosition: this.linePosition,
|
|
||||||
});
|
|
||||||
|
|
||||||
this.saveNote(postData)
|
|
||||||
.then(result => {
|
|
||||||
const endpoint = this.getNotesDataByProp('discussionsPath');
|
|
||||||
|
|
||||||
this.refetchDiscussionById({ path: endpoint, discussionId: result.discussion_id })
|
|
||||||
.then(selectedDiscussion => {
|
|
||||||
const lineCodeDiscussions = reduceDiscussionsToLineCodes([selectedDiscussion]);
|
|
||||||
this.assignDiscussionsToDiff(lineCodeDiscussions);
|
|
||||||
|
|
||||||
this.handleCancelCommentForm();
|
|
||||||
})
|
|
||||||
.catch(() => {
|
|
||||||
createFlash(s__('MergeRequests|Updating discussions failed'));
|
|
||||||
});
|
|
||||||
})
|
|
||||||
.catch(() => {
|
|
||||||
createFlash(s__('MergeRequests|Saving the comment failed'));
|
|
||||||
});
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,9 +1,12 @@
|
||||||
import Vue from 'vue';
|
import Vue from 'vue';
|
||||||
import axios from '~/lib/utils/axios_utils';
|
import axios from '~/lib/utils/axios_utils';
|
||||||
import Cookies from 'js-cookie';
|
import Cookies from 'js-cookie';
|
||||||
|
import createFlash from '~/flash';
|
||||||
|
import { s__ } from '~/locale';
|
||||||
import { handleLocationHash, historyPushState } from '~/lib/utils/common_utils';
|
import { handleLocationHash, historyPushState } from '~/lib/utils/common_utils';
|
||||||
import { mergeUrlParams, getLocationHash } from '~/lib/utils/url_utility';
|
import { mergeUrlParams, getLocationHash } from '~/lib/utils/url_utility';
|
||||||
import { getDiffPositionByLineCode } from './utils';
|
import { reduceDiscussionsToLineCodes } from '../../notes/stores/utils';
|
||||||
|
import { getDiffPositionByLineCode, getNoteFormData } from './utils';
|
||||||
import * as types from './mutation_types';
|
import * as types from './mutation_types';
|
||||||
import {
|
import {
|
||||||
PARALLEL_DIFF_VIEW_TYPE,
|
PARALLEL_DIFF_VIEW_TYPE,
|
||||||
|
@ -178,5 +181,19 @@ export const toggleFileDiscussions = ({ getters, dispatch }, diff) => {
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const saveDiffDiscussion = ({ dispatch }, { note, formData }) => {
|
||||||
|
const postData = getNoteFormData({
|
||||||
|
note,
|
||||||
|
...formData,
|
||||||
|
});
|
||||||
|
|
||||||
|
return dispatch('saveNote', postData, { root: true })
|
||||||
|
.then(result => dispatch('updateDiscussion', result.discussion, { root: true }))
|
||||||
|
.then(discussion =>
|
||||||
|
dispatch('assignDiscussionsToDiff', reduceDiscussionsToLineCodes([discussion])),
|
||||||
|
)
|
||||||
|
.catch(() => createFlash(s__('MergeRequests|Saving the comment failed')));
|
||||||
|
};
|
||||||
|
|
||||||
// prevent babel-plugin-rewire from generating an invalid default during karma tests
|
// prevent babel-plugin-rewire from generating an invalid default during karma tests
|
||||||
export default () => {};
|
export default () => {};
|
||||||
|
|
|
@ -44,23 +44,11 @@ export const fetchDiscussions = ({ commit }, path) =>
|
||||||
commit(types.SET_INITIAL_DISCUSSIONS, discussions);
|
commit(types.SET_INITIAL_DISCUSSIONS, discussions);
|
||||||
});
|
});
|
||||||
|
|
||||||
export const refetchDiscussionById = ({ commit, state }, { path, discussionId }) =>
|
export const updateDiscussion = ({ commit }, discussion) => {
|
||||||
new Promise(resolve => {
|
commit(types.UPDATE_DISCUSSION, discussion);
|
||||||
service
|
|
||||||
.fetchDiscussions(path)
|
|
||||||
.then(res => res.json())
|
|
||||||
.then(discussions => {
|
|
||||||
const selectedDiscussion = discussions.find(discussion => discussion.id === discussionId);
|
|
||||||
if (selectedDiscussion) {
|
|
||||||
commit(types.UPDATE_DISCUSSION, selectedDiscussion);
|
|
||||||
// We need to refetch as it is now the transformed one in state
|
|
||||||
const discussion = utils.findNoteObjectById(state.discussions, discussionId);
|
|
||||||
|
|
||||||
resolve(discussion);
|
return discussion;
|
||||||
}
|
};
|
||||||
})
|
|
||||||
.catch(() => {});
|
|
||||||
});
|
|
||||||
|
|
||||||
export const deleteNote = ({ commit, dispatch }, note) =>
|
export const deleteNote = ({ commit, dispatch }, note) =>
|
||||||
service.deleteNote(note.path).then(() => {
|
service.deleteNote(note.path).then(() => {
|
||||||
|
|
|
@ -4,7 +4,8 @@ import * as constants from '../constants';
|
||||||
import { isInMRPage } from '../../lib/utils/common_utils';
|
import { isInMRPage } from '../../lib/utils/common_utils';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
[types.ADD_NEW_NOTE](state, note) {
|
[types.ADD_NEW_NOTE](state, data) {
|
||||||
|
const note = data.discussion ? data.discussion.notes[0] : data;
|
||||||
const { discussion_id, type } = note;
|
const { discussion_id, type } = note;
|
||||||
const [exists] = state.discussions.filter(n => n.id === note.discussion_id);
|
const [exists] = state.discussions.filter(n => n.id === note.discussion_id);
|
||||||
const isDiscussion = type === constants.DISCUSSION_NOTE || type === constants.DIFF_NOTE;
|
const isDiscussion = type === constants.DISCUSSION_NOTE || type === constants.DIFF_NOTE;
|
||||||
|
|
|
@ -69,22 +69,21 @@ describe('DiffLineNoteForm', () => {
|
||||||
|
|
||||||
describe('saveNoteForm', () => {
|
describe('saveNoteForm', () => {
|
||||||
it('should call saveNote action with proper params', done => {
|
it('should call saveNote action with proper params', done => {
|
||||||
let isPromiseCalled = false;
|
const saveDiffDiscussionSpy = spyOn(component, 'saveDiffDiscussion').and.returnValue(
|
||||||
const formDataSpy = spyOnDependency(DiffLineNoteForm, 'getNoteFormData').and.returnValue({
|
Promise.resolve(),
|
||||||
postData: 1,
|
|
||||||
});
|
|
||||||
const saveNoteSpy = spyOn(component, 'saveNote').and.returnValue(
|
|
||||||
new Promise(() => {
|
|
||||||
isPromiseCalled = true;
|
|
||||||
done();
|
|
||||||
}),
|
|
||||||
);
|
);
|
||||||
|
spyOnProperty(component, 'formData').and.returnValue('formData');
|
||||||
|
|
||||||
component.handleSaveNote('note body');
|
component
|
||||||
|
.handleSaveNote('note body')
|
||||||
expect(formDataSpy).toHaveBeenCalled();
|
.then(() => {
|
||||||
expect(saveNoteSpy).toHaveBeenCalled();
|
expect(saveDiffDiscussionSpy).toHaveBeenCalledWith({
|
||||||
expect(isPromiseCalled).toEqual(true);
|
note: 'note body',
|
||||||
|
formData: 'formData',
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.then(done)
|
||||||
|
.catch(done.fail);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -21,6 +21,7 @@ import actions, {
|
||||||
loadCollapsedDiff,
|
loadCollapsedDiff,
|
||||||
expandAllFiles,
|
expandAllFiles,
|
||||||
toggleFileDiscussions,
|
toggleFileDiscussions,
|
||||||
|
saveDiffDiscussion,
|
||||||
} from '~/diffs/store/actions';
|
} from '~/diffs/store/actions';
|
||||||
import * as types from '~/diffs/store/mutation_types';
|
import * as types from '~/diffs/store/mutation_types';
|
||||||
import { reduceDiscussionsToLineCodes } from '~/notes/stores/utils';
|
import { reduceDiscussionsToLineCodes } from '~/notes/stores/utils';
|
||||||
|
@ -245,7 +246,7 @@ describe('DiffsStoreActions', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('startRenderDiffsQueue', () => {
|
describe('startRenderDiffsQueue', () => {
|
||||||
it('should set all files to RENDER_FILE', done => {
|
it('should set all files to RENDER_FILE', () => {
|
||||||
const state = {
|
const state = {
|
||||||
diffFiles: [
|
diffFiles: [
|
||||||
{
|
{
|
||||||
|
@ -268,16 +269,10 @@ describe('DiffsStoreActions', () => {
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
startRenderDiffsQueue({ state, commit: pseudoCommit })
|
startRenderDiffsQueue({ state, commit: pseudoCommit });
|
||||||
.then(() => {
|
|
||||||
expect(state.diffFiles[0].renderIt).toBeTruthy();
|
|
||||||
expect(state.diffFiles[1].renderIt).toBeTruthy();
|
|
||||||
|
|
||||||
done();
|
expect(state.diffFiles[0].renderIt).toBeTruthy();
|
||||||
})
|
expect(state.diffFiles[1].renderIt).toBeTruthy();
|
||||||
.catch(() => {
|
|
||||||
done.fail();
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -582,4 +577,35 @@ describe('DiffsStoreActions', () => {
|
||||||
expect(handleLocationHashSpy).toHaveBeenCalledTimes(1);
|
expect(handleLocationHashSpy).toHaveBeenCalledTimes(1);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('saveDiffDiscussion', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
spyOnDependency(actions, 'getNoteFormData').and.returnValue('testData');
|
||||||
|
spyOnDependency(actions, 'reduceDiscussionsToLineCodes').and.returnValue('discussions');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('dispatches actions', done => {
|
||||||
|
const dispatch = jasmine.createSpy('dispatch').and.callFake(name => {
|
||||||
|
switch (name) {
|
||||||
|
case 'saveNote':
|
||||||
|
return Promise.resolve({
|
||||||
|
discussion: 'test',
|
||||||
|
});
|
||||||
|
case 'updateDiscussion':
|
||||||
|
return Promise.resolve('discussion');
|
||||||
|
default:
|
||||||
|
return Promise.resolve({});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
saveDiffDiscussion({ dispatch }, { note: {}, formData: {} })
|
||||||
|
.then(() => {
|
||||||
|
expect(dispatch.calls.argsFor(0)).toEqual(['saveNote', 'testData', { root: true }]);
|
||||||
|
expect(dispatch.calls.argsFor(1)).toEqual(['updateDiscussion', 'test', { root: true }]);
|
||||||
|
expect(dispatch.calls.argsFor(2)).toEqual(['assignDiscussionsToDiff', 'discussions']);
|
||||||
|
})
|
||||||
|
.then(done)
|
||||||
|
.catch(done.fail);
|
||||||
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue