Remove resolve comment functionality

Removes the resolve button from each note component
Instead only the first note has this button,
when this button is clicked it resolves the whole thread.

Closes https://gitlab.com/gitlab-org/gitlab/-/issues/28750

app/assets/javascripts/batch_comments/mixins/resolved_status.js

 import { mapGetters } from 'vuex';
 import { sprintf, s__, __ } from '~/locale';
+import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 
 export default {
+  mixins: [glFeatureFlagsMixin()],
   props: {
     discussionId: {
       type: String,
@@ -54,6 +56,10 @@ export default {
 
       let title = __('Mark as resolved');
 
+      if (this.glFeatures.removeResolveNote) {
+        title = __('Resolve thread');
+      }
+
       if (this.resolvedBy) {
         title = sprintf(__('Resolved by %{name}'), { name: this.resolvedBy.name });
       }

app/assets/javascripts/notes/components/discussion_notes.vue

@@ -127,6 +127,7 @@ export default {
           :help-page-path="helpPagePath"
           :show-reply-button="userCanReply"
           :discussion-root="true"
+          :discussion-resolve-path="discussion.resolve_path"
           @handleDeleteNote="$emit('deleteNote')"
           @startReplying="$emit('startReplying')"
         >
@@ -171,6 +172,7 @@ export default {
           :help-page-path="helpPagePath"
           :line="diffLine"
           :discussion-root="index === 0"
+          :discussion-resolve-path="discussion.resolve_path"
           @handleDeleteNote="$emit('deleteNote')"
         >
           <slot v-if="index === 0" slot="avatar-badge" name="avatar-badge"></slot>

app/assets/javascripts/notes/components/noteable_note.vue

@@ -73,6 +73,11 @@ export default {
       required: false,
       default: false,
     },
+    discussionResolvePath: {
+      type: String,
+      required: false,
+      default: '',
+    },
   },
   data() {
     return {
@@ -81,6 +86,7 @@ export default {
       isRequesting: false,
       isResolving: false,
       commentLineStart: {},
+      resolveAsThread: this.glFeatures.removeResolveNote,
     };
   },
   computed: {
@@ -133,6 +139,8 @@ export default {
       return this.note.isDraft;
     },
     canResolve() {
+      if (this.glFeatures.removeResolveNote && !this.discussionRoot) return false;
+
       return (
         this.note.current_user.can_resolve ||
         (this.note.isDraft && this.note.discussion_id !== null)

app/assets/javascripts/notes/mixins/resolvable.js

 import { deprecatedCreateFlash as Flash } from '~/flash';
 import { __ } from '~/locale';
+import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 
 export default {
+  mixins: [glFeatureFlagsMixin()],
   computed: {
     discussionResolved() {
       if (this.discussion) {
         const { notes, resolved } = this.discussion;
 
+        if (this.glFeatures.removeResolveNote) {
+          return resolved;
+        }
+
         if (notes) {
           // Decide resolved state using store. Only valid for discussions.
           return notes.filter(note => !note.system).every(note => note.resolved);
@@ -38,7 +44,12 @@ export default {
       this.isResolving = true;
       const isResolved = this.discussionResolved || resolvedState;
       const discussion = this.resolveAsThread;
-      const endpoint = discussion ? this.discussion.resolve_path : `${this.note.path}/resolve`;
+      let endpoint =
+        discussion && this.discussion ? this.discussion.resolve_path : `${this.note.path}/resolve`;
+
+      if (this.glFeatures.removeResolveNote && this.discussionResolvePath) {
+        endpoint = this.discussionResolvePath;
+      }
 
       return this.toggleResolveNote({ endpoint, isResolved, discussion })
         .then(() => {

app/controllers/projects/merge_requests_controller.rb

@@ -40,6 +40,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
     push_frontend_feature_flag(:highlight_current_diff_row, @project)
     push_frontend_feature_flag(:default_merge_ref_for_diffs, @project)
     push_frontend_feature_flag(:core_security_mr_widget, @project, default_enabled: true)
+    push_frontend_feature_flag(:remove_resolve_note, @project)
 
     record_experiment_user(:invite_members_version_a)
     record_experiment_user(:invite_members_version_b)

changelogs/unreleased/ph-28750-removeResolveCommentButton.yml

+---
+title: Remove resolve comment functionality
+merge_request: 45549
+author:
+type: changed

config/feature_flags/development/remove_resolve_note.yml

+---
+name: remove_resolve_note
+introduced_by_url:
+rollout_issue_url:
+type: development
+group: group::source code
+default_enabled: false

spec/features/discussion_comments/merge_request_spec.rb

@@ -8,6 +8,8 @@ RSpec.describe 'Thread Comments Merge Request', :js do
   let(:merge_request) { create(:merge_request, source_project: project) }
 
   before do
+    stub_feature_flags(remove_resolve_note: false)
+
     project.add_maintainer(user)
     sign_in(user)
 

spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb

@@ -18,6 +18,10 @@ RSpec.describe 'Resolving all open threads in a merge request from an issue', :j
     end
   end
 
+  before do
+    stub_feature_flags(remove_resolve_note: false)
+  end
+
   describe 'as a user with access to the project' do
     before do
       project.add_maintainer(user)

spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb

@@ -14,6 +14,10 @@ RSpec.describe 'Resolve an open thread in a merge request by creating an issue',
     "a[title=\"#{title}\"][href=\"#{url}\"]"
   end
 
+  before do
+    stub_feature_flags(remove_resolve_note: false)
+  end
+
   describe 'As a user with access to the project' do
     before do
       project.add_maintainer(user)

spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb

@@ -15,6 +15,10 @@ RSpec.describe 'Merge request > User resolves diff notes and threads', :js do
           diff_refs: merge_request.diff_refs)
   end
 
+  before do
+    stub_feature_flags(remove_resolve_note: false)
+  end
+
   context 'no threads' do
     before do
       project.add_maintainer(user)