diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-21 03:10:26 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-21 03:10:26 +0300 |
commit | 3f9ae4674edd5b23ec9cd5b2bbb4a0caae5eec74 (patch) | |
tree | 3d8e65627e0fa03b967f11035b23133df0a860e7 /app/assets/javascripts/vue_shared/alert_details | |
parent | 40e8ba2fc8ac6c3695d7f297ff4143518615a3f9 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/alert_details')
3 files changed, 14 insertions, 4 deletions
diff --git a/app/assets/javascripts/vue_shared/alert_details/components/alert_details.vue b/app/assets/javascripts/vue_shared/alert_details/components/alert_details.vue index f2ea55df63d..9a734a12a46 100644 --- a/app/assets/javascripts/vue_shared/alert_details/components/alert_details.vue +++ b/app/assets/javascripts/vue_shared/alert_details/components/alert_details.vue @@ -149,7 +149,9 @@ export default { }, set(tabIdx) { const tabId = this.$options.tabsConfig[tabIdx].id; - this.$router.replace({ name: 'tab', params: { tabId } }); + if (this.$route.params?.tabId !== tabId) { + this.$router.push({ name: 'tab', params: { tabId } }); + } }, }, environmentName() { diff --git a/app/assets/javascripts/vue_shared/alert_details/index.js b/app/assets/javascripts/vue_shared/alert_details/index.js index 5793069440c..357dfa49901 100644 --- a/app/assets/javascripts/vue_shared/alert_details/index.js +++ b/app/assets/javascripts/vue_shared/alert_details/index.js @@ -15,9 +15,17 @@ Vue.use(VueApollo); export default (selector) => { const domEl = document.querySelector(selector); - const { alertId, projectPath, projectIssuesPath, projectId, page, canUpdate } = domEl.dataset; + const { + alertId, + projectPath, + projectIssuesPath, + projectAlertManagementDetailsPath, + projectId, + page, + canUpdate, + } = domEl.dataset; const iid = alertId; - const router = createRouter(); + const router = createRouter(projectAlertManagementDetailsPath); const resolvers = { Mutation: { diff --git a/app/assets/javascripts/vue_shared/alert_details/router.js b/app/assets/javascripts/vue_shared/alert_details/router.js index 5687fe4e0f5..616d5c259b9 100644 --- a/app/assets/javascripts/vue_shared/alert_details/router.js +++ b/app/assets/javascripts/vue_shared/alert_details/router.js @@ -6,7 +6,7 @@ Vue.use(VueRouter); export default function createRouter(base) { return new VueRouter({ - mode: 'hash', + mode: 'history', base: joinPaths(gon.relative_url_root || '', base), routes: [{ path: '/:tabId', name: 'tab' }], }); |