1 files changed, 11 insertions, 27 deletions

diff --git a/app/assets/javascripts/runner/admin_runners/admin_runners_app.vue b/app/assets/javascripts/runner/admin_runners/admin_runners_app.vue
index f5620876783..dbaabb35cde 100644
--- a/app/assets/javascripts/runner/admin_runners/admin_runners_app.vue
+++ b/app/assets/javascripts/runner/admin_runners/admin_runners_app.vue
@@ -17,8 +17,6 @@ import allRunnersCountQuery from 'ee_else_ce/runner/graphql/list/all_runners_cou
 import RegistrationDropdown from '../components/registration/registration_dropdown.vue';
 import RunnerStackedLayoutBanner from '../components/runner_stacked_layout_banner.vue';
 import RunnerFilteredSearchBar from '../components/runner_filtered_search_bar.vue';
-import RunnerBulkDelete from '../components/runner_bulk_delete.vue';
-import RunnerBulkDeleteCheckbox from '../components/runner_bulk_delete_checkbox.vue';
 import RunnerList from '../components/runner_list.vue';
 import RunnerListEmptyState from '../components/runner_list_empty_state.vue';
 import RunnerName from '../components/runner_name.vue';
@@ -30,7 +28,12 @@ import RunnerActionsCell from '../components/cells/runner_actions_cell.vue';
 import { pausedTokenConfig } from '../components/search_tokens/paused_token_config';
 import { statusTokenConfig } from '../components/search_tokens/status_token_config';
 import { tagTokenConfig } from '../components/search_tokens/tag_token_config';
-import { ADMIN_FILTERED_SEARCH_NAMESPACE, INSTANCE_TYPE, I18N_FETCH_ERROR } from '../constants';
+import {
+  ADMIN_FILTERED_SEARCH_NAMESPACE,
+  INSTANCE_TYPE,
+  I18N_FETCH_ERROR,
+  FILTER_CSS_CLASSES,
+} from '../constants';
 import { captureException } from '../sentry_utils';
 
 export default {
@@ -40,8 +43,6 @@ export default {
     RegistrationDropdown,
     RunnerStackedLayoutBanner,
     RunnerFilteredSearchBar,
-    RunnerBulkDelete,
-    RunnerBulkDeleteCheckbox,
     RunnerList,
     RunnerListEmptyState,
     RunnerName,
@@ -51,7 +52,7 @@ export default {
     RunnerActionsCell,
   },
   mixins: [glFeatureFlagMixin()],
-  inject: ['emptyStateSvgPath', 'emptyStateFilteredSvgPath', 'localMutations'],
+  inject: ['emptyStateSvgPath', 'emptyStateFilteredSvgPath'],
   props: {
     registrationToken: {
       type: String,
@@ -114,11 +115,6 @@ export default {
         upgradeStatusTokenConfig,
       ];
     },
-    isBulkDeleteEnabled() {
-      // Feature flag: admin_runners_bulk_delete
-      // Rollout issue: https://gitlab.com/gitlab-org/gitlab/-/issues/353981
-      return this.glFeatures.adminRunnersBulkDelete;
-    },
     isSearchFiltered() {
       return isSearchFiltered(this.search);
     },
@@ -155,18 +151,13 @@ export default {
     reportToSentry(error) {
       captureException({ error, component: this.$options.name });
     },
-    onChecked({ runner, isChecked }) {
-      this.localMutations.setRunnerChecked({
-        runner,
-        isChecked,
-      });
-    },
     onPaginationInput(value) {
       this.search.pagination = value;
     },
   },
   filteredSearchNamespace: ADMIN_FILTERED_SEARCH_NAMESPACE,
   INSTANCE_TYPE,
+  FILTER_CSS_CLASSES,
 };
 </script>
 <template>
@@ -195,6 +186,7 @@ export default {
 
     <runner-filtered-search-bar
       v-model="search"
+      :class="$options.FILTER_CSS_CLASSES"
       :tokens="searchTokens"
       :namespace="$options.filteredSearchNamespace"
     />
@@ -209,20 +201,12 @@ export default {
       :filtered-svg-path="emptyStateFilteredSvgPath"
     />
     <template v-else>
-      <runner-bulk-delete
-        v-if="isBulkDeleteEnabled"
-        :runners="runners.items"
-        @deleted="onDeleted"
-      />
       <runner-list
         :runners="runners.items"
         :loading="runnersLoading"
-        :checkable="isBulkDeleteEnabled"
-        @checked="onChecked"
+        :checkable="true"
+        @deleted="onDeleted"
       >
-        <template v-if="isBulkDeleteEnabled" #head-checkbox>
-          <runner-bulk-delete-checkbox :runners="runners.items" />
-        </template>
         <template #runner-name="{ runner }">
           <gl-link :href="runner.adminUrl">
             <runner-name :runner="runner" />