Add latest changes from gitlab-org/gitlab@13-2-stable-ee

1 files changed, 11 insertions, 0 deletions

diff --git a/app/assets/javascripts/monitoring/pages/dashboard_page.vue b/app/assets/javascripts/monitoring/pages/dashboard_page.vue
index 519a20d7be3..df0e2d7f8f6 100644
--- a/app/assets/javascripts/monitoring/pages/dashboard_page.vue
+++ b/app/assets/javascripts/monitoring/pages/dashboard_page.vue
@@ -1,4 +1,5 @@
 <script>
+import { mapActions } from 'vuex';
 import Dashboard from '../components/dashboard.vue';
 
 export default {
@@ -11,6 +12,16 @@ export default {
       required: true,
     },
   },
+  created() {
+    // This is to support the older URL <project>/-/environments/:env_id/metrics?dashboard=:path
+    // and the new format <project>/-/metrics/:dashboardPath
+    const encodedDashboard = this.$route.query.dashboard || this.$route.params.dashboard;
+    const currentDashboard = encodedDashboard ? decodeURIComponent(encodedDashboard) : null;
+    this.setCurrentDashboard({ currentDashboard });
+  },
+  methods: {
+    ...mapActions('monitoringDashboard', ['setCurrentDashboard']),
+  },
 };
 </script>
 <template>