diff options
Diffstat (limited to 'app/assets/javascripts/notes/stores/actions.js')
-rw-r--r-- | app/assets/javascripts/notes/stores/actions.js | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/app/assets/javascripts/notes/stores/actions.js b/app/assets/javascripts/notes/stores/actions.js index 0cfc17a6ae9..57bb9e295f9 100644 --- a/app/assets/javascripts/notes/stores/actions.js +++ b/app/assets/javascripts/notes/stores/actions.js @@ -19,7 +19,6 @@ import TaskList from '~/task_list'; import mrWidgetEventHub from '~/vue_merge_request_widget/event_hub'; import SidebarStore from '~/sidebar/stores/sidebar_store'; import * as constants from '../constants'; -import eventHub from '../event_hub'; import * as types from './mutation_types'; import * as utils from './utils'; @@ -90,7 +89,10 @@ export const fetchDiscussions = ({ commit, dispatch }, { path, filter, persistFi ? { params: { notes_filter: filter, persist_filter: persistFilter } } : null; - if (window.gon?.features?.paginatedIssueDiscussions) { + if ( + window.gon?.features?.paginatedIssueDiscussions || + window.gon?.features?.paginatedMrDiscussions + ) { return dispatch('fetchDiscussionsBatch', { path, config, perPage: 20 }); } @@ -128,6 +130,7 @@ export const fetchDiscussionsBatch = ({ commit, dispatch }, { path, config, curs }); } + commit(types.SET_DONE_FETCHING_BATCH_DISCUSSIONS, true); commit(types.SET_FETCHING_DISCUSSIONS, false); dispatch('updateResolvableDiscussionsCounts'); @@ -495,13 +498,6 @@ const pollSuccessCallBack = async (resp, commit, state, getters, dispatch) => { return null; } - if (window.gon?.features?.paginatedNotes && !resp.more && state.isFetching) { - eventHub.$emit('fetchedNotesData'); - dispatch('setFetchingState', false); - dispatch('setNotesFetchedState', true); - dispatch('setLoadingState', false); - } - if (resp.notes?.length) { await dispatch('updateOrCreateNotes', resp.notes); dispatch('startTaskList'); |