Merge branch 'mw-remove-productivity_analytics_scatterplot_enabled-ff' into 'master'

Remove productivity_analytics_scatterplot_enabled feature flag

See merge request gitlab-org/gitlab!65456

ee/app/assets/javascripts/analytics/productivity_analytics/components/app.vue

@@ -118,19 +118,12 @@ export default {
       };
     },
   },
-  mounted() {
-    this.setChartEnabled({
-      chartKey: chartKeys.scatterplot,
-      isEnabled: this.isScatterplotFeatureEnabled(),
-    });
-  },
   methods: {
     ...mapActions('charts', [
       'fetchChartData',
       'setMetricType',
       'updateSelectedItems',
       'resetMainChartSelection',
-      'setChartEnabled',
     ]),
     ...mapActions('table', ['setSortField', 'setPage', 'toggleSortOrder', 'setColumnMetric']),
     onMainChartItemClicked({ params }) {
@@ -148,9 +141,6 @@ export default {
         ...this.getColumnChartDatazoomOption(chartKey),
       };
     },
-    isScatterplotFeatureEnabled() {
-      return this.glFeatures.productivityAnalyticsScatterplotEnabled;
-    },
   },
 };
 </script>

ee/app/controllers/groups/analytics/productivity_analytics_controller.rb

@@ -16,9 +16,6 @@ class Groups::Analytics::ProductivityAnalyticsController < Groups::Analytics::Ap
   before_action -> {
     authorize_view_by_action!(:view_productivity_analytics)
   }
-  before_action -> {
-    push_frontend_feature_flag(:productivity_analytics_scatterplot_enabled, default_enabled: true)
-  }
 
   before_action :validate_params, only: :show, if: -> { request.format.json? }
 

ee/config/feature_flags/development/productivity_analytics_scatterplot_enabled.yml

----
-name: productivity_analytics_scatterplot_enabled
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17735
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/13412
-milestone: '12.4'
-type: development
-group: group::optimize
-default_enabled: true

ee/spec/frontend/analytics/productivity_analytics/components/app_spec.js

@@ -49,7 +49,7 @@ describe('ProductivityApp component', () => {
 
   const mainChartData = { 1: 2, 2: 3 };
 
-  const createComponent = ({ props = {}, options = {}, scatterplotEnabled = true } = {}) => {
+  const createComponent = ({ props = {}, options = {} } = {}) => {
     const {
       modules: { charts, table, ...modules },
       ...storeConfig
@@ -82,9 +82,6 @@ describe('ProductivityApp component', () => {
         ...propsData,
         ...props,
       },
-      provide: {
-        glFeatures: { productivityAnalyticsScatterplotEnabled: scatterplotEnabled },
-      },
       ...options,
     });
 
@@ -330,11 +327,6 @@ describe('ProductivityApp component', () => {
             });
 
             describe('Scatterplot', () => {
-              describe('when the feature flag is enabled', () => {
-                it('isScatterplotFeatureEnabled returns true', () => {
-                  expect(wrapper.vm.isScatterplotFeatureEnabled()).toBe(true);
-                });
-
               it('renders a metric chart component', () => {
                 expect(findScatterplotMetricChart().exists()).toBe(true);
               });
@@ -386,21 +378,6 @@ describe('ProductivityApp component', () => {
               });
             });
 
-              describe('when the feature flag is disabled', () => {
-                beforeEach(() => {
-                  createComponent({ scatterplotEnabled: false });
-                });
-
-                it('isScatterplotFeatureEnabled returns false', () => {
-                  expect(wrapper.vm.isScatterplotFeatureEnabled()).toBe(false);
-                });
-
-                it("doesn't render a metric chart component", () => {
-                  expect(findScatterplotMetricChart().exists()).toBe(false);
-                });
-              });
-            });
-
             describe('MR table', () => {
               describe('when table is loading', () => {
                 beforeEach(() => {