Merge branch 'ph/addedImprovedAwardPickertToEpics' into 'master'

Added new award picker to epics

See merge request gitlab-org/gitlab!61007

ee/app/assets/javascripts/pages/groups/epics/show/index.js

@@ -8,8 +8,16 @@ import '~/notes/index';
 initEpicApp();
 
 requestIdleCallback(() => {
+  const awardEmojiEl = document.getElementById('js-vue-awards-block');
+
   new EpicTabs(); // eslint-disable-line no-new
   new ShortcutsEpic(); // eslint-disable-line no-new
+  if (awardEmojiEl) {
+    import('~/emoji/awards_app')
+      .then((m) => m.default(awardEmojiEl))
+      .catch(() => {});
+  } else {
     loadAwardsHandler();
+  }
   new ZenMode(); // eslint-disable-line no-new
 });

ee/app/controllers/groups/epics_controller.rb

@@ -19,6 +19,7 @@ class Groups::EpicsController < Groups::ApplicationController
 
   before_action do
     push_frontend_feature_flag(:vue_epics_list, @group, type: :development, default_enabled: :yaml)
+    push_frontend_feature_flag(:improved_emoji_picker, @group, type: :development, default_enabled: :yaml)
   end
 
   feature_category :epics

ee/app/helpers/epics_helper.rb

@@ -57,4 +57,10 @@ module EpicsHelper
       s_("GroupRoadmap|No start date – %{dateWord}") % { dateWord: epic.end_date.strftime(long_format) }
     end
   end
+
+  def award_emoji_epics_api_path(epic)
+    if Feature.enabled?(:improved_emoji_picker, epic.group, default_enabled: :yaml)
+      api_v4_groups_epics_award_emoji_path(id: epic.group.id, epic_iid: epic.iid)
+    end
+  end
 end

ee/app/views/groups/epics/show.html.haml

@@ -77,7 +77,7 @@
               child_epics: 'true' } }
   %hr.epic-discussion-separator.mt-1.mb-0
   .d-flex.justify-content-between.content-block.content-block-small.emoji-list-container.js-noteable-awards
-    = render 'award_emoji/awards_block', awardable: @epic, inline: true
+    = render 'award_emoji/awards_block', awardable: @epic, inline: true, api_awards_path: award_emoji_epics_api_path(@epic)
     .d-flex.flex-wrap.align-items-center.justify-content-lg-end
       #js-vue-sort-issue-discussions
       #js-vue-discussion-filter{ data: { default_filter: current_user&.notes_filter_for(@epic),