Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 1 deletions

diff --git a/app/assets/javascripts/analytics/cycle_analytics/components/base.vue b/app/assets/javascripts/analytics/cycle_analytics/components/base.vue
index 97af597e2f6..24d8370afdd 100644
--- a/app/assets/javascripts/analytics/cycle_analytics/components/base.vue
+++ b/app/assets/javascripts/analytics/cycle_analytics/components/base.vue
@@ -105,7 +105,9 @@ export default {
       return this.hasCycleAnalyticsForGroups ? METRICS_REQUESTS : SUMMARY_METRICS_REQUEST;
     },
     showLinkToDashboard() {
-      return this.hasCycleAnalyticsForGroups && this.features?.groupAnalyticsDashboardsPage;
+      return Boolean(
+        this.features?.groupLevelAnalyticsDashboard && this.features?.groupAnalyticsDashboardsPage,
+      );
     },
     dashboardsPath() {
       const {
diff --git a/app/assets/javascripts/analytics/cycle_analytics/utils.js b/app/assets/javascripts/analytics/cycle_analytics/utils.js
index ab8251d4ba3..e5a2055c43a 100644
--- a/app/assets/javascripts/analytics/cycle_analytics/utils.js
+++ b/app/assets/javascripts/analytics/cycle_analytics/utils.js
@@ -77,7 +77,10 @@ export const filterStagesByHiddenStatus = (stages = [], isHidden = true) =>
  */
 
 const extractFeatures = (gon) => ({
+  // licensed feature toggles
   cycleAnalyticsForGroups: Boolean(gon?.licensed_features?.cycleAnalyticsForGroups),
+  groupLevelAnalyticsDashboard: Boolean(gon?.licensed_features?.groupLevelAnalyticsDashboard),
+  // feature flags
   groupAnalyticsDashboardsPage: Boolean(gon?.features?.groupAnalyticsDashboardsPage),
 });