From c1cea595b6a9b4d85424e9afd2cb765101ee04bf Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 21 Jul 2023 09:10:13 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .../javascripts/deploy_keys/components/app.vue     |  2 +-
 .../javascripts/deploy_keys/components/key.vue     |  8 ++---
 .../sidebar/components/confidentiality_filter.vue  | 25 -------------
 .../components/confidentiality_filter/data.js      | 36 +++++++++++++++++++
 .../components/confidentiality_filter/index.vue    | 24 +++++++++++++
 .../search/sidebar/components/issues_filters.vue   | 15 +++++---
 .../search/sidebar/components/results_filters.vue  | 10 +++---
 .../search/sidebar/components/status_filter.vue    | 25 -------------
 .../sidebar/components/status_filter/data.js       | 42 ++++++++++++++++++++++
 .../sidebar/components/status_filter/index.vue     | 24 +++++++++++++
 .../sidebar/constants/confidential_filter_data.js  | 36 -------------------
 .../search/sidebar/constants/state_filter_data.js  | 42 ----------------------
 app/assets/javascripts/search/store/constants.js   |  6 ++--
 13 files changed, 149 insertions(+), 146 deletions(-)
 delete mode 100644 app/assets/javascripts/search/sidebar/components/confidentiality_filter.vue
 create mode 100644 app/assets/javascripts/search/sidebar/components/confidentiality_filter/data.js
 create mode 100644 app/assets/javascripts/search/sidebar/components/confidentiality_filter/index.vue
 delete mode 100644 app/assets/javascripts/search/sidebar/components/status_filter.vue
 create mode 100644 app/assets/javascripts/search/sidebar/components/status_filter/data.js
 create mode 100644 app/assets/javascripts/search/sidebar/components/status_filter/index.vue
 delete mode 100644 app/assets/javascripts/search/sidebar/constants/confidential_filter_data.js
 delete mode 100644 app/assets/javascripts/search/sidebar/constants/state_filter_data.js

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/deploy_keys/components/app.vue b/app/assets/javascripts/deploy_keys/components/app.vue
index 5fc15578827..4860215d8f2 100644
--- a/app/assets/javascripts/deploy_keys/components/app.vue
+++ b/app/assets/javascripts/deploy_keys/components/app.vue
@@ -155,7 +155,7 @@ export default {
         :keys="keys[currentTab]"
         :store="store"
         :endpoint="endpoint"
-        data-qa-selector="project_deploy_keys_container"
+        data-testid="project-deploy-keys-container"
       />
     </template>
   </div>
diff --git a/app/assets/javascripts/deploy_keys/components/key.vue b/app/assets/javascripts/deploy_keys/components/key.vue
index 94f27dbf048..d35cf35d624 100644
--- a/app/assets/javascripts/deploy_keys/components/key.vue
+++ b/app/assets/javascripts/deploy_keys/components/key.vue
@@ -113,18 +113,18 @@ export default {
   <div class="gl-responsive-table-row deploy-key">
     <div class="table-section section-40">
       <div role="rowheader" class="table-mobile-header">{{ s__('DeployKeys|Deploy key') }}</div>
-      <div class="table-mobile-content" data-qa-selector="key_container">
-        <strong class="title" data-qa-selector="key_title_content"> {{ deployKey.title }} </strong>
+      <div class="table-mobile-content" data-testid="key-container">
+        <strong class="title" data-testid="key-title-content"> {{ deployKey.title }} </strong>
         <dl>
           <dt>{{ __('SHA256') }}</dt>
-          <dd class="fingerprint" data-qa-selector="key_sha256_fingerprint_content">
+          <dd class="fingerprint" data-testid="key-sha256-fingerprint-content">
             {{ deployKey.fingerprint_sha256 }}
           </dd>
           <template v-if="deployKey.fingerprint">
             <dt>
               {{ __('MD5') }}
             </dt>
-            <dd class="fingerprint" data-qa-selector="key_md5_fingerprint_content">
+            <dd class="fingerprint" data-testid="key-md5-fingerprint-content">
               {{ deployKey.fingerprint }}
             </dd>
           </template>
diff --git a/app/assets/javascripts/search/sidebar/components/confidentiality_filter.vue b/app/assets/javascripts/search/sidebar/components/confidentiality_filter.vue
deleted file mode 100644
index 2a7988cd4c6..00000000000
--- a/app/assets/javascripts/search/sidebar/components/confidentiality_filter.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<script>
-import { mapState } from 'vuex';
-import { confidentialFilterData } from '../constants/confidential_filter_data';
-import { HR_DEFAULT_CLASSES } from '../constants';
-import RadioFilter from './radio_filter.vue';
-
-export default {
-  name: 'ConfidentialityFilter',
-  components: {
-    RadioFilter,
-  },
-  computed: {
-    ...mapState(['useNewNavigation']),
-  },
-  confidentialFilterData,
-  HR_DEFAULT_CLASSES,
-};
-</script>
-
-<template>
-  <div>
-    <radio-filter :filter-data="$options.confidentialFilterData" />
-    <hr v-if="!useNewNavigation" :class="$options.HR_DEFAULT_CLASSES" />
-  </div>
-</template>
diff --git a/app/assets/javascripts/search/sidebar/components/confidentiality_filter/data.js b/app/assets/javascripts/search/sidebar/components/confidentiality_filter/data.js
new file mode 100644
index 00000000000..ecb63ed9eea
--- /dev/null
+++ b/app/assets/javascripts/search/sidebar/components/confidentiality_filter/data.js
@@ -0,0 +1,36 @@
+import { __ } from '~/locale';
+
+const header = __('Confidentiality');
+
+const filters = {
+  ANY: {
+    label: __('Any'),
+    value: null,
+  },
+  CONFIDENTIAL: {
+    label: __('Confidential'),
+    value: 'yes',
+  },
+  NOT_CONFIDENTIAL: {
+    label: __('Not confidential'),
+    value: 'no',
+  },
+};
+
+const scopes = {
+  ISSUES: 'issues',
+};
+
+const filterByScope = {
+  [scopes.ISSUES]: [filters.ANY, filters.CONFIDENTIAL, filters.NOT_CONFIDENTIAL],
+};
+
+const filterParam = 'confidential';
+
+export const confidentialFilterData = {
+  header,
+  filters,
+  scopes,
+  filterByScope,
+  filterParam,
+};
diff --git a/app/assets/javascripts/search/sidebar/components/confidentiality_filter/index.vue b/app/assets/javascripts/search/sidebar/components/confidentiality_filter/index.vue
new file mode 100644
index 00000000000..7909aa9234b
--- /dev/null
+++ b/app/assets/javascripts/search/sidebar/components/confidentiality_filter/index.vue
@@ -0,0 +1,24 @@
+<script>
+import { mapState } from 'vuex';
+import { HR_DEFAULT_CLASSES } from '../../constants';
+import RadioFilter from '../radio_filter.vue';
+import { confidentialFilterData } from './data';
+
+export default {
+  name: 'ConfidentialityFilter',
+  components: {
+    RadioFilter,
+  },
+  computed: {
+    ...mapState(['useNewNavigation']),
+  },
+  confidentialFilterData,
+  HR_DEFAULT_CLASSES,
+};
+</script>
+
+<template>
+  <div>
+    <radio-filter :filter-data="$options.confidentialFilterData" />
+  </div>
+</template>
diff --git a/app/assets/javascripts/search/sidebar/components/issues_filters.vue b/app/assets/javascripts/search/sidebar/components/issues_filters.vue
index 8928f80d83a..3eb025327a2 100644
--- a/app/assets/javascripts/search/sidebar/components/issues_filters.vue
+++ b/app/assets/javascripts/search/sidebar/components/issues_filters.vue
@@ -10,12 +10,12 @@ import {
   TRACKING_CATEGORY,
   TRACKING_LABEL_RESET,
 } from '../constants/index';
-import { confidentialFilterData } from '../constants/confidential_filter_data';
-import { stateFilterData } from '../constants/state_filter_data';
-import ConfidentialityFilter from './confidentiality_filter.vue';
+import { confidentialFilterData } from './confidentiality_filter/data';
+import { statusFilterData } from './status_filter/data';
+import ConfidentialityFilter from './confidentiality_filter/index.vue';
 import { labelFilterData } from './label_filter/data';
 import LabelFilter from './label_filter/index.vue';
-import StatusFilter from './status_filter.vue';
+import StatusFilter from './status_filter/index.vue';
 
 export default {
   name: 'IssuesFilters',
@@ -37,7 +37,7 @@ export default {
       return Object.values(confidentialFilterData.scopes).includes(this.currentScope);
     },
     showStatusFilter() {
-      return Object.values(stateFilterData.scopes).includes(this.currentScope);
+      return Object.values(statusFilterData.scopes).includes(this.currentScope);
     },
     showLabelFilter() {
       return (
@@ -71,7 +71,12 @@ export default {
   <form class="issue-filters gl-px-5 gl-pt-0" @submit.prevent="applyQueryWithTracking">
     <hr v-if="!useNewNavigation" :class="hrClasses" />
     <status-filter v-if="showStatusFilter" class="gl-mb-5" />
+    <hr v-if="!useNewNavigation" :class="hrClasses" />
     <confidentiality-filter v-if="showConfidentialityFilter" class="gl-mb-5" />
+    <hr
+      v-if="!useNewNavigation && showConfidentialityFilter && showLabelFilter"
+      :class="hrClasses"
+    />
     <label-filter v-if="showLabelFilter" />
     <div class="gl-display-flex gl-align-items-center gl-mt-4">
       <gl-button category="primary" variant="confirm" type="submit" :disabled="!sidebarDirty">
diff --git a/app/assets/javascripts/search/sidebar/components/results_filters.vue b/app/assets/javascripts/search/sidebar/components/results_filters.vue
index 24804baef44..a9addb87f7b 100644
--- a/app/assets/javascripts/search/sidebar/components/results_filters.vue
+++ b/app/assets/javascripts/search/sidebar/components/results_filters.vue
@@ -2,10 +2,10 @@
 import { GlButton, GlLink } from '@gitlab/ui';
 import { mapActions, mapState, mapGetters } from 'vuex';
 import { HR_DEFAULT_CLASSES } from '../constants/index';
-import { confidentialFilterData } from '../constants/confidential_filter_data';
-import { stateFilterData } from '../constants/state_filter_data';
-import ConfidentialityFilter from './confidentiality_filter.vue';
-import StatusFilter from './status_filter.vue';
+import { confidentialFilterData } from './confidentiality_filter/data';
+import { statusFilterData } from './status_filter/data';
+import ConfidentialityFilter from './confidentiality_filter/index.vue';
+import StatusFilter from './status_filter/index.vue';
 
 export default {
   name: 'ResultsFilters',
@@ -25,7 +25,7 @@ export default {
       return Object.values(confidentialFilterData.scopes).includes(this.currentScope);
     },
     showStatusFilter() {
-      return Object.values(stateFilterData.scopes).includes(this.currentScope);
+      return Object.values(statusFilterData.scopes).includes(this.currentScope);
     },
     hrClasses() {
       return [...HR_DEFAULT_CLASSES, 'gl-display-none', 'gl-md-display-block'];
diff --git a/app/assets/javascripts/search/sidebar/components/status_filter.vue b/app/assets/javascripts/search/sidebar/components/status_filter.vue
deleted file mode 100644
index 2a3d9ede982..00000000000
--- a/app/assets/javascripts/search/sidebar/components/status_filter.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<script>
-import { mapState } from 'vuex';
-import { stateFilterData } from '../constants/state_filter_data';
-import { HR_DEFAULT_CLASSES } from '../constants';
-import RadioFilter from './radio_filter.vue';
-
-export default {
-  name: 'StatusFilter',
-  components: {
-    RadioFilter,
-  },
-  computed: {
-    ...mapState(['useNewNavigation']),
-  },
-  stateFilterData,
-  HR_DEFAULT_CLASSES,
-};
-</script>
-
-<template>
-  <div>
-    <radio-filter :filter-data="$options.stateFilterData" />
-    <hr v-if="!useNewNavigation" :class="$options.HR_DEFAULT_CLASSES" />
-  </div>
-</template>
diff --git a/app/assets/javascripts/search/sidebar/components/status_filter/data.js b/app/assets/javascripts/search/sidebar/components/status_filter/data.js
new file mode 100644
index 00000000000..1e3cd59214b
--- /dev/null
+++ b/app/assets/javascripts/search/sidebar/components/status_filter/data.js
@@ -0,0 +1,42 @@
+import { __ } from '~/locale';
+
+const header = __('Status');
+
+const filters = {
+  ANY: {
+    label: __('Any'),
+    value: null,
+  },
+  OPEN: {
+    label: __('Open'),
+    value: 'opened',
+  },
+  CLOSED: {
+    label: __('Closed'),
+    value: 'closed',
+  },
+  MERGED: {
+    label: __('Merged'),
+    value: 'merged',
+  },
+};
+
+const scopes = {
+  ISSUES: 'issues',
+  MERGE_REQUESTS: 'merge_requests',
+};
+
+const filterByScope = {
+  [scopes.ISSUES]: [filters.ANY, filters.OPEN, filters.CLOSED],
+  [scopes.MERGE_REQUESTS]: [filters.ANY, filters.OPEN, filters.MERGED, filters.CLOSED],
+};
+
+const filterParam = 'state';
+
+export const statusFilterData = {
+  header,
+  filters,
+  scopes,
+  filterByScope,
+  filterParam,
+};
diff --git a/app/assets/javascripts/search/sidebar/components/status_filter/index.vue b/app/assets/javascripts/search/sidebar/components/status_filter/index.vue
new file mode 100644
index 00000000000..494d75db6ce
--- /dev/null
+++ b/app/assets/javascripts/search/sidebar/components/status_filter/index.vue
@@ -0,0 +1,24 @@
+<script>
+import { mapState } from 'vuex';
+import { HR_DEFAULT_CLASSES } from '../../constants';
+import RadioFilter from '../radio_filter.vue';
+import { statusFilterData } from './data';
+
+export default {
+  name: 'StatusFilter',
+  components: {
+    RadioFilter,
+  },
+  computed: {
+    ...mapState(['useNewNavigation']),
+  },
+  statusFilterData,
+  HR_DEFAULT_CLASSES,
+};
+</script>
+
+<template>
+  <div>
+    <radio-filter :filter-data="$options.statusFilterData" />
+  </div>
+</template>
diff --git a/app/assets/javascripts/search/sidebar/constants/confidential_filter_data.js b/app/assets/javascripts/search/sidebar/constants/confidential_filter_data.js
deleted file mode 100644
index ecb63ed9eea..00000000000
--- a/app/assets/javascripts/search/sidebar/constants/confidential_filter_data.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { __ } from '~/locale';
-
-const header = __('Confidentiality');
-
-const filters = {
-  ANY: {
-    label: __('Any'),
-    value: null,
-  },
-  CONFIDENTIAL: {
-    label: __('Confidential'),
-    value: 'yes',
-  },
-  NOT_CONFIDENTIAL: {
-    label: __('Not confidential'),
-    value: 'no',
-  },
-};
-
-const scopes = {
-  ISSUES: 'issues',
-};
-
-const filterByScope = {
-  [scopes.ISSUES]: [filters.ANY, filters.CONFIDENTIAL, filters.NOT_CONFIDENTIAL],
-};
-
-const filterParam = 'confidential';
-
-export const confidentialFilterData = {
-  header,
-  filters,
-  scopes,
-  filterByScope,
-  filterParam,
-};
diff --git a/app/assets/javascripts/search/sidebar/constants/state_filter_data.js b/app/assets/javascripts/search/sidebar/constants/state_filter_data.js
deleted file mode 100644
index 2f9f8a7cb46..00000000000
--- a/app/assets/javascripts/search/sidebar/constants/state_filter_data.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import { __ } from '~/locale';
-
-const header = __('Status');
-
-const filters = {
-  ANY: {
-    label: __('Any'),
-    value: null,
-  },
-  OPEN: {
-    label: __('Open'),
-    value: 'opened',
-  },
-  CLOSED: {
-    label: __('Closed'),
-    value: 'closed',
-  },
-  MERGED: {
-    label: __('Merged'),
-    value: 'merged',
-  },
-};
-
-const scopes = {
-  ISSUES: 'issues',
-  MERGE_REQUESTS: 'merge_requests',
-};
-
-const filterByScope = {
-  [scopes.ISSUES]: [filters.ANY, filters.OPEN, filters.CLOSED],
-  [scopes.MERGE_REQUESTS]: [filters.ANY, filters.OPEN, filters.MERGED, filters.CLOSED],
-};
-
-const filterParam = 'state';
-
-export const stateFilterData = {
-  header,
-  filters,
-  scopes,
-  filterByScope,
-  filterParam,
-};
diff --git a/app/assets/javascripts/search/store/constants.js b/app/assets/javascripts/search/store/constants.js
index bb112c122ae..311aa599e68 100644
--- a/app/assets/javascripts/search/store/constants.js
+++ b/app/assets/javascripts/search/store/constants.js
@@ -1,5 +1,5 @@
-import { stateFilterData } from '~/search/sidebar/constants/state_filter_data';
-import { confidentialFilterData } from '~/search/sidebar/constants/confidential_filter_data';
+import { statusFilterData } from '~/search/sidebar/components/status_filter/data';
+import { confidentialFilterData } from '~/search/sidebar/components/confidentiality_filter/data';
 import { languageFilterData } from '~/search/sidebar/components/language_filter/data';
 import { labelFilterData } from '~/search/sidebar/components/label_filter/data';
 
@@ -12,7 +12,7 @@ export const GROUPS_LOCAL_STORAGE_KEY = 'global-search-frequent-groups';
 export const PROJECTS_LOCAL_STORAGE_KEY = 'global-search-frequent-projects';
 
 export const SIDEBAR_PARAMS = [
-  stateFilterData.filterParam,
+  statusFilterData.filterParam,
   confidentialFilterData.filterParam,
   languageFilterData.filterParam,
   labelFilterData.filterParam,
-- 
cgit v1.2.3