2018-11-08 19:23:39 +05:30
|
|
|
import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
|
2018-11-20 20:47:30 +05:30
|
|
|
import {
|
|
|
|
findDiffFile,
|
|
|
|
addLineReferences,
|
|
|
|
removeMatchLine,
|
|
|
|
addContextLines,
|
|
|
|
prepareDiffData,
|
|
|
|
isDiscussionApplicableToLine,
|
2019-09-30 21:07:59 +05:30
|
|
|
updateLineInFile,
|
2018-11-20 20:47:30 +05:30
|
|
|
} from './utils';
|
2018-11-08 19:23:39 +05:30
|
|
|
import * as types from './mutation_types';
|
|
|
|
|
2020-04-22 19:07:51 +05:30
|
|
|
function updateDiffFilesInState(state, files) {
|
|
|
|
return Object.assign(state, { diffFiles: files });
|
|
|
|
}
|
|
|
|
|
2018-11-08 19:23:39 +05:30
|
|
|
export default {
|
|
|
|
[types.SET_BASE_CONFIG](state, options) {
|
2020-01-01 13:55:28 +05:30
|
|
|
const {
|
|
|
|
endpoint,
|
|
|
|
endpointMetadata,
|
|
|
|
endpointBatch,
|
2020-04-08 14:13:33 +05:30
|
|
|
endpointCoverage,
|
2020-01-01 13:55:28 +05:30
|
|
|
projectPath,
|
|
|
|
dismissEndpoint,
|
|
|
|
showSuggestPopover,
|
|
|
|
useSingleDiffStyle,
|
|
|
|
} = options;
|
|
|
|
Object.assign(state, {
|
|
|
|
endpoint,
|
|
|
|
endpointMetadata,
|
|
|
|
endpointBatch,
|
2020-04-08 14:13:33 +05:30
|
|
|
endpointCoverage,
|
2020-01-01 13:55:28 +05:30
|
|
|
projectPath,
|
|
|
|
dismissEndpoint,
|
|
|
|
showSuggestPopover,
|
|
|
|
useSingleDiffStyle,
|
|
|
|
});
|
2018-11-08 19:23:39 +05:30
|
|
|
},
|
|
|
|
|
|
|
|
[types.SET_LOADING](state, isLoading) {
|
|
|
|
Object.assign(state, { isLoading });
|
|
|
|
},
|
|
|
|
|
2020-01-01 13:55:28 +05:30
|
|
|
[types.SET_BATCH_LOADING](state, isBatchLoading) {
|
|
|
|
Object.assign(state, { isBatchLoading });
|
|
|
|
},
|
|
|
|
|
2020-03-13 15:44:24 +05:30
|
|
|
[types.SET_RETRIEVING_BATCHES](state, retrievingBatches) {
|
|
|
|
Object.assign(state, { retrievingBatches });
|
|
|
|
},
|
|
|
|
|
2020-04-22 19:07:51 +05:30
|
|
|
[types.SET_DIFF_FILES](state, files) {
|
|
|
|
updateDiffFilesInState(state, files);
|
|
|
|
},
|
|
|
|
|
2018-11-08 19:23:39 +05:30
|
|
|
[types.SET_DIFF_DATA](state, data) {
|
2020-03-13 15:44:24 +05:30
|
|
|
let files = state.diffFiles;
|
|
|
|
|
2020-01-01 13:55:28 +05:30
|
|
|
if (
|
2020-03-13 15:44:24 +05:30
|
|
|
!(gon?.features?.diffsBatchLoad && window.location.search.indexOf('diff_id') === -1) &&
|
|
|
|
data.diff_files
|
2020-01-01 13:55:28 +05:30
|
|
|
) {
|
2020-03-13 15:44:24 +05:30
|
|
|
files = prepareDiffData(data, files);
|
2020-01-01 13:55:28 +05:30
|
|
|
}
|
2018-11-20 20:47:30 +05:30
|
|
|
|
2018-11-08 19:23:39 +05:30
|
|
|
Object.assign(state, {
|
2019-02-15 15:39:39 +05:30
|
|
|
...convertObjectPropsToCamelCase(data),
|
2018-11-20 20:47:30 +05:30
|
|
|
});
|
2020-04-22 19:07:51 +05:30
|
|
|
updateDiffFilesInState(state, files);
|
2018-11-20 20:47:30 +05:30
|
|
|
},
|
|
|
|
|
2020-01-01 13:55:28 +05:30
|
|
|
[types.SET_DIFF_DATA_BATCH](state, data) {
|
2020-03-13 15:44:24 +05:30
|
|
|
const files = prepareDiffData(data, state.diffFiles);
|
2020-01-01 13:55:28 +05:30
|
|
|
|
2020-03-13 15:44:24 +05:30
|
|
|
Object.assign(state, {
|
|
|
|
...convertObjectPropsToCamelCase(data),
|
|
|
|
});
|
2020-04-22 19:07:51 +05:30
|
|
|
updateDiffFilesInState(state, files);
|
2020-01-01 13:55:28 +05:30
|
|
|
},
|
|
|
|
|
2020-04-08 14:13:33 +05:30
|
|
|
[types.SET_COVERAGE_DATA](state, coverageFiles) {
|
|
|
|
Object.assign(state, { coverageFiles });
|
|
|
|
},
|
|
|
|
|
2018-11-20 20:47:30 +05:30
|
|
|
[types.RENDER_FILE](state, file) {
|
|
|
|
Object.assign(file, {
|
|
|
|
renderIt: true,
|
2018-11-08 19:23:39 +05:30
|
|
|
});
|
|
|
|
},
|
|
|
|
|
|
|
|
[types.SET_MERGE_REQUEST_DIFFS](state, mergeRequestDiffs) {
|
|
|
|
Object.assign(state, {
|
2019-02-15 15:39:39 +05:30
|
|
|
mergeRequestDiffs,
|
2018-11-08 19:23:39 +05:30
|
|
|
});
|
|
|
|
},
|
|
|
|
|
|
|
|
[types.SET_DIFF_VIEW_TYPE](state, diffViewType) {
|
|
|
|
Object.assign(state, { diffViewType });
|
|
|
|
},
|
|
|
|
|
2019-02-15 15:39:39 +05:30
|
|
|
[types.TOGGLE_LINE_HAS_FORM](state, { lineCode, fileHash, hasForm }) {
|
|
|
|
const diffFile = state.diffFiles.find(f => f.file_hash === fileHash);
|
|
|
|
|
|
|
|
if (!diffFile) return;
|
|
|
|
|
2020-03-13 15:44:24 +05:30
|
|
|
if (diffFile.highlighted_diff_lines.length) {
|
2019-02-15 15:39:39 +05:30
|
|
|
diffFile.highlighted_diff_lines.find(l => l.line_code === lineCode).hasForm = hasForm;
|
|
|
|
}
|
|
|
|
|
2020-03-13 15:44:24 +05:30
|
|
|
if (diffFile.parallel_diff_lines.length) {
|
2019-02-15 15:39:39 +05:30
|
|
|
const line = diffFile.parallel_diff_lines.find(l => {
|
|
|
|
const { left, right } = l;
|
2018-12-23 12:14:25 +05:30
|
|
|
|
2019-02-15 15:39:39 +05:30
|
|
|
return (left && left.line_code === lineCode) || (right && right.line_code === lineCode);
|
|
|
|
});
|
|
|
|
|
|
|
|
if (line.left && line.left.line_code === lineCode) {
|
|
|
|
line.left.hasForm = hasForm;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (line.right && line.right.line_code === lineCode) {
|
|
|
|
line.right.hasForm = hasForm;
|
|
|
|
}
|
|
|
|
}
|
2018-11-08 19:23:39 +05:30
|
|
|
},
|
|
|
|
|
|
|
|
[types.ADD_CONTEXT_LINES](state, options) {
|
2019-10-12 21:52:04 +05:30
|
|
|
const { lineNumbers, contextLines, fileHash, isExpandDown, nextLineNumbers } = options;
|
2018-11-08 19:23:39 +05:30
|
|
|
const { bottom } = options.params;
|
|
|
|
const diffFile = findDiffFile(state.diffFiles, fileHash);
|
|
|
|
|
|
|
|
removeMatchLine(diffFile, lineNumbers, bottom);
|
2018-12-13 13:39:08 +05:30
|
|
|
|
2019-10-12 21:52:04 +05:30
|
|
|
const lines = addLineReferences(
|
|
|
|
contextLines,
|
|
|
|
lineNumbers,
|
|
|
|
bottom,
|
|
|
|
isExpandDown,
|
|
|
|
nextLineNumbers,
|
|
|
|
).map(line => {
|
|
|
|
const lineCode =
|
|
|
|
line.type === 'match'
|
|
|
|
? `${fileHash}_${line.meta_data.old_pos}_${line.meta_data.new_pos}_match`
|
|
|
|
: line.line_code || `${fileHash}_${line.old_line}_${line.new_line}`;
|
|
|
|
return {
|
|
|
|
...line,
|
|
|
|
line_code: lineCode,
|
|
|
|
discussions: line.discussions || [],
|
|
|
|
hasForm: false,
|
|
|
|
};
|
|
|
|
});
|
2018-12-13 13:39:08 +05:30
|
|
|
|
2018-11-08 19:23:39 +05:30
|
|
|
addContextLines({
|
2019-02-15 15:39:39 +05:30
|
|
|
inlineLines: diffFile.highlighted_diff_lines,
|
|
|
|
parallelLines: diffFile.parallel_diff_lines,
|
2020-04-08 14:13:33 +05:30
|
|
|
diffViewType: state.diffViewType,
|
2018-11-08 19:23:39 +05:30
|
|
|
contextLines: lines,
|
|
|
|
bottom,
|
|
|
|
lineNumbers,
|
2019-10-12 21:52:04 +05:30
|
|
|
isExpandDown,
|
2018-11-08 19:23:39 +05:30
|
|
|
});
|
|
|
|
},
|
|
|
|
|
|
|
|
[types.ADD_COLLAPSED_DIFFS](state, { file, data }) {
|
2020-03-13 15:44:24 +05:30
|
|
|
const files = prepareDiffData(data);
|
|
|
|
const [newFileData] = files.filter(f => f.file_hash === file.file_hash);
|
2019-02-15 15:39:39 +05:30
|
|
|
const selectedFile = state.diffFiles.find(f => f.file_hash === file.file_hash);
|
2018-11-20 20:47:30 +05:30
|
|
|
Object.assign(selectedFile, { ...newFileData });
|
2018-11-08 19:23:39 +05:30
|
|
|
},
|
|
|
|
|
|
|
|
[types.EXPAND_ALL_FILES](state) {
|
2020-03-13 15:44:24 +05:30
|
|
|
state.diffFiles.forEach(file => {
|
|
|
|
Object.assign(file, {
|
|
|
|
viewer: Object.assign(file.viewer, {
|
|
|
|
collapsed: false,
|
|
|
|
}),
|
|
|
|
});
|
|
|
|
});
|
2018-11-08 19:23:39 +05:30
|
|
|
},
|
2018-11-20 20:47:30 +05:30
|
|
|
|
2019-09-30 21:07:59 +05:30
|
|
|
[types.SET_LINE_DISCUSSIONS_FOR_FILE](state, { discussion, diffPositionByLineCode, hash }) {
|
2018-12-13 13:39:08 +05:30
|
|
|
const { latestDiff } = state;
|
|
|
|
|
2020-04-22 19:07:51 +05:30
|
|
|
const discussionLineCodes = [discussion.line_code, ...(discussion.line_codes || [])];
|
2018-12-13 13:39:08 +05:30
|
|
|
const fileHash = discussion.diff_file.file_hash;
|
2019-02-15 15:39:39 +05:30
|
|
|
const lineCheck = line =>
|
2020-04-22 19:07:51 +05:30
|
|
|
discussionLineCodes.some(
|
|
|
|
discussionLineCode =>
|
|
|
|
line.line_code === discussionLineCode &&
|
|
|
|
isDiscussionApplicableToLine({
|
|
|
|
discussion,
|
|
|
|
diffPosition: diffPositionByLineCode[line.line_code],
|
|
|
|
latestDiff,
|
|
|
|
}),
|
|
|
|
);
|
2019-02-15 15:39:39 +05:30
|
|
|
const mapDiscussions = (line, extraCheck = () => true) => ({
|
|
|
|
...line,
|
|
|
|
discussions: extraCheck()
|
2020-03-13 15:44:24 +05:30
|
|
|
? line.discussions &&
|
|
|
|
line.discussions
|
2019-02-15 15:39:39 +05:30
|
|
|
.filter(() => !line.discussions.some(({ id }) => discussion.id === id))
|
|
|
|
.concat(lineCheck(line) ? discussion : line.discussions)
|
|
|
|
: [],
|
|
|
|
});
|
2018-12-13 13:39:08 +05:30
|
|
|
|
2019-09-30 21:07:59 +05:30
|
|
|
const setDiscussionsExpanded = line => {
|
2020-03-13 15:44:24 +05:30
|
|
|
const isLineNoteTargeted =
|
|
|
|
line.discussions &&
|
|
|
|
line.discussions.some(
|
|
|
|
disc => disc.notes && disc.notes.find(note => hash === `note_${note.id}`),
|
|
|
|
);
|
2019-09-30 21:07:59 +05:30
|
|
|
|
|
|
|
return {
|
|
|
|
...line,
|
|
|
|
discussionsExpanded:
|
|
|
|
line.discussions && line.discussions.length
|
|
|
|
? line.discussions.some(disc => !disc.resolved) || isLineNoteTargeted
|
|
|
|
: false,
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
2020-03-13 15:44:24 +05:30
|
|
|
state.diffFiles.forEach(file => {
|
|
|
|
if (file.file_hash === fileHash) {
|
|
|
|
if (file.highlighted_diff_lines.length) {
|
|
|
|
file.highlighted_diff_lines.forEach(line => {
|
|
|
|
Object.assign(
|
|
|
|
line,
|
|
|
|
setDiscussionsExpanded(lineCheck(line) ? mapDiscussions(line) : line),
|
|
|
|
);
|
|
|
|
});
|
2018-11-20 20:47:30 +05:30
|
|
|
}
|
|
|
|
|
2020-03-13 15:44:24 +05:30
|
|
|
if (file.parallel_diff_lines.length) {
|
|
|
|
file.parallel_diff_lines.forEach(line => {
|
2018-12-13 13:39:08 +05:30
|
|
|
const left = line.left && lineCheck(line.left);
|
|
|
|
const right = line.right && lineCheck(line.right);
|
|
|
|
|
|
|
|
if (left || right) {
|
2020-03-13 15:44:24 +05:30
|
|
|
Object.assign(line, {
|
2019-09-30 21:07:59 +05:30
|
|
|
left: line.left ? setDiscussionsExpanded(mapDiscussions(line.left)) : null,
|
|
|
|
right: line.right
|
|
|
|
? setDiscussionsExpanded(mapDiscussions(line.right, () => !left))
|
|
|
|
: null,
|
2020-03-13 15:44:24 +05:30
|
|
|
});
|
2018-12-13 13:39:08 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
return line;
|
2018-11-20 20:47:30 +05:30
|
|
|
});
|
|
|
|
}
|
2018-12-13 13:39:08 +05:30
|
|
|
|
2019-02-15 15:39:39 +05:30
|
|
|
if (!file.parallel_diff_lines || !file.highlighted_diff_lines) {
|
2020-03-13 15:44:24 +05:30
|
|
|
const newDiscussions = (file.discussions || [])
|
2019-07-31 22:56:46 +05:30
|
|
|
.filter(d => d.id !== discussion.id)
|
|
|
|
.concat(discussion);
|
2018-12-13 13:39:08 +05:30
|
|
|
|
2020-03-13 15:44:24 +05:30
|
|
|
Object.assign(file, {
|
|
|
|
discussions: newDiscussions,
|
|
|
|
});
|
|
|
|
}
|
2018-11-20 20:47:30 +05:30
|
|
|
}
|
2018-12-13 13:39:08 +05:30
|
|
|
});
|
2018-11-20 20:47:30 +05:30
|
|
|
},
|
|
|
|
|
2019-02-15 15:39:39 +05:30
|
|
|
[types.REMOVE_LINE_DISCUSSIONS_FOR_FILE](state, { fileHash, lineCode }) {
|
|
|
|
const selectedFile = state.diffFiles.find(f => f.file_hash === fileHash);
|
2018-11-20 20:47:30 +05:30
|
|
|
if (selectedFile) {
|
2019-09-30 21:07:59 +05:30
|
|
|
updateLineInFile(selectedFile, lineCode, line =>
|
|
|
|
Object.assign(line, {
|
|
|
|
discussions: line.discussions.filter(discussion => discussion.notes.length),
|
|
|
|
}),
|
|
|
|
);
|
2018-12-13 13:39:08 +05:30
|
|
|
|
|
|
|
if (selectedFile.discussions && selectedFile.discussions.length) {
|
|
|
|
selectedFile.discussions = selectedFile.discussions.filter(
|
2019-02-15 15:39:39 +05:30
|
|
|
discussion => discussion.notes.length,
|
2018-12-13 13:39:08 +05:30
|
|
|
);
|
|
|
|
}
|
2018-11-20 20:47:30 +05:30
|
|
|
}
|
|
|
|
},
|
2019-09-30 21:07:59 +05:30
|
|
|
|
|
|
|
[types.TOGGLE_LINE_DISCUSSIONS](state, { fileHash, lineCode, expanded }) {
|
|
|
|
const selectedFile = state.diffFiles.find(f => f.file_hash === fileHash);
|
|
|
|
|
2020-03-13 15:44:24 +05:30
|
|
|
updateLineInFile(selectedFile, lineCode, line => {
|
|
|
|
Object.assign(line, { discussionsExpanded: expanded });
|
|
|
|
});
|
2019-09-30 21:07:59 +05:30
|
|
|
},
|
|
|
|
|
2018-12-05 23:21:45 +05:30
|
|
|
[types.TOGGLE_FOLDER_OPEN](state, path) {
|
|
|
|
state.treeEntries[path].opened = !state.treeEntries[path].opened;
|
|
|
|
},
|
|
|
|
[types.TOGGLE_SHOW_TREE_LIST](state) {
|
|
|
|
state.showTreeList = !state.showTreeList;
|
|
|
|
},
|
|
|
|
[types.UPDATE_CURRENT_DIFF_FILE_ID](state, fileId) {
|
|
|
|
state.currentDiffFileId = fileId;
|
|
|
|
},
|
2018-12-13 13:39:08 +05:30
|
|
|
[types.OPEN_DIFF_FILE_COMMENT_FORM](state, formData) {
|
|
|
|
state.commentForms.push({
|
|
|
|
...formData,
|
|
|
|
});
|
|
|
|
},
|
|
|
|
[types.UPDATE_DIFF_FILE_COMMENT_FORM](state, formData) {
|
|
|
|
const { fileHash } = formData;
|
|
|
|
|
|
|
|
state.commentForms = state.commentForms.map(form => {
|
|
|
|
if (form.fileHash === fileHash) {
|
|
|
|
return {
|
|
|
|
...formData,
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
return form;
|
|
|
|
});
|
|
|
|
},
|
|
|
|
[types.CLOSE_DIFF_FILE_COMMENT_FORM](state, fileHash) {
|
|
|
|
state.commentForms = state.commentForms.filter(form => form.fileHash !== fileHash);
|
|
|
|
},
|
2019-02-15 15:39:39 +05:30
|
|
|
[types.SET_HIGHLIGHTED_ROW](state, lineCode) {
|
|
|
|
state.highlightedRow = lineCode;
|
|
|
|
},
|
2019-03-02 22:35:43 +05:30
|
|
|
[types.SET_TREE_DATA](state, { treeEntries, tree }) {
|
|
|
|
state.treeEntries = treeEntries;
|
|
|
|
state.tree = tree;
|
|
|
|
},
|
|
|
|
[types.SET_RENDER_TREE_LIST](state, renderTreeList) {
|
|
|
|
state.renderTreeList = renderTreeList;
|
|
|
|
},
|
|
|
|
[types.SET_SHOW_WHITESPACE](state, showWhitespace) {
|
|
|
|
state.showWhitespace = showWhitespace;
|
2020-04-22 19:07:51 +05:30
|
|
|
state.diffFiles = [];
|
2019-03-02 22:35:43 +05:30
|
|
|
},
|
|
|
|
[types.TOGGLE_FILE_FINDER_VISIBLE](state, visible) {
|
|
|
|
state.fileFinderVisible = visible;
|
|
|
|
},
|
2019-07-07 11:18:12 +05:30
|
|
|
[types.REQUEST_FULL_DIFF](state, filePath) {
|
|
|
|
const file = findDiffFile(state.diffFiles, filePath, 'file_path');
|
|
|
|
|
|
|
|
file.isLoadingFullFile = true;
|
|
|
|
},
|
|
|
|
[types.RECEIVE_FULL_DIFF_ERROR](state, filePath) {
|
|
|
|
const file = findDiffFile(state.diffFiles, filePath, 'file_path');
|
|
|
|
|
|
|
|
file.isLoadingFullFile = false;
|
|
|
|
},
|
2019-07-31 22:56:46 +05:30
|
|
|
[types.RECEIVE_FULL_DIFF_SUCCESS](state, { filePath }) {
|
2019-07-07 11:18:12 +05:30
|
|
|
const file = findDiffFile(state.diffFiles, filePath, 'file_path');
|
|
|
|
|
|
|
|
file.isShowingFullFile = true;
|
|
|
|
file.isLoadingFullFile = false;
|
|
|
|
},
|
|
|
|
[types.SET_FILE_COLLAPSED](state, { filePath, collapsed }) {
|
|
|
|
const file = state.diffFiles.find(f => f.file_path === filePath);
|
|
|
|
|
|
|
|
if (file && file.viewer) {
|
|
|
|
file.viewer.collapsed = collapsed;
|
|
|
|
}
|
|
|
|
},
|
2019-07-31 22:56:46 +05:30
|
|
|
[types.SET_HIDDEN_VIEW_DIFF_FILE_LINES](state, { filePath, lines }) {
|
|
|
|
const file = state.diffFiles.find(f => f.file_path === filePath);
|
|
|
|
const hiddenDiffLinesKey =
|
|
|
|
state.diffViewType === 'inline' ? 'parallel_diff_lines' : 'highlighted_diff_lines';
|
|
|
|
|
|
|
|
file[hiddenDiffLinesKey] = lines;
|
|
|
|
},
|
|
|
|
[types.SET_CURRENT_VIEW_DIFF_FILE_LINES](state, { filePath, lines }) {
|
|
|
|
const file = state.diffFiles.find(f => f.file_path === filePath);
|
|
|
|
const currentDiffLinesKey =
|
|
|
|
state.diffViewType === 'inline' ? 'highlighted_diff_lines' : 'parallel_diff_lines';
|
|
|
|
|
|
|
|
file[currentDiffLinesKey] = lines;
|
|
|
|
},
|
|
|
|
[types.ADD_CURRENT_VIEW_DIFF_FILE_LINES](state, { filePath, line }) {
|
|
|
|
const file = state.diffFiles.find(f => f.file_path === filePath);
|
|
|
|
const currentDiffLinesKey =
|
|
|
|
state.diffViewType === 'inline' ? 'highlighted_diff_lines' : 'parallel_diff_lines';
|
|
|
|
|
|
|
|
file[currentDiffLinesKey].push(line);
|
|
|
|
},
|
|
|
|
[types.TOGGLE_DIFF_FILE_RENDERING_MORE](state, filePath) {
|
|
|
|
const file = state.diffFiles.find(f => f.file_path === filePath);
|
|
|
|
|
|
|
|
file.renderingLines = !file.renderingLines;
|
|
|
|
},
|
2019-09-04 21:01:54 +05:30
|
|
|
[types.SET_SHOW_SUGGEST_POPOVER](state) {
|
|
|
|
state.showSuggestPopover = false;
|
|
|
|
},
|
2018-11-08 19:23:39 +05:30
|
|
|
};
|