Merge branch 'ensure-da-overview-chart-selects-correct-group' into 'master'

Ensure correct group for DA chart

See merge request gitlab-org/gitlab!72176

ee/app/assets/javascripts/analytics/devops_report/devops_adoption/components/devops_adoption_overview_chart.vue

@@ -81,7 +81,11 @@ export default {
       };
     },
     sortedNodes() {
-      return [...this.devopsAdoptionEnabledNamespaces?.nodes[0].snapshots?.nodes].reverse();
+      const correctNode = this.devopsAdoptionEnabledNamespaces?.nodes.find(
+        (node) => node.namespace?.id === this.groupGid,
+      );
+
+      return [...correctNode?.snapshots?.nodes].reverse();
     },
     groupBy() {
       return this.sortedNodes.map((snapshot) => dateFormat(snapshot.endTime, dateFormats.month));

ee/app/assets/javascripts/analytics/devops_report/devops_adoption/graphql/queries/devops_adoption_overview_chart.query.graphql

@@ -6,6 +6,9 @@ query devopsAdoptionEnabledNamespaces(
   devopsAdoptionEnabledNamespaces(displayNamespaceId: $displayNamespaceId) {
     nodes {
       id
+      namespace {
+        id
+      }
       snapshots(endTimeBefore: $endDate, endTimeAfter: $startDate) {
         nodes {
           endTime

ee/spec/frontend/analytics/devops_report/devops_adoption/components/devops_adoption_overciew_chart_spec.js

@@ -25,7 +25,8 @@ describe('DevopsAdoptionOverviewChart', () => {
     wrapper = shallowMount(DevopsAdoptionOverviewChart, {
       localVue,
       provide: {
-        groupGid: 'gid:123',
+        groupGid:
+          namespaceWithSnapotsData.data.devopsAdoptionEnabledNamespaces.nodes[0].namespace.id,
       },
       apolloProvider: createMockApollo(handlers),
       data() {