diff options
| author | Vitalii Lysak <v.lysak@dunice.net> | 2022-08-12 14:18:47 +0300 |
|---|---|---|
| committer | Vitalii Lysak <v.lysak@dunice.net> | 2022-08-12 14:18:47 +0300 |
| commit | 162e0d338f5423662829e6d9784186a362a19832 (patch) | |
| tree | 22078e27634705282a43a82b355b923ec07bc25b | |
| parent | 13eb9c09c120271b378109a24f2c3e3d0c1bec84 (diff) | |
| download | webui-vue-162e0d338f5423662829e6d9784186a362a19832.tar.xz | |
upd route change logic
| -rw-r--r-- | src/App.vue | 2 | ||||
| -rw-r--r-- | src/components/_sila/AppHeader/AppHeader.vue | 2 | ||||
| -rw-r--r-- | src/components/_sila/Global/Search.vue | 7 | ||||
| -rw-r--r-- | src/components/_sila/Mixins/BVToastMixin.js | 2 | ||||
| -rw-r--r-- | src/views/_sila/Logs/EventLogs/EventLogs.vue | 3 |
5 files changed, 9 insertions, 7 deletions
diff --git a/src/App.vue b/src/App.vue index d2878946..9b51aa72 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,6 +1,6 @@ <template> <div id="app"> - <router-view /> + <router-view :key="$route.fullPath" /> </div> </template> 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, diff --git a/src/views/_sila/Logs/EventLogs/EventLogs.vue b/src/views/_sila/Logs/EventLogs/EventLogs.vue index 33b085b0..8f52083f 100644 --- a/src/views/_sila/Logs/EventLogs/EventLogs.vue +++ b/src/views/_sila/Logs/EventLogs/EventLogs.vue @@ -502,9 +502,6 @@ export default { uri: row.uri, status: row.status, }) - .then((success) => { - this.successToast(success); - }) .catch(({ message }) => this.errorToast(message)); }, deleteAllLogs() { |