Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

3 files changed, 13 insertions, 16 deletions

diff --git a/app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue b/app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue
index b151e1605da..b2e554bc913 100644
--- a/app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue
+++ b/app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue
@@ -285,7 +285,7 @@ export default {
           :shape="$options.AVATAR_SHAPE_OPTION_RECT"
         />
         <div>
-          <div data-testid="project-name">{{ project.name }}</div>
+          <div data-testid="project-name" data-qa-selector="project_name">{{ project.name }}</div>
           <div class="gl-text-gray-500" data-testid="project-full-path">
             {{ project.fullPath }}
           </div>
diff --git a/app/assets/javascripts/analytics/shared/utils.js b/app/assets/javascripts/analytics/shared/utils.js
index 71b7ca29bad..1887f2affc3 100644
--- a/app/assets/javascripts/analytics/shared/utils.js
+++ b/app/assets/javascripts/analytics/shared/utils.js
@@ -19,24 +19,22 @@ export const toYmd = (date) => dateFormat(date, dateFormats.isoDate);
  * @returns {Object}
  */
 export const extractFilterQueryParameters = (url = '') => {
-  /* eslint-disable camelcase */
   const {
-    source_branch_name = null,
-    target_branch_name = null,
-    author_username = null,
-    milestone_title = null,
-    assignee_username = [],
-    label_name = [],
+    source_branch_name: selectedSourceBranch = null,
+    target_branch_name: selectedTargetBranch = null,
+    author_username: selectedAuthor = null,
+    milestone_title: selectedMilestone = null,
+    assignee_username: selectedAssigneeList = [],
+    label_name: selectedLabelList = [],
   } = urlQueryToFilter(url);
-  /* eslint-enable camelcase */
 
   return {
-    selectedSourceBranch: source_branch_name,
-    selectedTargetBranch: target_branch_name,
-    selectedAuthor: author_username,
-    selectedMilestone: milestone_title,
-    selectedAssigneeList: assignee_username,
-    selectedLabelList: label_name,
+    selectedSourceBranch,
+    selectedTargetBranch,
+    selectedAuthor,
+    selectedMilestone,
+    selectedAssigneeList,
+    selectedLabelList,
   };
 };
 
diff --git a/app/assets/javascripts/analytics/usage_trends/graphql/fragments/count.fragment.graphql b/app/assets/javascripts/analytics/usage_trends/graphql/fragments/count.fragment.graphql
index b353bcdfd0e..2bde5973600 100644
--- a/app/assets/javascripts/analytics/usage_trends/graphql/fragments/count.fragment.graphql
+++ b/app/assets/javascripts/analytics/usage_trends/graphql/fragments/count.fragment.graphql
@@ -1,5 +1,4 @@
 fragment Count on UsageTrendsMeasurement {
-  __typename
   count
   recordedAt
 }