1 files changed, 30 insertions, 20 deletions

diff --git a/app/assets/javascripts/diffs/store/actions.js b/app/assets/javascripts/diffs/store/actions.js
index 66510edf3db..f7bdbe94bac 100644
--- a/app/assets/javascripts/diffs/store/actions.js
+++ b/app/assets/javascripts/diffs/store/actions.js
@@ -1,6 +1,5 @@
 import Cookies from 'js-cookie';
 import Vue from 'vue';
-import api from '~/api';
 import createFlash from '~/flash';
 import { diffViewerModes } from '~/ide/constants';
 import axios from '~/lib/utils/axios_utils';
@@ -50,6 +49,7 @@ import eventHub from '../event_hub';
 import { isCollapsed } from '../utils/diff_file';
 import { markFileReview, setReviewsForMergeRequest } from '../utils/file_reviews';
 import { getDerivedMergeRequestInformation } from '../utils/merge_request';
+import { queueRedisHllEvents } from '../utils/queue_events';
 import TreeWorker from '../workers/tree_worker';
 import * as types from './mutation_types';
 import {
@@ -368,8 +368,7 @@ export const setInlineDiffViewType = ({ commit }) => {
   historyPushState(url);
 
   if (window.gon?.features?.diffSettingsUsageData) {
-    api.trackRedisHllUserEvent(TRACKING_CLICK_DIFF_VIEW_SETTING);
-    api.trackRedisHllUserEvent(TRACKING_DIFF_VIEW_INLINE);
+    queueRedisHllEvents([TRACKING_CLICK_DIFF_VIEW_SETTING, TRACKING_DIFF_VIEW_INLINE]);
   }
 };
 
@@ -381,8 +380,7 @@ export const setParallelDiffViewType = ({ commit }) => {
   historyPushState(url);
 
   if (window.gon?.features?.diffSettingsUsageData) {
-    api.trackRedisHllUserEvent(TRACKING_CLICK_DIFF_VIEW_SETTING);
-    api.trackRedisHllUserEvent(TRACKING_DIFF_VIEW_PARALLEL);
+    queueRedisHllEvents([TRACKING_CLICK_DIFF_VIEW_SETTING, TRACKING_DIFF_VIEW_PARALLEL]);
   }
 };
 
@@ -520,14 +518,14 @@ export const toggleActiveFileByHash = ({ commit }, hash) => {
   commit(types.VIEW_DIFF_FILE, hash);
 };
 
-export const scrollToFile = ({ state, commit }, path) => {
+export const scrollToFile = ({ state, commit, getters }, path) => {
   if (!state.treeEntries[path]) return;
 
   const { fileHash } = state.treeEntries[path];
 
   commit(types.VIEW_DIFF_FILE, fileHash);
 
-  if (window.gon?.features?.diffsVirtualScrolling) {
+  if (getters.isVirtualScrollingEnabled) {
     eventHub.$emit('scrollToFileHash', fileHash);
 
     setTimeout(() => {
@@ -535,6 +533,10 @@ export const scrollToFile = ({ state, commit }, path) => {
     });
   } else {
     document.location.hash = fileHash;
+
+    setTimeout(() => {
+      handleLocationHash();
+    });
   }
 };
 
@@ -560,25 +562,27 @@ export const closeDiffFileCommentForm = ({ commit }, fileHash) => {
   commit(types.CLOSE_DIFF_FILE_COMMENT_FORM, fileHash);
 };
 
-export const setRenderTreeList = ({ commit }, renderTreeList) => {
+export const setRenderTreeList = ({ commit }, { renderTreeList, trackClick = true }) => {
   commit(types.SET_RENDER_TREE_LIST, renderTreeList);
 
   localStorage.setItem(TREE_LIST_STORAGE_KEY, renderTreeList);
 
-  if (window.gon?.features?.diffSettingsUsageData) {
-    api.trackRedisHllUserEvent(TRACKING_CLICK_FILE_BROWSER_SETTING);
+  if (window.gon?.features?.diffSettingsUsageData && trackClick) {
+    const events = [TRACKING_CLICK_FILE_BROWSER_SETTING];
 
     if (renderTreeList) {
-      api.trackRedisHllUserEvent(TRACKING_FILE_BROWSER_TREE);
+      events.push(TRACKING_FILE_BROWSER_TREE);
     } else {
-      api.trackRedisHllUserEvent(TRACKING_FILE_BROWSER_LIST);
+      events.push(TRACKING_FILE_BROWSER_LIST);
     }
+
+    queueRedisHllEvents(events);
   }
 };
 
 export const setShowWhitespace = async (
   { state, commit },
-  { url, showWhitespace, updateDatabase = true },
+  { url, showWhitespace, updateDatabase = true, trackClick = true },
 ) => {
   if (updateDatabase && Boolean(window.gon?.current_user_id)) {
     await axios.put(url || state.endpointUpdateUser, { show_whitespace_in_diffs: showWhitespace });
@@ -587,14 +591,16 @@ export const setShowWhitespace = async (
   commit(types.SET_SHOW_WHITESPACE, showWhitespace);
   notesEventHub.$emit('refetchDiffData');
 
-  if (window.gon?.features?.diffSettingsUsageData) {
-    api.trackRedisHllUserEvent(TRACKING_CLICK_WHITESPACE_SETTING);
+  if (window.gon?.features?.diffSettingsUsageData && trackClick) {
+    const events = [TRACKING_CLICK_WHITESPACE_SETTING];
 
     if (showWhitespace) {
-      api.trackRedisHllUserEvent(TRACKING_WHITESPACE_SHOW);
+      events.push(TRACKING_WHITESPACE_SHOW);
     } else {
-      api.trackRedisHllUserEvent(TRACKING_WHITESPACE_HIDE);
+      events.push(TRACKING_WHITESPACE_HIDE);
     }
+
+    queueRedisHllEvents(events);
   }
 };
 
@@ -815,13 +821,15 @@ export const setFileByFile = ({ state, commit }, { fileByFile }) => {
   Cookies.set(DIFF_FILE_BY_FILE_COOKIE_NAME, fileViewMode);
 
   if (window.gon?.features?.diffSettingsUsageData) {
-    api.trackRedisHllUserEvent(TRACKING_CLICK_SINGLE_FILE_SETTING);
+    const events = [TRACKING_CLICK_SINGLE_FILE_SETTING];
 
     if (fileByFile) {
-      api.trackRedisHllUserEvent(TRACKING_SINGLE_FILE_MODE);
+      events.push(TRACKING_SINGLE_FILE_MODE);
     } else {
-      api.trackRedisHllUserEvent(TRACKING_MULTIPLE_FILES_MODE);
+      events.push(TRACKING_MULTIPLE_FILES_MODE);
     }
+
+    queueRedisHllEvents(events);
   }
 
   return axios
@@ -844,3 +852,5 @@ export function reviewFile({ commit, state }, { file, reviewed = true }) {
   setReviewsForMergeRequest(mrPath, reviews);
   commit(types.SET_MR_FILE_REVIEWS, reviews);
 }
+
+export const disableVirtualScroller = ({ commit }) => commit(types.DISABLE_VIRTUAL_SCROLLING);