Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 3 deletions

diff --git a/app/assets/javascripts/analytics/cycle_analytics/components/base.vue b/app/assets/javascripts/analytics/cycle_analytics/components/base.vue
index 704b4ce9c8a..a27033ae4a7 100644
--- a/app/assets/javascripts/analytics/cycle_analytics/components/base.vue
+++ b/app/assets/javascripts/analytics/cycle_analytics/components/base.vue
@@ -107,7 +107,9 @@ export default {
     },
     showLinkToDashboard() {
       return Boolean(
-        this.features?.groupLevelAnalyticsDashboard && this.features?.groupAnalyticsDashboardsPage,
+        this.features?.groupLevelAnalyticsDashboard &&
+          this.features?.groupAnalyticsDashboardsPage &&
+          this.groupPath,
       );
     },
     dashboardsPath() {
@@ -129,6 +131,9 @@ export default {
         page: this.pagination?.page || null,
       };
     },
+    filterBarNamespacePath() {
+      return this.groupPath || this.namespace.fullPath;
+    },
   },
   methods: {
     ...mapActions([
@@ -168,7 +173,7 @@ export default {
   <div>
     <h3>{{ $options.i18n.pageTitle }}</h3>
     <value-stream-filters
-      :group-path="groupPath"
+      :group-path="filterBarNamespacePath"
       :has-project-filter="false"
       :start-date="createdAfter"
       :end-date="createdBefore"
diff --git a/app/assets/javascripts/analytics/cycle_analytics/utils.js b/app/assets/javascripts/analytics/cycle_analytics/utils.js
index 939378a463e..d7c3804113e 100644
--- a/app/assets/javascripts/analytics/cycle_analytics/utils.js
+++ b/app/assets/javascripts/analytics/cycle_analytics/utils.js
@@ -81,7 +81,7 @@ export const buildCycleAnalyticsInitialData = ({
 } = {}) => {
   return {
     projectId: parseInt(projectId, 10),
-    groupPath: `groups/${groupPath}`,
+    groupPath,
     namespace: {
       name: namespaceName,
       fullPath: namespaceFullPath,