Merge branch '6676-extract-ee-specific-files-lines-for-discussion-app-helpers' into 'master'

Resolve "Extract EE specific files/lines for Discussion app/helpers"

Closes #6676

See merge request gitlab-org/gitlab-ee!6891

app/helpers/issuables_helper.rb

@@ -254,7 +254,6 @@ module IssuablesHelper
       updateEndpoint: "#{issuable_path(issuable)}.json",
       canUpdate: can?(current_user, :"update_#{issuable.to_ability_name}", issuable),
       canDestroy: can?(current_user, :"destroy_#{issuable.to_ability_name}", issuable),
-      canAdmin: can?(current_user, :"admin_#{issuable.to_ability_name}", issuable),
       issuableRef: issuable.to_reference,
       markdownPreviewPath: preview_markdown_path(parent),
       markdownDocsPath: help_page_path('user/markdown'),
@@ -269,7 +268,6 @@ module IssuablesHelper
 
     if parent.is_a?(Group)
       data[:groupPath] = parent.path
-      data[:issueLinksEndpoint] = group_epic_issues_path(parent, issuable)
     else
       data.merge!(projectPath: ref_project.path, projectNamespace: ref_project.namespace.full_path)
     end

app/helpers/system_note_helper.rb

@@ -22,10 +22,6 @@ module SystemNoteHelper
     'moved' => 'arrow-right',
     'outdated' => 'pencil-square',
     'duplicate' => 'issue-duplicate',
-    'approved' => 'approval',
-    'unapproved' => 'unapproval',
-    'relate' => 'link',
-    'unrelate' => 'unlink',
     'locked' => 'lock',
     'unlocked' => 'lock-open'
   }.freeze

ee/app/helpers/ee/issuables_helper.rb

@@ -9,5 +9,18 @@ module EE
         weightNoneValue: ::Issue::WEIGHT_NONE
       )
     end
+
+    override :issuable_initial_data
+    def issuable_initial_data(issuable)
+      data = super.merge(
+        canAdmin: can?(current_user, :"admin_#{issuable.to_ability_name}", issuable)
+      )
+
+      if parent.is_a?(Group)
+        data[:issueLinksEndpoint] = group_epic_issues_path(parent, issuable)
+      end
+
+      data
+    end
   end
 end

ee/app/helpers/ee/system_note_helper.rb

@@ -3,6 +3,10 @@ module EE
     extend ::Gitlab::Utils::Override
 
     EE_ICON_NAMES_BY_ACTION = {
+      'approved' => 'approval',
+      'unapproved' => 'unapproval',
+      'relate' => 'link',
+      'unrelate' => 'unlink',
       'epic_issue_added' => 'issues',
       'epic_issue_removed' => 'issues',
       'epic_issue_moved' => 'issues',