Skip to content

Commit f0d8d2e

Browse files
committed
A few small fixes
1 parent d504d42 commit f0d8d2e

File tree

2 files changed

+18
-20
lines changed

2 files changed

+18
-20
lines changed

src/Frontend/src/components/TabsLayout.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script setup lang="ts">
2-
import { ref, type Component, type DefineComponent } from "vue";
2+
import { ref, type Component, type DefineComponent, shallowRef } from "vue";
33
44
interface Tab {
55
text: string;
@@ -8,7 +8,7 @@ interface Tab {
88
99
const props = defineProps<{ tabs: Tab[] }>();
1010
const activePanel = ref(0);
11-
const activeComponent = ref(props.tabs[0].component);
11+
const activeComponent = shallowRef(props.tabs[0].component);
1212
1313
function togglePanel(panelIndex: number) {
1414
activePanel.value = panelIndex;

src/Frontend/src/components/messages/MessageView2.vue

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,9 @@ const route = useRoute();
2424
const id = computed(() => route.params.id as string);
2525
const messageId = computed(() => route.params.messageId as string);
2626
const isError = computed(() => messageId.value === undefined);
27-
2827
const isMassTransitConnected = useIsMassTransitConnected();
2928
const store = useMessageViewStore();
3029
const { state } = storeToRefs(store);
31-
32-
watch(
33-
[id, messageId],
34-
async ([newId, newMessageId], [oldId, oldMessageId]) => {
35-
if (newId !== oldId || newMessageId !== oldMessageId) {
36-
store.reset();
37-
}
38-
39-
if (newMessageId !== undefined) {
40-
await store.loadMessage(newMessageId, newId);
41-
} else {
42-
await store.loadFailedMessage(newId);
43-
}
44-
},
45-
{ immediate: true }
46-
);
47-
4830
const tabs = computed(() => {
4931
const currentTabs = [
5032
{
@@ -73,6 +55,22 @@ const tabs = computed(() => {
7355
7456
return currentTabs;
7557
});
58+
59+
watch(
60+
[id, messageId],
61+
async ([newId, newMessageId], [oldId, oldMessageId]) => {
62+
if (newId !== oldId || newMessageId !== oldMessageId) {
63+
store.reset();
64+
}
65+
66+
if (newMessageId !== undefined) {
67+
await store.loadMessage(newMessageId, newId);
68+
} else {
69+
await store.loadFailedMessage(newId);
70+
}
71+
},
72+
{ immediate: true }
73+
);
7674
</script>
7775

7876
<template>

0 commit comments

Comments
 (0)