diff options
author | André Luís <aluis@gitlab.com> | 2018-07-31 01:50:53 +0100 |
---|---|---|
committer | André Luís <aluis@gitlab.com> | 2018-08-01 13:45:15 +0100 |
commit | 8693aa139dcdc5d4ed8939d12b360731f5f9dab8 (patch) | |
tree | a95be3bd3baf011bb43f73879d3c2545619fedd2 /app/assets/javascripts/notes/stores | |
parent | 113f9f337c678129e811fcdfb418ba011ac1eb2b (diff) | |
download | gitlab-ce-8693aa139dcdc5d4ed8939d12b360731f5f9dab8.tar.gz |
Revert "Merge branch '48817-fix-mr-changes-discussion-navigation' into 'master'"
This reverts commit ced005f330419ec81657e852c5cb9124fdb29fbb, reversing
changes made to 9b01b293ce5ddbaeedaf014cdc804af2c5e86416.
Diffstat (limited to 'app/assets/javascripts/notes/stores')
-rw-r--r-- | app/assets/javascripts/notes/stores/getters.js | 85 |
1 files changed, 0 insertions, 85 deletions
diff --git a/app/assets/javascripts/notes/stores/getters.js b/app/assets/javascripts/notes/stores/getters.js index 0d8d197bf71..e9e95dd4219 100644 --- a/app/assets/javascripts/notes/stores/getters.js +++ b/app/assets/javascripts/notes/stores/getters.js @@ -70,9 +70,6 @@ export const allDiscussions = (state, getters) => { return Object.values(resolved).concat(unresolved); }; -export const allResolvableDiscussions = (state, getters) => - getters.allDiscussions.filter(d => !d.individual_note && d.resolvable); - export const resolvedDiscussionsById = state => { const map = {}; @@ -89,51 +86,6 @@ export const resolvedDiscussionsById = state => { return map; }; -// Gets Discussions IDs ordered by the date of their initial note -export const unresolvedDiscussionsIdsByDate = (state, getters) => - getters.allResolvableDiscussions - .filter(d => !d.resolved) - .sort((a, b) => { - const aDate = new Date(a.notes[0].created_at); - const bDate = new Date(b.notes[0].created_at); - - if (aDate < bDate) { - return -1; - } - - return aDate === bDate ? 0 : 1; - }) - .map(d => d.id); - -// Gets Discussions IDs ordered by their position in the diff -// -// Sorts the array of resolvable yet unresolved discussions by -// comparing file names first. If file names are the same, compares -// line numbers. -export const unresolvedDiscussionsIdsByDiff = (state, getters) => - getters.allResolvableDiscussions - .filter(d => !d.resolved) - .sort((a, b) => { - if (!a.diff_file || !b.diff_file) { - return 0; - } - - // Get file names comparison result - const filenameComparison = a.diff_file.file_path.localeCompare(b.diff_file.file_path); - - // Get the line numbers, to compare within the same file - const aLines = [a.position.formatter.new_line, a.position.formatter.old_line]; - const bLines = [b.position.formatter.new_line, b.position.formatter.old_line]; - - return filenameComparison < 0 || - (filenameComparison === 0 && - // .max() because one of them might be zero (if removed/added) - Math.max(aLines[0], aLines[1]) < Math.max(bLines[0], bLines[1])) - ? -1 - : 1; - }) - .map(d => d.id); - export const resolvedDiscussionCount = (state, getters) => { const resolvedMap = getters.resolvedDiscussionsById; @@ -150,42 +102,5 @@ export const discussionTabCounter = state => { return all.length; }; -// Returns the list of discussion IDs ordered according to given parameter -// @param {Boolean} diffOrder - is ordered by diff? -export const unresolvedDiscussionsIdsOrdered = (state, getters) => diffOrder => { - if (diffOrder) { - return getters.unresolvedDiscussionsIdsByDiff; - } - return getters.unresolvedDiscussionsIdsByDate; -}; - -// Checks if a given discussion is the last in the current order (diff or date) -// @param {Boolean} discussionId - id of the discussion -// @param {Boolean} diffOrder - is ordered by diff? -export const isLastUnresolvedDiscussion = (state, getters) => (discussionId, diffOrder) => { - const idsOrdered = getters.unresolvedDiscussionsIdsOrdered(diffOrder); - const lastDiscussionId = idsOrdered[idsOrdered.length - 1]; - - return lastDiscussionId === discussionId; -}; - -// Gets the ID of the discussion following the one provided, respecting order (diff or date) -// @param {Boolean} discussionId - id of the current discussion -// @param {Boolean} diffOrder - is ordered by diff? -export const nextUnresolvedDiscussionId = (state, getters) => (discussionId, diffOrder) => { - const idsOrdered = getters.unresolvedDiscussionsIdsOrdered(diffOrder); - const currentIndex = idsOrdered.indexOf(discussionId); - - return idsOrdered.slice(currentIndex + 1, currentIndex + 2)[0]; -}; - -// @param {Boolean} diffOrder - is ordered by diff? -export const firstUnresolvedDiscussionId = (state, getters) => diffOrder => { - if (diffOrder) { - return getters.unresolvedDiscussionsIdsByDiff[0]; - } - return getters.unresolvedDiscussionsIdsByDate[0]; -}; - // prevent babel-plugin-rewire from generating an invalid default during karma tests export default () => {}; |