Skip to content

Commit 14111b2

Browse files
committed
Modifying view to use store
More changes
1 parent 02f37c6 commit 14111b2

24 files changed

+928
-89
lines changed

src/Frontend/public/js/app.constants.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ window.defaultConfig = {
44
service_control_url: 'http://localhost:33333/api/',
55
monitoring_urls: ['http://localhost:33633/'],
66
showPendingRetry: false,
7+
showAllMessages: true,
78
};

src/Frontend/src/components/CopyToClipboard.vue

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script setup lang="ts">
22
import { Tippy, TippyComponent } from "vue-tippy";
3-
import { useTemplateRef } from "vue";
3+
import { ref, useTemplateRef, watch } from "vue";
44
55
const props = withDefaults(
66
defineProps<{
@@ -11,14 +11,16 @@ const props = withDefaults(
1111
);
1212
1313
const tippyRef = useTemplateRef<TippyComponent | null>("tippyRef");
14-
let timeoutId: number;
14+
const timeoutId = ref(0);
1515
1616
async function copyToClipboard() {
1717
await navigator.clipboard.writeText(props.value);
18-
window.clearTimeout(timeoutId);
18+
1919
tippyRef.value?.show();
20-
timeoutId = window.setTimeout(() => tippyRef.value?.hide(), 3000);
20+
timeoutId.value = window.setTimeout(() => tippyRef.value?.hide(), 3000);
2121
}
22+
23+
watch(timeoutId, (_, previousTimeoutId) => window.clearTimeout(previousTimeoutId));
2224
</script>
2325

2426
<template>

src/Frontend/src/components/EventLogItem.vue

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script setup lang="ts">
2-
import { useRoute, useRouter } from "vue-router";
2+
import { useRouter } from "vue-router";
33
import TimeSince from "../components/TimeSince.vue";
44
import type EventLogItem from "@/resources/EventLogItem";
55
// eslint-disable-next-line no-duplicate-imports
@@ -8,7 +8,6 @@ import routeLinks from "@/router/routeLinks";
88
99
defineProps<{ eventLogItem: EventLogItem }>();
1010
const router = useRouter();
11-
const route = useRoute();
1211
1312
function navigateToEvent(eventLogItem: EventLogItem) {
1413
switch (eventLogItem.category) {
@@ -27,7 +26,7 @@ function navigateToEvent(eventLogItem: EventLogItem) {
2726
case "MessageFailures":
2827
if (eventLogItem.related_to?.length && eventLogItem.related_to[0].search("message") > 0) {
2928
const messageId = eventLogItem.related_to[0].substring(9);
30-
router.push({ path: routeLinks.messages.message.link(messageId), query: { back: route.path } });
29+
router.push({ path: routeLinks.messages.failedMessage.link(messageId) });
3130
} else {
3231
router.push(routeLinks.failedMessage.root);
3332
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<script setup lang="ts"></script>
2+
3+
<template>
4+
<div class="text-center">
5+
<div class="spinner-border" role="status">
6+
<span class="visually-hidden">Loading...</span>
7+
</div>
8+
</div>
9+
</template>

src/Frontend/src/components/audit/AuditList.vue

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,15 @@ function formatDotNetTimespan(timespan: string) {
101101
<template #content>
102102
<p :style="{ overflowWrap: 'break-word' }">{{ message.message_id }}</p>
103103
</template>
104-
<RouterLink class="hackToPreventSafariFromShowingTooltip" aria-label="details-link" :to="{ path: routeLinks.messages.message.link(message.id), query: { back: route.path } }">
104+
<RouterLink
105+
v-if="message.status === MessageStatus.Successful"
106+
class="hackToPreventSafariFromShowingTooltip"
107+
aria-label="details-link"
108+
:to="{ path: routeLinks.messages.successMessage.link(message.message_id, message.id), query: { back: route.path } }"
109+
>
110+
{{ message.message_id }}
111+
</RouterLink>
112+
<RouterLink v-else class="hackToPreventSafariFromShowingTooltip" aria-label="details-link" :to="{ path: routeLinks.messages.failedMessage.link(message.id) }">
105113
{{ message.message_id }}
106114
</RouterLink>
107115
</tippy>

src/Frontend/src/components/failedmessages/EditRetryDialog.vue

Lines changed: 2 additions & 6 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 { useRetryEditedMessage } from "../../composables/serviceFailedMessage";
3+
import { useRetryEditedMessage } from "@/composables/serviceFailedMessage.ts";
44
import MessageHeader from "./EditMessageHeader.vue";
55
import { EditAndRetryConfig } from "@/resources/Configuration";
66
import type Header from "@/resources/Header";
@@ -65,11 +65,7 @@ watch(messageBody, (newValue) => {
6565
if (newValue !== origMessageBody) {
6666
localMessage.value.isBodyChanged = true;
6767
}
68-
if (newValue === "") {
69-
localMessage.value.isBodyEmpty = true;
70-
} else {
71-
localMessage.value.isBodyEmpty = false;
72-
}
68+
localMessage.value.isBodyEmpty = newValue === "";
7369
});
7470
7571
function close() {

0 commit comments

Comments
 (0)