Merge branch 'revert-ff11df1f' into 'master'

Revert "Merge branch 'remove-scoped-labels-feature-flag' into 'master'"

See merge request gitlab-org/gitlab!45230

app/assets/javascripts/issues_list/components/issuable.vue

@@ -28,6 +28,7 @@ import initUserPopovers from '~/user_popovers';
 import { mergeUrlParams } from '~/lib/utils/url_utility';
 import IssueAssignees from '~/vue_shared/components/issue/issue_assignees.vue';
 import { isScopedLabel } from '~/lib/utils/common_utils';
+import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 
 import { convertToCamelCase } from '~/lib/utils/text_utility';
 
@@ -36,9 +37,6 @@ export default {
     openedAgo: __('opened %{timeAgoString} by %{user}'),
     openedAgoJira: __('opened %{timeAgoString} by %{user} in Jira'),
   },
-  inject: {
-    scopedLabels: ['scopedLabels'],
-  },
   components: {
     IssueAssignees,
     GlLink,
@@ -52,6 +50,7 @@ export default {
     GlTooltip,
     SafeHtml,
   },
+  mixins: [glFeatureFlagsMixin()],
   props: {
     issuable: {
       type: Object,
@@ -86,6 +85,9 @@ export default {
 
       return this.issuableLink({ milestone_title: title });
     },
+    scopedLabelsAvailable() {
+      return this.glFeatures.scopedLabels;
+    },
     hasWeight() {
       return isNumber(this.issuable.weight);
     },
@@ -219,7 +221,7 @@ export default {
       return mergeUrlParams(params, this.baseUrl);
     },
     isScoped({ name }) {
-      return isScopedLabel({ title: name }) && this.scopedLabels;
+      return isScopedLabel({ title: name }) && this.scopedLabelsAvailable;
     },
     labelHref({ name }) {
       if (this.isJiraIssue) {

app/assets/javascripts/issues_list/index.js

@@ -41,13 +41,10 @@ function mountIssuablesListApp() {
   }
 
   document.querySelectorAll('.js-issuables-list').forEach(el => {
-    const { canBulkEdit, emptyStateMeta = {}, scopedLabels, ...data } = el.dataset;
+    const { canBulkEdit, emptyStateMeta = {}, ...data } = el.dataset;
 
     return new Vue({
       el,
-      provide: {
-        scopedLabels: parseBoolean(scopedLabels),
-      },
       render(createElement) {
         return createElement(IssuablesListApp, {
           props: {

app/controllers/concerns/issuable_actions.rb

@@ -8,6 +8,9 @@ module IssuableActions
     before_action :authorize_destroy_issuable!, only: :destroy
     before_action :check_destroy_confirmation!, only: :destroy
     before_action :authorize_admin_issuable!, only: :bulk_update
+    before_action only: :show do
+      push_frontend_feature_flag(:scoped_labels, type: :licensed, default_enabled: true)
+    end
     before_action do
       push_frontend_feature_flag(:not_issuable_queries, @project, default_enabled: true)
     end

app/controllers/projects/issues_controller.rb

@@ -57,6 +57,10 @@ class Projects::IssuesController < Projects::ApplicationController
     record_experiment_user(:invite_members_version_b)
   end
 
+  before_action only: :index do
+    push_frontend_feature_flag(:scoped_labels, @project, type: :licensed)
+  end
+
   around_action :allow_gitaly_ref_name_caching, only: [:discussions]
 
   respond_to :html

app/views/groups/issues.html.haml

@@ -30,7 +30,6 @@
       'can-bulk-edit': @can_bulk_update.to_json,
       'empty-state-meta': { svg_path: image_path('illustrations/issues.svg') },
       'sort-key': @sort,
-      type: 'issues',
-      'scoped-labels': @group.feature_available?(:scoped_labels).to_json } }
+      type: 'issues' } }
   - else
     = render 'shared/issues'

app/views/projects/issues/_issues.html.haml

@@ -11,8 +11,7 @@
     'empty-state-meta': data_empty_state_meta.to_json,
     'can-bulk-edit': @can_bulk_update.to_json,
     'sort-key': @sort,
-    type: type,
-    'scoped-labels': @project.feature_available?(:scoped_labels).to_json } }
+    type: type } }
 - else
   - empty_state_path = local_assigns.fetch(:empty_state_path, 'shared/empty_states/issues')
   %ul.content-list.issues-list.issuable-list{ class: ("manual-ordering" if @sort == 'relative_position') }

ee/app/controllers/ee/groups_controller.rb

@@ -11,6 +11,10 @@ module EE
 
       before_action :ee_authorize_admin_group!, only: [:restore]
 
+      before_action only: :issues do
+        push_frontend_feature_flag(:scoped_labels, @group, type: :licensed)
+      end
+
       feature_category :subgroups, [:restore]
     end
 

ee/app/views/projects/integrations/jira/issues/index.html.haml

@@ -10,5 +10,4 @@
   'empty-state-meta': { svg_path: image_path('illustrations/issues.svg') },
   'sort-key': @sort,
   type: 'jira',
-  'project-path': @project.full_path,
-  'scoped-labels': @project.feature_available?(:scoped_labels).to_json } }
+  project_path: @project.full_path, } }

spec/frontend/issues_list/components/issuable_spec.js

@@ -46,7 +46,9 @@ describe('Issuable component', () => {
         ...props,
       },
       provide: {
-        scopedLabels,
+        glFeatures: {
+          scopedLabels,
+        },
       },
       stubs: {
         'gl-sprintf': GlSprintf,