Merge branch '351975-enable-vulnerability-report-pagination-feature-flag' into 'master'

Enable vulnerability_report_pagination feature flag by default

See merge request gitlab-org/gitlab!84553

config/feature_flags/development/vulnerability_report_page_size_selector.yml

----
-name: vulnerability_report_page_size_selector
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82438
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356888
-milestone: '14.10'
-type: development
-group: group::threat insights
-default_enabled: false

config/feature_flags/development/vulnerability_report_pagination.yml

@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351975
 milestone: '14.8'
 type: development
 group: group::threat insights
-default_enabled: false
+default_enabled: true

ee/app/assets/javascripts/security_dashboard/components/shared/vulnerability_report/vulnerability_list_graphql.vue

@@ -175,9 +175,6 @@ export default {
     shouldUsePagination() {
       return Boolean(this.glFeatures.vulnerabilityReportPagination);
     },
-    shouldShowPageSizeSelector() {
-      return Boolean(this.glFeatures.vulnerabilityReportPageSizeSelector);
-    },
   },
   watch: {
     filters(newFilters, oldFilters) {
@@ -259,11 +256,7 @@ export default {
         @prev="getPrevPage"
       />
 
-      <local-storage-sync
-        v-if="shouldShowPageSizeSelector"
-        v-model="pageSize"
-        :storage-key="$options.PAGE_SIZE_STORAGE_KEY"
-      >
+      <local-storage-sync v-model="pageSize" :storage-key="$options.PAGE_SIZE_STORAGE_KEY">
         <page-size-selector v-model="pageSize" class="gl-absolute gl-right-0" />
       </local-storage-sync>
     </div>

ee/app/controllers/ee/projects/pipelines_controller.rb

@@ -13,7 +13,6 @@ module EE
           push_frontend_feature_flag(:graphql_code_quality_full_report, project, type: :development, default_enabled: :yaml)
           push_frontend_feature_flag(:secure_vulnerability_training, project, default_enabled: :yaml)
           push_frontend_feature_flag(:vulnerability_report_pagination, current_user, default_enabled: :yaml)
-          push_frontend_feature_flag(:vulnerability_report_page_size_selector, default_enabled: :yaml)
           push_frontend_feature_flag(:use_api_for_payment_validation, project, default_enabled: :yaml)
         end
 

ee/app/controllers/groups/security/vulnerabilities_controller.rb

@@ -8,7 +8,6 @@ module Groups
       before_action do
         push_frontend_feature_flag(:vulnerability_management_survey, type: :ops, default_enabled: :yaml)
         push_frontend_feature_flag(:vulnerability_report_pagination, current_user, default_enabled: :yaml)
-        push_frontend_feature_flag(:vulnerability_report_page_size_selector, default_enabled: :yaml)
       end
 
       feature_category :vulnerability_management

ee/app/controllers/projects/security/vulnerability_report_controller.rb

@@ -10,7 +10,6 @@ module Projects
         push_frontend_feature_flag(:vulnerability_management_survey, type: :ops, default_enabled: :yaml)
         push_frontend_feature_flag(:secure_vulnerability_training, @project, default_enabled: :yaml)
         push_frontend_feature_flag(:vulnerability_report_pagination, current_user, default_enabled: :yaml)
-        push_frontend_feature_flag(:vulnerability_report_page_size_selector, default_enabled: :yaml)
         push_frontend_feature_flag(:new_vulnerability_form, @project, default_enabled: :yaml)
       end
 

ee/app/controllers/security/vulnerabilities_controller.rb

@@ -7,7 +7,6 @@ module Security
     before_action do
       push_frontend_feature_flag(:vulnerability_management_survey, type: :ops, default_enabled: :yaml)
       push_frontend_feature_flag(:vulnerability_report_pagination, current_user, default_enabled: :yaml)
-      push_frontend_feature_flag(:vulnerability_report_page_size_selector, default_enabled: :yaml)
     end
   end
 end

ee/spec/frontend/security_dashboard/components/shared/vulnerability_report/vulnerability_list_graphql_spec.js

@@ -61,7 +61,6 @@ describe('Vulnerability list GraphQL component', () => {
     showProjectNamespace = false,
     hasJiraVulnerabilitiesIntegrationEnabled = false,
     vulnerabilityReportPagination = false,
-    vulnerabilityReportPageSizeSelector = false,
     filters = {},
     fields = [],
   } = {}) => {
@@ -73,7 +72,7 @@ describe('Vulnerability list GraphQL component', () => {
         dashboardType: DASHBOARD_TYPES.GROUP,
         canViewFalsePositive,
         hasJiraVulnerabilitiesIntegrationEnabled,
-        glFeatures: { vulnerabilityReportPagination, vulnerabilityReportPageSizeSelector },
+        glFeatures: { vulnerabilityReportPagination },
       },
       propsData: {
         query: vulnerabilitiesQuery,
@@ -341,19 +340,9 @@ describe('Vulnerability list GraphQL component', () => {
       expect(findPageSizeSelector().exists()).toBe(false);
     });
 
-    it('is not shown if the pagination feature flag is on but the page size selector feature flag is off', () => {
-      createWrapper({ vulnerabilityReportPagination: true });
-
-      expect(findLocalStorageSync().exists()).toBe(false);
-      expect(findPageSizeSelector().exists()).toBe(false);
-    });
-
-    describe('both feature flags enabled', () => {
+    describe('pagination feature flag enabled', () => {
       beforeEach(() => {
-        createWrapper({
-          vulnerabilityReportPagination: true,
-          vulnerabilityReportPageSizeSelector: true,
-        });
+        createWrapper({ vulnerabilityReportPagination: true });
       });
 
       it('uses the default page size if page size selector was not changed', () => {