Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
3cd95fd6
Commit
3cd95fd6
authored
Aug 09, 2021
by
Axel Garcia
Committed by
Natalia Tepluhina
Aug 09, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Optimize trackRedisHllUserEvent calls on MRs
parent
04e6e176
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
82 additions
and
22 deletions
+82
-22
app/assets/javascripts/diffs/components/app.vue
app/assets/javascripts/diffs/components/app.vue
+13
-8
app/assets/javascripts/diffs/constants.js
app/assets/javascripts/diffs/constants.js
+2
-0
app/assets/javascripts/diffs/store/actions.js
app/assets/javascripts/diffs/store/actions.js
+18
-14
app/assets/javascripts/diffs/utils/queue_events.js
app/assets/javascripts/diffs/utils/queue_events.js
+13
-0
spec/frontend/diffs/utils/queue_events_spec.js
spec/frontend/diffs/utils/queue_events_spec.js
+36
-0
No files found.
app/assets/javascripts/diffs/components/app.vue
View file @
3cd95fd6
...
@@ -46,6 +46,7 @@ import diffsEventHub from '../event_hub';
...
@@ -46,6 +46,7 @@ import diffsEventHub from '../event_hub';
import
{
reviewStatuses
}
from
'
../utils/file_reviews
'
;
import
{
reviewStatuses
}
from
'
../utils/file_reviews
'
;
import
{
diffsApp
}
from
'
../utils/performance
'
;
import
{
diffsApp
}
from
'
../utils/performance
'
;
import
{
fileByFile
}
from
'
../utils/preferences
'
;
import
{
fileByFile
}
from
'
../utils/preferences
'
;
import
{
queueRedisHllEvents
}
from
'
../utils/queue_events
'
;
import
CollapsedFilesWarning
from
'
./collapsed_files_warning.vue
'
;
import
CollapsedFilesWarning
from
'
./collapsed_files_warning.vue
'
;
import
CommitWidget
from
'
./commit_widget.vue
'
;
import
CommitWidget
from
'
./commit_widget.vue
'
;
import
CompareVersions
from
'
./compare_versions.vue
'
;
import
CompareVersions
from
'
./compare_versions.vue
'
;
...
@@ -337,29 +338,33 @@ export default {
...
@@ -337,29 +338,33 @@ export default {
}
}
if
(
window
.
gon
?.
features
?.
diffSettingsUsageData
)
{
if
(
window
.
gon
?.
features
?.
diffSettingsUsageData
)
{
const
events
=
[];
if
(
this
.
renderTreeList
)
{
if
(
this
.
renderTreeList
)
{
api
.
trackRedisHllUserEvent
(
TRACKING_FILE_BROWSER_TREE
);
events
.
push
(
TRACKING_FILE_BROWSER_TREE
);
}
else
{
}
else
{
api
.
trackRedisHllUserEvent
(
TRACKING_FILE_BROWSER_LIST
);
events
.
push
(
TRACKING_FILE_BROWSER_LIST
);
}
}
if
(
this
.
diffViewType
===
INLINE_DIFF_VIEW_TYPE
)
{
if
(
this
.
diffViewType
===
INLINE_DIFF_VIEW_TYPE
)
{
api
.
trackRedisHllUserEvent
(
TRACKING_DIFF_VIEW_INLINE
);
events
.
push
(
TRACKING_DIFF_VIEW_INLINE
);
}
else
{
}
else
{
api
.
trackRedisHllUserEvent
(
TRACKING_DIFF_VIEW_PARALLEL
);
events
.
push
(
TRACKING_DIFF_VIEW_PARALLEL
);
}
}
if
(
this
.
showWhitespace
)
{
if
(
this
.
showWhitespace
)
{
api
.
trackRedisHllUserEvent
(
TRACKING_WHITESPACE_SHOW
);
events
.
push
(
TRACKING_WHITESPACE_SHOW
);
}
else
{
}
else
{
api
.
trackRedisHllUserEvent
(
TRACKING_WHITESPACE_HIDE
);
events
.
push
(
TRACKING_WHITESPACE_HIDE
);
}
}
if
(
this
.
viewDiffsFileByFile
)
{
if
(
this
.
viewDiffsFileByFile
)
{
api
.
trackRedisHllUserEvent
(
TRACKING_SINGLE_FILE_MODE
);
events
.
push
(
TRACKING_SINGLE_FILE_MODE
);
}
else
{
}
else
{
api
.
trackRedisHllUserEvent
(
TRACKING_MULTIPLE_FILES_MODE
);
events
.
push
(
TRACKING_MULTIPLE_FILES_MODE
);
}
}
queueRedisHllEvents
(
events
);
}
}
},
},
beforeCreate
()
{
beforeCreate
()
{
...
...
app/assets/javascripts/diffs/constants.js
View file @
3cd95fd6
...
@@ -111,6 +111,8 @@ export const CONFLICT_MARKER_OUR = 'conflict_marker_our';
...
@@ -111,6 +111,8 @@ export const CONFLICT_MARKER_OUR = 'conflict_marker_our';
export
const
CONFLICT_MARKER_THEIR
=
'
conflict_marker_their
'
;
export
const
CONFLICT_MARKER_THEIR
=
'
conflict_marker_their
'
;
// Tracking events
// Tracking events
export
const
DEFER_DURATION
=
750
;
export
const
TRACKING_CLICK_DIFF_VIEW_SETTING
=
'
i_code_review_click_diff_view_setting
'
;
export
const
TRACKING_CLICK_DIFF_VIEW_SETTING
=
'
i_code_review_click_diff_view_setting
'
;
export
const
TRACKING_DIFF_VIEW_INLINE
=
'
i_code_review_diff_view_inline
'
;
export
const
TRACKING_DIFF_VIEW_INLINE
=
'
i_code_review_diff_view_inline
'
;
export
const
TRACKING_DIFF_VIEW_PARALLEL
=
'
i_code_review_diff_view_parallel
'
;
export
const
TRACKING_DIFF_VIEW_PARALLEL
=
'
i_code_review_diff_view_parallel
'
;
...
...
app/assets/javascripts/diffs/store/actions.js
View file @
3cd95fd6
import
Cookies
from
'
js-cookie
'
;
import
Cookies
from
'
js-cookie
'
;
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
api
from
'
~/api
'
;
import
createFlash
from
'
~/flash
'
;
import
createFlash
from
'
~/flash
'
;
import
{
diffViewerModes
}
from
'
~/ide/constants
'
;
import
{
diffViewerModes
}
from
'
~/ide/constants
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
...
@@ -50,6 +49,7 @@ import eventHub from '../event_hub';
...
@@ -50,6 +49,7 @@ import eventHub from '../event_hub';
import
{
isCollapsed
}
from
'
../utils/diff_file
'
;
import
{
isCollapsed
}
from
'
../utils/diff_file
'
;
import
{
markFileReview
,
setReviewsForMergeRequest
}
from
'
../utils/file_reviews
'
;
import
{
markFileReview
,
setReviewsForMergeRequest
}
from
'
../utils/file_reviews
'
;
import
{
getDerivedMergeRequestInformation
}
from
'
../utils/merge_request
'
;
import
{
getDerivedMergeRequestInformation
}
from
'
../utils/merge_request
'
;
import
{
queueRedisHllEvents
}
from
'
../utils/queue_events
'
;
import
TreeWorker
from
'
../workers/tree_worker
'
;
import
TreeWorker
from
'
../workers/tree_worker
'
;
import
*
as
types
from
'
./mutation_types
'
;
import
*
as
types
from
'
./mutation_types
'
;
import
{
import
{
...
@@ -368,8 +368,7 @@ export const setInlineDiffViewType = ({ commit }) => {
...
@@ -368,8 +368,7 @@ export const setInlineDiffViewType = ({ commit }) => {
historyPushState
(
url
);
historyPushState
(
url
);
if
(
window
.
gon
?.
features
?.
diffSettingsUsageData
)
{
if
(
window
.
gon
?.
features
?.
diffSettingsUsageData
)
{
api
.
trackRedisHllUserEvent
(
TRACKING_CLICK_DIFF_VIEW_SETTING
);
queueRedisHllEvents
([
TRACKING_CLICK_DIFF_VIEW_SETTING
,
TRACKING_DIFF_VIEW_INLINE
]);
api
.
trackRedisHllUserEvent
(
TRACKING_DIFF_VIEW_INLINE
);
}
}
};
};
...
@@ -381,8 +380,7 @@ export const setParallelDiffViewType = ({ commit }) => {
...
@@ -381,8 +380,7 @@ export const setParallelDiffViewType = ({ commit }) => {
historyPushState
(
url
);
historyPushState
(
url
);
if
(
window
.
gon
?.
features
?.
diffSettingsUsageData
)
{
if
(
window
.
gon
?.
features
?.
diffSettingsUsageData
)
{
api
.
trackRedisHllUserEvent
(
TRACKING_CLICK_DIFF_VIEW_SETTING
);
queueRedisHllEvents
([
TRACKING_CLICK_DIFF_VIEW_SETTING
,
TRACKING_DIFF_VIEW_PARALLEL
]);
api
.
trackRedisHllUserEvent
(
TRACKING_DIFF_VIEW_PARALLEL
);
}
}
};
};
...
@@ -566,13 +564,15 @@ export const setRenderTreeList = ({ commit }, { renderTreeList, trackClick = tru
...
@@ -566,13 +564,15 @@ export const setRenderTreeList = ({ commit }, { renderTreeList, trackClick = tru
localStorage
.
setItem
(
TREE_LIST_STORAGE_KEY
,
renderTreeList
);
localStorage
.
setItem
(
TREE_LIST_STORAGE_KEY
,
renderTreeList
);
if
(
window
.
gon
?.
features
?.
diffSettingsUsageData
&&
trackClick
)
{
if
(
window
.
gon
?.
features
?.
diffSettingsUsageData
&&
trackClick
)
{
api
.
trackRedisHllUserEvent
(
TRACKING_CLICK_FILE_BROWSER_SETTING
)
;
const
events
=
[
TRACKING_CLICK_FILE_BROWSER_SETTING
]
;
if
(
renderTreeList
)
{
if
(
renderTreeList
)
{
api
.
trackRedisHllUserEvent
(
TRACKING_FILE_BROWSER_TREE
);
events
.
push
(
TRACKING_FILE_BROWSER_TREE
);
}
else
{
}
else
{
api
.
trackRedisHllUserEvent
(
TRACKING_FILE_BROWSER_LIST
);
events
.
push
(
TRACKING_FILE_BROWSER_LIST
);
}
}
queueRedisHllEvents
(
events
);
}
}
};
};
...
@@ -588,13 +588,15 @@ export const setShowWhitespace = async (
...
@@ -588,13 +588,15 @@ export const setShowWhitespace = async (
notesEventHub
.
$emit
(
'
refetchDiffData
'
);
notesEventHub
.
$emit
(
'
refetchDiffData
'
);
if
(
window
.
gon
?.
features
?.
diffSettingsUsageData
&&
trackClick
)
{
if
(
window
.
gon
?.
features
?.
diffSettingsUsageData
&&
trackClick
)
{
api
.
trackRedisHllUserEvent
(
TRACKING_CLICK_WHITESPACE_SETTING
)
;
const
events
=
[
TRACKING_CLICK_WHITESPACE_SETTING
]
;
if
(
showWhitespace
)
{
if
(
showWhitespace
)
{
api
.
trackRedisHllUserEvent
(
TRACKING_WHITESPACE_SHOW
);
events
.
push
(
TRACKING_WHITESPACE_SHOW
);
}
else
{
}
else
{
api
.
trackRedisHllUserEvent
(
TRACKING_WHITESPACE_HIDE
);
events
.
push
(
TRACKING_WHITESPACE_HIDE
);
}
}
queueRedisHllEvents
(
events
);
}
}
};
};
...
@@ -815,13 +817,15 @@ export const setFileByFile = ({ state, commit }, { fileByFile }) => {
...
@@ -815,13 +817,15 @@ export const setFileByFile = ({ state, commit }, { fileByFile }) => {
Cookies
.
set
(
DIFF_FILE_BY_FILE_COOKIE_NAME
,
fileViewMode
);
Cookies
.
set
(
DIFF_FILE_BY_FILE_COOKIE_NAME
,
fileViewMode
);
if
(
window
.
gon
?.
features
?.
diffSettingsUsageData
)
{
if
(
window
.
gon
?.
features
?.
diffSettingsUsageData
)
{
api
.
trackRedisHllUserEvent
(
TRACKING_CLICK_SINGLE_FILE_SETTING
)
;
const
events
=
[
TRACKING_CLICK_SINGLE_FILE_SETTING
]
;
if
(
fileByFile
)
{
if
(
fileByFile
)
{
api
.
trackRedisHllUserEvent
(
TRACKING_SINGLE_FILE_MODE
);
events
.
push
(
TRACKING_SINGLE_FILE_MODE
);
}
else
{
}
else
{
api
.
trackRedisHllUserEvent
(
TRACKING_MULTIPLE_FILES_MODE
);
events
.
push
(
TRACKING_MULTIPLE_FILES_MODE
);
}
}
queueRedisHllEvents
(
events
);
}
}
return
axios
return
axios
...
...
app/assets/javascripts/diffs/utils/queue_events.js
0 → 100644
View file @
3cd95fd6
import
{
delay
}
from
'
lodash
'
;
import
api
from
'
~/api
'
;
import
{
DEFER_DURATION
}
from
'
../constants
'
;
function
trackRedisHllUserEvent
(
event
,
deferDuration
=
0
)
{
delay
(()
=>
api
.
trackRedisHllUserEvent
(
event
),
deferDuration
);
}
export
function
queueRedisHllEvents
(
events
)
{
events
.
forEach
((
event
,
index
)
=>
{
trackRedisHllUserEvent
(
event
,
DEFER_DURATION
*
(
index
+
1
));
});
}
spec/frontend/diffs/utils/queue_events_spec.js
0 → 100644
View file @
3cd95fd6
import
api
from
'
~/api
'
;
import
{
DEFER_DURATION
}
from
'
~/diffs/constants
'
;
import
{
queueRedisHllEvents
}
from
'
~/diffs/utils/queue_events
'
;
jest
.
mock
(
'
~/api
'
,
()
=>
({
trackRedisHllUserEvent
:
jest
.
fn
(),
}));
describe
(
'
diffs events queue
'
,
()
=>
{
describe
(
'
queueRedisHllEvents
'
,
()
=>
{
it
(
'
does not dispatch the event immediately
'
,
()
=>
{
queueRedisHllEvents
([
'
know_event
'
]);
expect
(
api
.
trackRedisHllUserEvent
).
not
.
toHaveBeenCalled
();
});
it
(
'
does dispatch the event after the defer duration
'
,
()
=>
{
queueRedisHllEvents
([
'
know_event
'
]);
jest
.
advanceTimersByTime
(
DEFER_DURATION
+
1
);
expect
(
api
.
trackRedisHllUserEvent
).
toHaveBeenCalled
();
});
it
(
'
increase defer duration based on the provided events count
'
,
()
=>
{
let
deferDuration
=
DEFER_DURATION
+
1
;
const
events
=
[
'
know_event_a
'
,
'
know_event_b
'
,
'
know_event_c
'
];
queueRedisHllEvents
(
events
);
expect
(
api
.
trackRedisHllUserEvent
).
not
.
toHaveBeenCalled
();
events
.
forEach
((
event
,
index
)
=>
{
jest
.
advanceTimersByTime
(
deferDuration
);
expect
(
api
.
trackRedisHllUserEvent
).
toHaveBeenLastCalledWith
(
event
);
deferDuration
*=
index
+
1
;
});
});
});
});
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment