From c25ca70a7466c6579bd5d8e346a92af99cf10f4d Mon Sep 17 00:00:00 2001
From: Eugie Limpin <elimpin@gitlab.com>
Date: Mon, 22 Sep 2025 10:43:51 +0800
Subject: [PATCH] Remove custom_ability_read_admin_projects feature flag

- Admin users can now create custom admin roles with the
  read_admin_projects ability
- Update GraphQL endpoint in /admin/projects from :projects to
  :admin_projects to support displaying unauthorized projects to
  non-admin users with read_admin_projects permission

Changelog: changed
---
 .../admin/projects/index/components/app.vue   | 16 +------
 .../admin/projects/index/constants.js         |  2 +-
 .../queries/admin_projects.query.graphql      |  4 +-
 .../graphql/queries/projects.query.graphql    | 42 -------------------
 .../ee/admin/projects_controller.rb           |  4 --
 .../custom_ability_read_admin_projects.yml    | 10 -----
 .../projects/index/components/app_spec.js     | 31 +++-----------
 spec/frontend/fixtures/admin.rb               |  2 +-
 8 files changed, 11 insertions(+), 100 deletions(-)
 delete mode 100644 app/assets/javascripts/admin/projects/index/graphql/queries/projects.query.graphql
 delete mode 100644 ee/config/feature_flags/beta/custom_ability_read_admin_projects.yml

diff --git a/app/assets/javascripts/admin/projects/index/components/app.vue b/app/assets/javascripts/admin/projects/index/components/app.vue
index fb4805a2195b74..c1500ef44113eb 100644
--- a/app/assets/javascripts/admin/projects/index/components/app.vue
+++ b/app/assets/javascripts/admin/projects/index/components/app.vue
@@ -8,13 +8,11 @@ import {
   FILTERED_SEARCH_TOKEN_REPOSITORY_CHECK_FAILED,
 } from '~/groups_projects/constants';
 import { RECENT_SEARCHES_STORAGE_KEY_PROJECTS } from '~/filtered_search/recent_searches_storage_keys';
-import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import {
   TIMESTAMP_TYPE_CREATED_AT,
   TIMESTAMP_TYPE_LAST_ACTIVITY_AT,
 } from '~/vue_shared/components/resource_lists/constants';
 import projectCountsQuery from '~/admin/projects/index/graphql/queries/project_counts.query.graphql';
-import adminProjectsQuery from '~/admin/projects/index/graphql/queries/admin_projects.query.graphql';
 import {
   ADMIN_PROJECTS_TABS,
   SORT_OPTIONS,
@@ -49,30 +47,18 @@ export default {
   components: {
     TabsWithList,
   },
-  mixins: [glFeatureFlagMixin()],
   props: {
     programmingLanguages: {
       type: Array,
       required: true,
     },
   },
-  computed: {
-    tabs() {
-      const tabs = this.$options.ADMIN_PROJECTS_TABS;
-
-      if (this.glFeatures.customAbilityReadAdminProjects) {
-        return tabs.map((tab) => ({ ...tab, query: adminProjectsQuery }));
-      }
-
-      return tabs;
-    },
-  },
 };
 </script>
 
 <template>
   <tabs-with-list
-    :tabs="tabs"
+    :tabs="$options.ADMIN_PROJECTS_TABS"
     :filtered-search-supported-tokens="$options.filteredSearchSupportedTokens"
     :filtered-search-term-key="$options.FILTERED_SEARCH_TERM_KEY"
     :filtered-search-namespace="$options.FILTERED_SEARCH_NAMESPACE"
diff --git a/app/assets/javascripts/admin/projects/index/constants.js b/app/assets/javascripts/admin/projects/index/constants.js
index 4bc6eb2592a911..cfeb70f9606e27 100644
--- a/app/assets/javascripts/admin/projects/index/constants.js
+++ b/app/assets/javascripts/admin/projects/index/constants.js
@@ -15,7 +15,7 @@ import {
   SORT_LABEL_UPDATED,
   PAGINATION_TYPE_KEYSET,
 } from '~/groups_projects/constants';
-import projectsQuery from './graphql/queries/projects.query.graphql';
+import projectsQuery from './graphql/queries/admin_projects.query.graphql';
 
 const baseTab = {
   listComponent: ProjectsList,
diff --git a/app/assets/javascripts/admin/projects/index/graphql/queries/admin_projects.query.graphql b/app/assets/javascripts/admin/projects/index/graphql/queries/admin_projects.query.graphql
index 9e3593d40a5710..aa6fc3f7548f49 100644
--- a/app/assets/javascripts/admin/projects/index/graphql/queries/admin_projects.query.graphql
+++ b/app/assets/javascripts/admin/projects/index/graphql/queries/admin_projects.query.graphql
@@ -4,7 +4,7 @@
 #import "~/graphql_shared/fragments/project_interface.fragment.graphql"
 #import "~/admin/projects/index/graphql/fragments/admin_project.fragment.graphql"
 
-query getAdminProjectsNew(
+query getAdminProjects(
   $active: Boolean
   $first: Int
   $last: Int
@@ -16,6 +16,7 @@ query getAdminProjectsNew(
   $visibilityLevel: VisibilityLevelsEnum
   $programmingLanguageName: String
   $namespacePath: ID
+  $lastRepositoryCheckFailed: Boolean
 ) {
   projects: adminProjects(
     active: $active
@@ -29,6 +30,7 @@ query getAdminProjectsNew(
     programmingLanguageName: $programmingLanguageName
     visibilityLevel: $visibilityLevel
     namespacePath: $namespacePath
+    lastRepositoryCheckFailed: $lastRepositoryCheckFailed
   ) {
     count
     nodes {
diff --git a/app/assets/javascripts/admin/projects/index/graphql/queries/projects.query.graphql b/app/assets/javascripts/admin/projects/index/graphql/queries/projects.query.graphql
deleted file mode 100644
index c9f754af4af5bf..00000000000000
--- a/app/assets/javascripts/admin/projects/index/graphql/queries/projects.query.graphql
+++ /dev/null
@@ -1,42 +0,0 @@
-#import "~/graphql_shared/fragments/page_info.fragment.graphql"
-#import "~/graphql_shared/fragments/project.fragment.graphql"
-#import "~/admin/projects/index/graphql/fragments/admin_project.fragment.graphql"
-
-query getAdminProjects(
-  $active: Boolean
-  $first: Int
-  $last: Int
-  $before: String
-  $after: String
-  $sort: String
-  $search: String
-  $minAccessLevel: AccessLevelEnum
-  $visibilityLevel: VisibilityLevelsEnum
-  $programmingLanguageName: String
-  $namespacePath: ID
-  $lastRepositoryCheckFailed: Boolean
-) {
-  projects(
-    active: $active
-    first: $first
-    last: $last
-    before: $before
-    after: $after
-    sort: $sort
-    search: $search
-    minAccessLevel: $minAccessLevel
-    programmingLanguageName: $programmingLanguageName
-    visibilityLevel: $visibilityLevel
-    namespacePath: $namespacePath
-    lastRepositoryCheckFailed: $lastRepositoryCheckFailed
-  ) {
-    count
-    nodes {
-      ...Project
-      ...AdminProject
-    }
-    pageInfo {
-      ...PageInfo
-    }
-  }
-}
diff --git a/ee/app/controllers/ee/admin/projects_controller.rb b/ee/app/controllers/ee/admin/projects_controller.rb
index 42a5d7caddf2b3..6c3895dbe6660a 100644
--- a/ee/app/controllers/ee/admin/projects_controller.rb
+++ b/ee/app/controllers/ee/admin/projects_controller.rb
@@ -9,10 +9,6 @@ module ProjectsController
         authorize! :read_admin_projects, only: %i[index show]
 
         before_action :limited_actions_message!, only: :show
-
-        before_action only: :index do
-          push_frontend_feature_flag(:custom_ability_read_admin_projects, current_user)
-        end
       end
     end
   end
diff --git a/ee/config/feature_flags/beta/custom_ability_read_admin_projects.yml b/ee/config/feature_flags/beta/custom_ability_read_admin_projects.yml
deleted file mode 100644
index be350a6c335425..00000000000000
--- a/ee/config/feature_flags/beta/custom_ability_read_admin_projects.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: custom_ability_read_admin_projects
-description:
-feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/557844
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/201581
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/561997
-milestone: '18.4'
-group: group::authorization
-type: beta
-default_enabled: false
diff --git a/spec/frontend/admin/projects/index/components/app_spec.js b/spec/frontend/admin/projects/index/components/app_spec.js
index d2f56edff024fb..ad2bb51f7a9ff5 100644
--- a/spec/frontend/admin/projects/index/components/app_spec.js
+++ b/spec/frontend/admin/projects/index/components/app_spec.js
@@ -2,8 +2,8 @@ import Vue from 'vue';
 import VueApollo from 'vue-apollo';
 import VueRouter from 'vue-router';
 import { GlKeysetPagination } from '@gitlab/ui';
-import adminProjectsGraphQlResponse from 'test_fixtures/graphql/admin/projects.query.graphql.json';
-import adminInactiveProjectsGraphQlResponse from 'test_fixtures/graphql/admin/inactive_projects.query.graphql.json';
+import adminProjectsGraphQlResponse from 'test_fixtures/graphql/admin/admin_projects.query.graphql.json';
+import adminInactiveProjectsGraphQlResponse from 'test_fixtures/graphql/admin/inactive_admin_projects.query.graphql.json';
 import { shallowMountExtended, mountExtended } from 'helpers/vue_test_utils_helper';
 import TabsWithList from '~/groups_projects/components/tabs_with_list.vue';
 import AdminProjectsApp from '~/admin/projects/index/components/app.vue';
@@ -34,7 +34,6 @@ import {
   INACTIVE_TAB,
 } from '~/admin/projects/index/constants';
 import adminProjectsQuery from '~/admin/projects/index/graphql/queries/admin_projects.query.graphql';
-import projectsQuery from '~/admin/projects/index/graphql/queries/projects.query.graphql';
 import createMockApollo from 'helpers/mock_apollo_helper';
 import waitForPromises from 'helpers/wait_for_promises';
 
@@ -58,7 +57,6 @@ describe('AdminProjectsApp', () => {
     mountFn = shallowMountExtended,
     handlers = [],
     route = defaultRoute,
-    features = {},
   } = {}) => {
     const apolloProvider = createMockApollo(handlers);
     const router = createRouter();
@@ -68,7 +66,6 @@ describe('AdminProjectsApp', () => {
       propsData: defaultPropsData,
       apolloProvider,
       router,
-      provide: { glFeatures: { customAbilityReadAdminProjects: false, ...features } },
     });
   };
 
@@ -105,29 +102,11 @@ describe('AdminProjectsApp', () => {
     });
   });
 
-  describe('when customAbilityReadAdminProjects feature flag is enabled', () => {
-    it('uses getAdminProjectsNew query', async () => {
-      const adminProjectsQueryHandler = jest
-        .fn()
-        .mockResolvedValue({ projects: { count: 0, nodes: [], pageInfo: {} } });
-
-      await createComponent({
-        mountFn: mountExtended,
-        features: { customAbilityReadAdminProjects: true },
-        handlers: [[adminProjectsQuery, adminProjectsQueryHandler]],
-      });
-
-      await waitForPromises();
-
-      expect(adminProjectsQueryHandler).toHaveBeenCalled();
-    });
-  });
-
   it('allows deleting immediately on Inactive tab', async () => {
     await createComponent({
       mountFn: mountExtended,
       handlers: [
-        [projectsQuery, jest.fn().mockResolvedValue(adminInactiveProjectsGraphQlResponse)],
+        [adminProjectsQuery, jest.fn().mockResolvedValue(adminInactiveProjectsGraphQlResponse)],
       ],
       route: { name: INACTIVE_TAB.value },
     });
@@ -143,7 +122,7 @@ describe('AdminProjectsApp', () => {
 
     await createComponent({
       mountFn: mountExtended,
-      handlers: [[projectsQuery, jest.fn().mockResolvedValue(adminProjectsGraphQlResponse)]],
+      handlers: [[adminProjectsQuery, jest.fn().mockResolvedValue(adminProjectsGraphQlResponse)]],
     });
     await waitForPromises();
 
@@ -165,7 +144,7 @@ describe('AdminProjectsApp', () => {
       mountFn: mountExtended,
       handlers: [
         [
-          projectsQuery,
+          adminProjectsQuery,
           jest.fn().mockResolvedValue({
             data: {
               projects: {
diff --git a/spec/frontend/fixtures/admin.rb b/spec/frontend/fixtures/admin.rb
index bb9f1f53704bc1..e12027078e5d16 100644
--- a/spec/frontend/fixtures/admin.rb
+++ b/spec/frontend/fixtures/admin.rb
@@ -73,7 +73,7 @@
     describe 'projects' do
       base_input_path = 'admin/projects/index/graphql/queries/'
       base_output_path = 'graphql/admin/'
-      query_name = 'projects.query.graphql'
+      query_name = 'admin_projects.query.graphql'
 
       it "#{base_output_path}#{query_name}.json" do
         query = get_graphql_query_as_string("#{base_input_path}#{query_name}")
-- 
GitLab