Commit 4848ae3d authored by Thomas Randolph's avatar Thomas Randolph

Switch "VIEW" mutation to "SET_CURRENT"

This mutation is no longer responsible for marking a file
as "Viewed", so the name is misleading.
parent b3cc00ac
...@@ -133,7 +133,7 @@ export const fetchDiffFilesBatch = ({ commit, state, dispatch }) => { ...@@ -133,7 +133,7 @@ export const fetchDiffFilesBatch = ({ commit, state, dispatch }) => {
} }
if (!isNoteLink && !state.currentDiffFileId) { if (!isNoteLink && !state.currentDiffFileId) {
commit(types.VIEW_DIFF_FILE, diff_files[0]?.file_hash); commit(types.SET_CURRENT_DIFF_FILE, diff_files[0]?.file_hash);
} }
if (isNoteLink) { if (isNoteLink) {
...@@ -149,7 +149,7 @@ export const fetchDiffFilesBatch = ({ commit, state, dispatch }) => { ...@@ -149,7 +149,7 @@ export const fetchDiffFilesBatch = ({ commit, state, dispatch }) => {
!state.diffFiles.some((f) => f.file_hash === state.currentDiffFileId) && !state.diffFiles.some((f) => f.file_hash === state.currentDiffFileId) &&
!isNoteLink !isNoteLink
) { ) {
commit(types.VIEW_DIFF_FILE, state.diffFiles[0].file_hash); commit(types.SET_CURRENT_DIFF_FILE, state.diffFiles[0].file_hash);
} }
if (state.diffFiles?.length) { if (state.diffFiles?.length) {
...@@ -254,7 +254,7 @@ export const fetchCoverageFiles = ({ commit, state }) => { ...@@ -254,7 +254,7 @@ export const fetchCoverageFiles = ({ commit, state }) => {
export const setHighlightedRow = ({ commit }, lineCode) => { export const setHighlightedRow = ({ commit }, lineCode) => {
const fileHash = lineCode.split('_')[0]; const fileHash = lineCode.split('_')[0];
commit(types.SET_HIGHLIGHTED_ROW, lineCode); commit(types.SET_HIGHLIGHTED_ROW, lineCode);
commit(types.VIEW_DIFF_FILE, fileHash); commit(types.SET_CURRENT_DIFF_FILE, fileHash);
handleLocationHash(); handleLocationHash();
}; };
...@@ -521,7 +521,7 @@ export const toggleTreeOpen = ({ commit }, path) => { ...@@ -521,7 +521,7 @@ export const toggleTreeOpen = ({ commit }, path) => {
}; };
export const toggleActiveFileByHash = ({ commit }, hash) => { export const toggleActiveFileByHash = ({ commit }, hash) => {
commit(types.VIEW_DIFF_FILE, hash); commit(types.SET_CURRENT_DIFF_FILE, hash);
}; };
export const scrollToFile = ({ state, commit, getters }, { path, setHash = true }) => { export const scrollToFile = ({ state, commit, getters }, { path, setHash = true }) => {
...@@ -529,7 +529,7 @@ export const scrollToFile = ({ state, commit, getters }, { path, setHash = true ...@@ -529,7 +529,7 @@ export const scrollToFile = ({ state, commit, getters }, { path, setHash = true
const { fileHash } = state.treeEntries[path]; const { fileHash } = state.treeEntries[path];
commit(types.VIEW_DIFF_FILE, fileHash); commit(types.SET_CURRENT_DIFF_FILE, fileHash);
if (getters.isVirtualScrollingEnabled) { if (getters.isVirtualScrollingEnabled) {
eventHub.$emit('scrollToFileHash', fileHash); eventHub.$emit('scrollToFileHash', fileHash);
...@@ -812,7 +812,7 @@ export const setCurrentDiffFileIdFromNote = ({ commit, state, rootGetters }, not ...@@ -812,7 +812,7 @@ export const setCurrentDiffFileIdFromNote = ({ commit, state, rootGetters }, not
const fileHash = rootGetters.getDiscussion(note.discussion_id).diff_file?.file_hash; const fileHash = rootGetters.getDiscussion(note.discussion_id).diff_file?.file_hash;
if (fileHash && state.diffFiles.some((f) => f.file_hash === fileHash)) { if (fileHash && state.diffFiles.some((f) => f.file_hash === fileHash)) {
commit(types.VIEW_DIFF_FILE, fileHash); commit(types.SET_CURRENT_DIFF_FILE, fileHash);
} }
}; };
...@@ -820,7 +820,7 @@ export const navigateToDiffFileIndex = ({ commit, state }, index) => { ...@@ -820,7 +820,7 @@ export const navigateToDiffFileIndex = ({ commit, state }, index) => {
const fileHash = state.diffFiles[index].file_hash; const fileHash = state.diffFiles[index].file_hash;
document.location.hash = fileHash; document.location.hash = fileHash;
commit(types.VIEW_DIFF_FILE, fileHash); commit(types.SET_CURRENT_DIFF_FILE, fileHash);
}; };
export const setFileByFile = ({ state, commit }, { fileByFile }) => { export const setFileByFile = ({ state, commit }, { fileByFile }) => {
......
...@@ -20,7 +20,7 @@ export const SET_LINE_DISCUSSIONS_FOR_FILE = 'SET_LINE_DISCUSSIONS_FOR_FILE'; ...@@ -20,7 +20,7 @@ export const SET_LINE_DISCUSSIONS_FOR_FILE = 'SET_LINE_DISCUSSIONS_FOR_FILE';
export const REMOVE_LINE_DISCUSSIONS_FOR_FILE = 'REMOVE_LINE_DISCUSSIONS_FOR_FILE'; export const REMOVE_LINE_DISCUSSIONS_FOR_FILE = 'REMOVE_LINE_DISCUSSIONS_FOR_FILE';
export const TOGGLE_FOLDER_OPEN = 'TOGGLE_FOLDER_OPEN'; export const TOGGLE_FOLDER_OPEN = 'TOGGLE_FOLDER_OPEN';
export const SET_SHOW_TREE_LIST = 'SET_SHOW_TREE_LIST'; export const SET_SHOW_TREE_LIST = 'SET_SHOW_TREE_LIST';
export const VIEW_DIFF_FILE = 'VIEW_DIFF_FILE'; export const SET_CURRENT_DIFF_FILE = 'SET_CURRENT_DIFF_FILE';
export const SET_DIFF_FILE_VIEWED = 'SET_DIFF_FILE_VIEWED'; export const SET_DIFF_FILE_VIEWED = 'SET_DIFF_FILE_VIEWED';
export const OPEN_DIFF_FILE_COMMENT_FORM = 'OPEN_DIFF_FILE_COMMENT_FORM'; export const OPEN_DIFF_FILE_COMMENT_FORM = 'OPEN_DIFF_FILE_COMMENT_FORM';
......
...@@ -254,7 +254,7 @@ export default { ...@@ -254,7 +254,7 @@ export default {
[types.SET_SHOW_TREE_LIST](state, showTreeList) { [types.SET_SHOW_TREE_LIST](state, showTreeList) {
state.showTreeList = showTreeList; state.showTreeList = showTreeList;
}, },
[types.VIEW_DIFF_FILE](state, fileId) { [types.SET_CURRENT_DIFF_FILE](state, fileId) {
state.currentDiffFileId = fileId; state.currentDiffFileId = fileId;
}, },
[types.SET_DIFF_FILE_VIEWED](state, { id, seen }) { [types.SET_DIFF_FILE_VIEWED](state, { id, seen }) {
......
...@@ -208,10 +208,10 @@ describe('DiffsStoreActions', () => { ...@@ -208,10 +208,10 @@ describe('DiffsStoreActions', () => {
{ type: types.SET_RETRIEVING_BATCHES, payload: true }, { type: types.SET_RETRIEVING_BATCHES, payload: true },
{ type: types.SET_DIFF_DATA_BATCH, payload: { diff_files: res1.diff_files } }, { type: types.SET_DIFF_DATA_BATCH, payload: { diff_files: res1.diff_files } },
{ type: types.SET_BATCH_LOADING_STATE, payload: 'loaded' }, { type: types.SET_BATCH_LOADING_STATE, payload: 'loaded' },
{ type: types.VIEW_DIFF_FILE, payload: 'test' }, { type: types.SET_CURRENT_DIFF_FILE, payload: 'test' },
{ type: types.SET_DIFF_DATA_BATCH, payload: { diff_files: res2.diff_files } }, { type: types.SET_DIFF_DATA_BATCH, payload: { diff_files: res2.diff_files } },
{ type: types.SET_BATCH_LOADING_STATE, payload: 'loaded' }, { type: types.SET_BATCH_LOADING_STATE, payload: 'loaded' },
{ type: types.VIEW_DIFF_FILE, payload: 'test2' }, { type: types.SET_CURRENT_DIFF_FILE, payload: 'test2' },
{ type: types.SET_RETRIEVING_BATCHES, payload: false }, { type: types.SET_RETRIEVING_BATCHES, payload: false },
{ type: types.SET_BATCH_LOADING_STATE, payload: 'error' }, { type: types.SET_BATCH_LOADING_STATE, payload: 'error' },
], ],
...@@ -325,7 +325,7 @@ describe('DiffsStoreActions', () => { ...@@ -325,7 +325,7 @@ describe('DiffsStoreActions', () => {
it('should mark currently selected diff and set lineHash and fileHash of highlightedRow', () => { it('should mark currently selected diff and set lineHash and fileHash of highlightedRow', () => {
testAction(setHighlightedRow, 'ABC_123', {}, [ testAction(setHighlightedRow, 'ABC_123', {}, [
{ type: types.SET_HIGHLIGHTED_ROW, payload: 'ABC_123' }, { type: types.SET_HIGHLIGHTED_ROW, payload: 'ABC_123' },
{ type: types.VIEW_DIFF_FILE, payload: 'ABC' }, { type: types.SET_CURRENT_DIFF_FILE, payload: 'ABC' },
]); ]);
}); });
}); });
...@@ -913,7 +913,7 @@ describe('DiffsStoreActions', () => { ...@@ -913,7 +913,7 @@ describe('DiffsStoreActions', () => {
expect(document.location.hash).toBe('#test'); expect(document.location.hash).toBe('#test');
}); });
it('commits VIEW_DIFF_FILE', () => { it('commits SET_CURRENT_DIFF_FILE', () => {
const state = { const state = {
treeEntries: { treeEntries: {
path: { path: {
...@@ -924,7 +924,7 @@ describe('DiffsStoreActions', () => { ...@@ -924,7 +924,7 @@ describe('DiffsStoreActions', () => {
scrollToFile({ state, commit, getters }, { path: 'path' }); scrollToFile({ state, commit, getters }, { path: 'path' });
expect(commit).toHaveBeenCalledWith(types.VIEW_DIFF_FILE, 'test'); expect(commit).toHaveBeenCalledWith(types.SET_CURRENT_DIFF_FILE, 'test');
}); });
}); });
...@@ -1446,7 +1446,7 @@ describe('DiffsStoreActions', () => { ...@@ -1446,7 +1446,7 @@ describe('DiffsStoreActions', () => {
}); });
describe('setCurrentDiffFileIdFromNote', () => { describe('setCurrentDiffFileIdFromNote', () => {
it('commits VIEW_DIFF_FILE', () => { it('commits SET_CURRENT_DIFF_FILE', () => {
const commit = jest.fn(); const commit = jest.fn();
const state = { diffFiles: [{ file_hash: '123' }] }; const state = { diffFiles: [{ file_hash: '123' }] };
const rootGetters = { const rootGetters = {
...@@ -1456,10 +1456,10 @@ describe('DiffsStoreActions', () => { ...@@ -1456,10 +1456,10 @@ describe('DiffsStoreActions', () => {
setCurrentDiffFileIdFromNote({ commit, state, rootGetters }, '1'); setCurrentDiffFileIdFromNote({ commit, state, rootGetters }, '1');
expect(commit).toHaveBeenCalledWith(types.VIEW_DIFF_FILE, '123'); expect(commit).toHaveBeenCalledWith(types.SET_CURRENT_DIFF_FILE, '123');
}); });
it('does not commit VIEW_DIFF_FILE when discussion has no diff_file', () => { it('does not commit SET_CURRENT_DIFF_FILE when discussion has no diff_file', () => {
const commit = jest.fn(); const commit = jest.fn();
const state = { diffFiles: [{ file_hash: '123' }] }; const state = { diffFiles: [{ file_hash: '123' }] };
const rootGetters = { const rootGetters = {
...@@ -1472,7 +1472,7 @@ describe('DiffsStoreActions', () => { ...@@ -1472,7 +1472,7 @@ describe('DiffsStoreActions', () => {
expect(commit).not.toHaveBeenCalled(); expect(commit).not.toHaveBeenCalled();
}); });
it('does not commit VIEW_DIFF_FILE when diff file does not exist', () => { it('does not commit SET_CURRENT_DIFF_FILE when diff file does not exist', () => {
const commit = jest.fn(); const commit = jest.fn();
const state = { diffFiles: [{ file_hash: '123' }] }; const state = { diffFiles: [{ file_hash: '123' }] };
const rootGetters = { const rootGetters = {
...@@ -1487,12 +1487,12 @@ describe('DiffsStoreActions', () => { ...@@ -1487,12 +1487,12 @@ describe('DiffsStoreActions', () => {
}); });
describe('navigateToDiffFileIndex', () => { describe('navigateToDiffFileIndex', () => {
it('commits VIEW_DIFF_FILE', (done) => { it('commits SET_CURRENT_DIFF_FILE', (done) => {
testAction( testAction(
navigateToDiffFileIndex, navigateToDiffFileIndex,
0, 0,
{ diffFiles: [{ file_hash: '123' }] }, { diffFiles: [{ file_hash: '123' }] },
[{ type: types.VIEW_DIFF_FILE, payload: '123' }], [{ type: types.SET_CURRENT_DIFF_FILE, payload: '123' }],
[], [],
done, done,
); );
......
...@@ -633,11 +633,11 @@ describe('DiffsStoreMutations', () => { ...@@ -633,11 +633,11 @@ describe('DiffsStoreMutations', () => {
}); });
}); });
describe('VIEW_DIFF_FILE', () => { describe('SET_CURRENT_DIFF_FILE', () => {
it('updates currentDiffFileId', () => { it('updates currentDiffFileId', () => {
const state = createState(); const state = createState();
mutations[types.VIEW_DIFF_FILE](state, 'somefileid'); mutations[types.SET_CURRENT_DIFF_FILE](state, 'somefileid');
expect(state.currentDiffFileId).toBe('somefileid'); expect(state.currentDiffFileId).toBe('somefileid');
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment