Merge branch 'jdb/fix-drag-comment-tooltip' into 'master'

Fix incorrect tooltip when drag comments enabled

See merge request gitlab-org/gitlab!52595

app/assets/javascripts/diffs/components/diff_row.vue

@@ -99,10 +99,10 @@ export default {
       });
     },
     addCommentTooltipLeft() {
-      return utils.addCommentTooltip(this.line.left);
+      return utils.addCommentTooltip(this.line.left, this.glFeatures.dragCommentSelection);
     },
     addCommentTooltipRight() {
-      return utils.addCommentTooltip(this.line.right);
+      return utils.addCommentTooltip(this.line.right, this.glFeatures.dragCommentSelection);
     },
     emptyCellRightClassMap() {
       return { conflict_their: this.line.left?.type === CONFLICT_OUR };

app/assets/javascripts/diffs/components/diff_row_utils.js

@@ -50,11 +50,11 @@ export const classNameMapCell = ({ line, hll, isLoggedIn, isHover }) => {
   ];
 };
 
-export const addCommentTooltip = (line) => {
+export const addCommentTooltip = (line, dragCommentSelectionEnabled = false) => {
   let tooltip;
   if (!line) return tooltip;
 
-  tooltip = gon.drag_comment_selection
+  tooltip = dragCommentSelectionEnabled
     ? __('Add a comment to this line or drag for multiple lines')
     : __('Add a comment to this line');
   const brokenSymlinks = line.commentsDisabled;

changelogs/unreleased/jdb-fix-drag-comment-tooltip.yml

+---
+title: Fix tooltip when drag comment selection is enabled
+merge_request: 52595
+author:
+type: fixed

spec/frontend/diffs/components/diff_row_utils_spec.js

@@ -143,10 +143,21 @@ describe('addCommentTooltip', () => {
     'Commenting on symbolic links that replace or are replaced by files is currently not supported.';
   const brokenRealTooltip =
     'Commenting on files that replace or are replaced by symbolic links is currently not supported.';
+  const commentTooltip = 'Add a comment to this line';
+  const dragTooltip = 'Add a comment to this line or drag for multiple lines';
+
   it('should return default tooltip', () => {
     expect(utils.addCommentTooltip()).toBeUndefined();
   });
 
+  it('should return comment tooltip', () => {
+    expect(utils.addCommentTooltip({})).toEqual(commentTooltip);
+  });
+
+  it('should return drag comment tooltip when dragging is enabled', () => {
+    expect(utils.addCommentTooltip({}, true)).toEqual(dragTooltip);
+  });
+
   it('should return broken symlink tooltip', () => {
     expect(utils.addCommentTooltip({ commentsDisabled: { wasSymbolic: true } })).toEqual(
       brokenSymLinkTooltip,