From 162e0d338f5423662829e6d9784186a362a19832 Mon Sep 17 00:00:00 2001 From: Vitalii Lysak Date: Fri, 12 Aug 2022 14:18:47 +0300 Subject: upd route change logic --- src/components/_sila/AppHeader/AppHeader.vue | 2 +- src/components/_sila/Global/Search.vue | 7 ++++++- src/components/_sila/Mixins/BVToastMixin.js | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'src/components') diff --git a/src/components/_sila/AppHeader/AppHeader.vue b/src/components/_sila/AppHeader/AppHeader.vue index 4b1529ad..22c15482 100644 --- a/src/components/_sila/AppHeader/AppHeader.vue +++ b/src/components/_sila/AppHeader/AppHeader.vue @@ -337,7 +337,7 @@ export default { }, methods: { logsPage(id) { - return `/logs/event-logs?search=${id}`; + return `/logs/event-logs?by=id&search=${id}`; }, logs(type) { let logs = this.$store.getters['eventLog/allEvents'].filter((log) => { diff --git a/src/components/_sila/Global/Search.vue b/src/components/_sila/Global/Search.vue index 79a403ad..002669cd 100644 --- a/src/components/_sila/Global/Search.vue +++ b/src/components/_sila/Global/Search.vue @@ -102,7 +102,7 @@ export default { this.$emit('search-by', this.searchBy); }, removeSearchParam() { - window.location.href = '/#/logs/event-logs'; + this.$router.push('/logs/event-logs'); }, search() { if (!this.params) { @@ -110,9 +110,14 @@ export default { } let search = this.params.get('search'); + let by = this.params.get('by'); if (search) { this.filter = search; this.onChangeInput(); + if (by) { + this.searchBy = by; + this.onSelect(); + } } }, onChangeInput() { diff --git a/src/components/_sila/Mixins/BVToastMixin.js b/src/components/_sila/Mixins/BVToastMixin.js index 9d9e0a1a..41248420 100644 --- a/src/components/_sila/Mixins/BVToastMixin.js +++ b/src/components/_sila/Mixins/BVToastMixin.js @@ -48,7 +48,7 @@ const BVToastMixin = { this.$root.$bvToast.toast(body, { title, variant, - autoHideDelay: 10000, //auto hide in milliseconds + autoHideDelay: 3000, //auto hide in milliseconds noAutoHide: variant !== 'success', isStatus: true, solid: true, -- cgit v1.2.3