Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

6 files changed, 1 insertions, 70 deletions

diff --git a/app/assets/javascripts/filtered_search/available_dropdown_mappings.js b/app/assets/javascripts/filtered_search/available_dropdown_mappings.js
index 09cef74477c..b57db73a86e 100644
--- a/app/assets/javascripts/filtered_search/available_dropdown_mappings.js
+++ b/app/assets/javascripts/filtered_search/available_dropdown_mappings.js
@@ -1,18 +1,15 @@
 import { sortMilestonesByDueDate } from '~/milestones/utils';
 import { mergeUrlParams } from '../lib/utils/url_utility';
-import DropdownAjaxFilter from './dropdown_ajax_filter';
 import DropdownEmoji from './dropdown_emoji';
 import DropdownHint from './dropdown_hint';
 import DropdownNonUser from './dropdown_non_user';
 import DropdownOperator from './dropdown_operator';
 import DropdownUser from './dropdown_user';
 import DropdownUtils from './dropdown_utils';
-import NullDropdown from './null_dropdown';
 
 export default class AvailableDropdownMappings {
   constructor({
     container,
-    runnerTagsEndpoint,
     labelsEndpoint,
     milestonesEndpoint,
     releasesEndpoint,
@@ -22,7 +19,6 @@ export default class AvailableDropdownMappings {
     includeDescendantGroups,
   }) {
     this.container = container;
-    this.runnerTagsEndpoint = runnerTagsEndpoint;
     this.labelsEndpoint = labelsEndpoint;
     this.milestonesEndpoint = milestonesEndpoint;
     this.releasesEndpoint = releasesEndpoint;
@@ -135,25 +131,6 @@ export default class AvailableDropdownMappings {
         gl: DropdownNonUser,
         element: this.container.querySelector('#js-dropdown-confidential'),
       },
-      status: {
-        reference: null,
-        gl: NullDropdown,
-        element: this.container.querySelector('#js-dropdown-admin-runner-status'),
-      },
-      type: {
-        reference: null,
-        gl: NullDropdown,
-        element: this.container.querySelector('#js-dropdown-admin-runner-type'),
-      },
-      tag: {
-        reference: null,
-        gl: DropdownAjaxFilter,
-        extraArguments: {
-          endpoint: this.getRunnerTagsEndpoint(),
-          symbol: '~',
-        },
-        element: this.container.querySelector('#js-dropdown-runner-tag'),
-      },
       'target-branch': {
         reference: null,
         gl: DropdownNonUser,
@@ -202,10 +179,6 @@ export default class AvailableDropdownMappings {
     return endpoint;
   }
 
-  getRunnerTagsEndpoint() {
-    return `${this.runnerTagsEndpoint}.json`;
-  }
-
   getMergeRequestTargetBranchesEndpoint() {
     const endpoint = `${
       gon.relative_url_root || ''
diff --git a/app/assets/javascripts/filtered_search/constants.js b/app/assets/javascripts/filtered_search/constants.js
index f8b5910de9e..e07dccd11e8 100644
--- a/app/assets/javascripts/filtered_search/constants.js
+++ b/app/assets/javascripts/filtered_search/constants.js
@@ -15,6 +15,4 @@ export const MAX_HISTORY_SIZE = 5;
 export const FILTERED_SEARCH = {
   MERGE_REQUESTS: 'merge_requests',
   ISSUES: 'issues',
-  ADMIN_RUNNERS: 'admin/runners',
-  GROUP_RUNNERS_ANCHOR: 'runners-settings',
 };
diff --git a/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js b/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
index e467e97dda9..7471d3204d6 100644
--- a/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
+++ b/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
@@ -9,7 +9,6 @@ import FilteredSearchVisualTokens from './filtered_search_visual_tokens';
 
 export default class FilteredSearchDropdownManager {
   constructor({
-    runnerTagsEndpoint = '',
     labelsEndpoint = '',
     milestonesEndpoint = '',
     iterationsEndpoint = '',
@@ -26,7 +25,6 @@ export default class FilteredSearchDropdownManager {
     const removeTrailingSlash = (url) => url.replace(/\/$/, '');
 
     this.container = FilteredSearchContainer.container;
-    this.runnerTagsEndpoint = removeTrailingSlash(runnerTagsEndpoint);
     this.labelsEndpoint = removeTrailingSlash(labelsEndpoint);
     this.milestonesEndpoint = removeTrailingSlash(milestonesEndpoint);
     this.iterationsEndpoint = removeTrailingSlash(iterationsEndpoint);
diff --git a/app/assets/javascripts/filtered_search/filtered_search_manager.js b/app/assets/javascripts/filtered_search/filtered_search_manager.js
index 5ba69f052c9..07f2c75f00a 100644
--- a/app/assets/javascripts/filtered_search/filtered_search_manager.js
+++ b/app/assets/javascripts/filtered_search/filtered_search_manager.js
@@ -114,7 +114,6 @@ export default class FilteredSearchManager {
       this.tokenizer = FilteredSearchTokenizer;
 
       const {
-        runnerTagsEndpoint = '',
         labelsEndpoint = '',
         milestonesEndpoint = '',
         releasesEndpoint = '',
@@ -124,7 +123,6 @@ export default class FilteredSearchManager {
       } = this.filteredSearchInput.dataset;
 
       this.dropdownManager = new FilteredSearchDropdownManager({
-        runnerTagsEndpoint,
         labelsEndpoint,
         milestonesEndpoint,
         releasesEndpoint,
@@ -583,7 +581,7 @@ export default class FilteredSearchManager {
      * Eg. not[foo]=%bar
      * key = foo; value = %bar
      */
-    const notKeyValueRegex = new RegExp(/not\[(\w+)\]\[?\]?=(.*)/);
+    const notKeyValueRegex = /not\[(\w+)\]\[?\]?=(.*)/;
 
     return params.map((query) => {
       // Check if there are matches for `not` operator
diff --git a/app/assets/javascripts/filtered_search/group_runners_filtered_search_token_keys.js b/app/assets/javascripts/filtered_search/group_runners_filtered_search_token_keys.js
deleted file mode 100644
index ceeb71c4eec..00000000000
--- a/app/assets/javascripts/filtered_search/group_runners_filtered_search_token_keys.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { __ } from '~/locale';
-import FilteredSearchTokenKeys from './filtered_search_token_keys';
-
-const tokenKeys = [
-  {
-    formattedKey: __('Status'),
-    key: 'status',
-    type: 'string',
-    param: 'status',
-    symbol: '',
-    icon: 'messages',
-    tag: 'status',
-  },
-  {
-    formattedKey: __('Type'),
-    key: 'type',
-    type: 'string',
-    param: 'type',
-    symbol: '',
-    icon: 'cube',
-    tag: 'type',
-  },
-];
-
-const GroupRunnersFilteredSearchTokenKeys = new FilteredSearchTokenKeys(tokenKeys);
-
-export default GroupRunnersFilteredSearchTokenKeys;
diff --git a/app/assets/javascripts/filtered_search/null_dropdown.js b/app/assets/javascripts/filtered_search/null_dropdown.js
deleted file mode 100644
index 4cfce2a5beb..00000000000
--- a/app/assets/javascripts/filtered_search/null_dropdown.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import FilteredSearchDropdown from './filtered_search_dropdown';
-
-export default class NullDropdown extends FilteredSearchDropdown {
-  renderContent(forceShowList = false) {
-    this.droplab.changeHookList(this.hookId, this.dropdown, [], this.config);
-
-    super.renderContent(forceShowList);
-  }
-}