Skip to content

Commit 1ed110a

Browse files
authored
Merge pull request #2367 from Particular/john/querystrings
Fix issue with querystrings not passing through to the back like
2 parents b5014d7 + 89d25d6 commit 1ed110a

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/Frontend/src/components/messages2/MessageView.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script setup lang="ts">
22
import { computed, onMounted, ref, watch } from "vue";
3-
import { RouterLink, useRoute, useRouter } from "vue-router";
3+
import { RouteLocationAsPathGeneric, RouterLink, useRoute } from "vue-router";
44
import NoData from "../NoData.vue";
55
import TimeSince from "../TimeSince.vue";
66
import FlowDiagram from "./FlowDiagram/FlowDiagram.vue";
@@ -30,7 +30,7 @@ const isError = computed(() => messageId.value === undefined);
3030
const isMassTransitConnected = useIsMassTransitConnected();
3131
const store = useMessageStore();
3232
const { state } = storeToRefs(store);
33-
const backLink = ref<string>(routeLinks.failedMessage.failedMessages.link);
33+
const backLink = ref<RouteLocationAsPathGeneric>({ path: routeLinks.failedMessage.failedMessages.link });
3434
const tabs = computed(() => {
3535
const currentTabs = [
3636
{
@@ -86,9 +86,9 @@ watch(
8686
const endpointColor = hexToCSSFilter("#929E9E").filter;
8787
8888
onMounted(() => {
89-
const back = useRouter().currentRoute.value.query.back as string;
89+
const { back, ...otherArgs } = route.query;
9090
if (back) {
91-
backLink.value = back;
91+
backLink.value = { path: back.toString(), query: otherArgs };
9292
}
9393
});
9494
</script>
@@ -126,7 +126,7 @@ onMounted(() => {
126126
<template v-if="state.data.failure_metadata.edited">
127127
<MetadataLabel tooltip="Message was edited" type="info" text="Edited" />
128128
<span v-if="state.data.failure_metadata.edit_of" class="metadata metadata-link">
129-
<i class="fa fa-history"></i> <RouterLink :to="{ path: routeLinks.messages.failedMessage.link(state.data.failure_metadata.edit_of), query: { back: backLink } }">View previous version</RouterLink>
129+
<i class="fa fa-history"></i> <RouterLink :to="{ path: routeLinks.messages.failedMessage.link(state.data.failure_metadata.edit_of), query: route.query }">View previous version</RouterLink>
130130
</span>
131131
</template>
132132
<span v-if="state.data.failure_metadata.time_of_failure" class="metadata"><i class="fa fa-clock-o"></i> Failed: <time-since :date-utc="state.data.failure_metadata.time_of_failure"></time-since></span>

0 commit comments

Comments
 (0)