Add latest changes from gitlab-org/gitlab@master

5 files changed, 3 insertions, 10 deletions

diff --git a/app/assets/javascripts/analytics/cycle_analytics/components/base.vue b/app/assets/javascripts/analytics/cycle_analytics/components/base.vue
index a0416100e49..97af597e2f6 100644
--- a/app/assets/javascripts/analytics/cycle_analytics/components/base.vue
+++ b/app/assets/javascripts/analytics/cycle_analytics/components/base.vue
@@ -164,7 +164,6 @@ export default {
   <div>
     <h3>{{ $options.i18n.pageTitle }}</h3>
     <value-stream-filters
-      :group-id="endpoints.groupId"
       :group-path="endpoints.groupPath"
       :has-project-filter="false"
       :start-date="createdAfter"
diff --git a/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_filters.vue b/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_filters.vue
index 82bb1f77cbb..4c7e18f9895 100644
--- a/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_filters.vue
+++ b/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_filters.vue
@@ -31,10 +31,6 @@ export default {
       required: false,
       default: true,
     },
-    groupId: {
-      type: Number,
-      required: true,
-    },
     groupPath: {
       type: String,
       required: true,
diff --git a/app/assets/javascripts/analytics/cycle_analytics/store/getters.js b/app/assets/javascripts/analytics/cycle_analytics/store/getters.js
index 83068cabf0f..30e0ac24ce2 100644
--- a/app/assets/javascripts/analytics/cycle_analytics/store/getters.js
+++ b/app/assets/javascripts/analytics/cycle_analytics/store/getters.js
@@ -19,7 +19,7 @@ export const requestParams = (state) => {
     selectedValueStream: { id: valueStreamId },
     selectedStage: { id: stageId = null },
   } = state;
-  return { requestPath: fullPath, valueStreamId, stageId };
+  return { namespacePath: fullPath, valueStreamId, stageId };
 };
 
 export const paginationParams = ({ pagination: { page, sort, direction } }) => ({
diff --git a/app/assets/javascripts/analytics/cycle_analytics/utils.js b/app/assets/javascripts/analytics/cycle_analytics/utils.js
index 0326aa1e70e..ab8251d4ba3 100644
--- a/app/assets/javascripts/analytics/cycle_analytics/utils.js
+++ b/app/assets/javascripts/analytics/cycle_analytics/utils.js
@@ -91,7 +91,6 @@ export const buildCycleAnalyticsInitialData = ({
   fullPath,
   requestPath,
   projectId,
-  groupId,
   groupPath,
   labelsPath,
   milestonesPath,
@@ -107,8 +106,7 @@ export const buildCycleAnalyticsInitialData = ({
       fullPath,
       labelsPath,
       milestonesPath,
-      groupId: parseInt(groupId, 10),
-      groupPath,
+      groupPath: `groups/${groupPath}`,
     },
     createdAfter: new Date(createdAfter),
     createdBefore: new Date(createdBefore),
diff --git a/app/assets/javascripts/analytics/shared/utils.js b/app/assets/javascripts/analytics/shared/utils.js
index 701cdcf0a2d..a7533f1f21d 100644
--- a/app/assets/javascripts/analytics/shared/utils.js
+++ b/app/assets/javascripts/analytics/shared/utils.js
@@ -133,7 +133,7 @@ export const generateValueStreamsDashboardLink = (groupPath, projectPaths = [])
   if (groupPath.length) {
     const query = projectPaths.length ? `?query=${projectPaths.join(',')}` : '';
     const dashboardsSlug = '/-/analytics/dashboards';
-    const segments = [gon.relative_url_root || '', '/groups', groupPath, dashboardsSlug];
+    const segments = [gon.relative_url_root || '', '/', groupPath, dashboardsSlug];
     return joinPaths(...segments).concat(query);
   }
   return '';