Skip to content

Commit df6a848

Browse files
authored
Merge pull request #2325 from Particular/john/flowdiag2
Adding show/hide addresses to FlowDiagram
2 parents 0905e39 + 1a82407 commit df6a848

File tree

9 files changed

+116
-59
lines changed

9 files changed

+116
-59
lines changed

src/Frontend/package-lock.json

+13-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Frontend/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"bootstrap": "^5.3.5",
2727
"bootstrap-icons": "^1.11.3",
2828
"codemirror": "^6.0.1",
29+
"hex-to-css-filter": "^6.0.0",
2930
"lodash.debounce": "^4.0.8",
3031
"lossless-json": "^4.0.2",
3132
"memoize-one": "^6.0.0",

src/Frontend/src/assets/endpoint.svg

+4-4
Loading

src/Frontend/src/components/failedmessages/MessageList.vue

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import TimeSince from "../TimeSince.vue";
44
import NoData from "../NoData.vue";
55
import routeLinks from "@/router/routeLinks";
66
import { FailedMessageStatus, ExtendedFailedMessage } from "@/resources/FailedMessage";
7+
import { hexToCSSFilter } from "hex-to-css-filter";
78
89
export interface IMessageList {
910
getSelectedMessages(): ExtendedFailedMessage[];
@@ -89,6 +90,7 @@ defineExpose<IMessageList>({
8990
isAnythingDisplayed,
9091
numberDisplayed,
9192
});
93+
const endpointColor = hexToCSSFilter("#929E9E").filter;
9294
</script>
9395

9496
<template>
@@ -122,7 +124,7 @@ defineExpose<IMessageList>({
122124
<span v-if="message.edited" :title="'Message was edited'" class="label sidebar-label label-info metadata-label">Edited</span>
123125

124126
<span class="metadata"><i class="fa fa-clock-o"></i> Failed: <time-since :dateUtc="message.time_of_failure"></time-since></span>
125-
<span class="metadata"><i class="fa pa-endpoint"></i> Endpoint: {{ message.receiving_endpoint.name }}</span>
127+
<span class="metadata"><i class="fa pa-endpoint" :style="{ filter: endpointColor }"></i> Endpoint: {{ message.receiving_endpoint.name }}</span>
126128
<span class="metadata"><i class="fa fa-laptop"></i> Machine: {{ message.receiving_endpoint.host }}</span>
127129
<span class="metadata" v-if="message.redirect"><i class="fa pa-redirect-source pa-redirect-small"></i> Redirect: {{ message.redirect }}</span>
128130
<!-- for deleted messages-->

src/Frontend/src/components/heartbeats/LastHeartbeat.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ defineProps<{ date?: string; tooltipTarget: string }>();
1313
<p>No heartbeat data received for this {{ tooltipTarget }}.</p>
1414
<p>Have you installed and configured the <a target="_blank" href="https://docs.particular.net/monitoring/heartbeats/install-plugin">heartbeats plugin</a> for this {{ tooltipTarget }}?</p>
1515
</template>
16-
<span title="Last Heartbeat">No data available</span>
16+
<span>No data available</span>
1717
</tippy>
1818
</p>
1919
</template>

src/Frontend/src/components/messages/MessageView.vue

+3-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import HeadersView from "@/components/messages/HeadersView.vue";
2424
import StackTraceView from "@/components/messages/StacktraceView.vue";
2525
import { stringify, parse } from "lossless-json";
2626
import xmlFormat from "xml-formatter";
27+
import { hexToCSSFilter } from "hex-to-css-filter";
2728
2829
let refreshInterval: number | undefined;
2930
let pollingFaster = false;
@@ -278,6 +279,7 @@ onMounted(async () => {
278279
onUnmounted(() => {
279280
stopRefreshInterval();
280281
});
282+
const endpointColor = hexToCSSFilter("#929E9E").filter;
281283
</script>
282284

283285
<template>
@@ -315,7 +317,7 @@ onUnmounted(() => {
315317
<i class="fa fa-history"></i> <RouterLink :to="{ path: routeLinks.messages.failedMessage.link(failedMessage.edit_of), query: { back: route.path } }">View previous version</RouterLink>
316318
</span>
317319
<span v-if="failedMessage.time_of_failure" class="metadata"><i class="fa fa-clock-o"></i> Failed: <time-since :date-utc="failedMessage.time_of_failure"></time-since></span>
318-
<span class="metadata"><i class="fa pa-endpoint"></i> Endpoint: {{ failedMessage.receiving_endpoint.name }}</span>
320+
<span class="metadata"><i class="fa pa-endpoint" :style="{ filter: endpointColor }"></i> Endpoint: {{ failedMessage.receiving_endpoint.name }}</span>
319321
<span class="metadata"><i class="fa fa-laptop"></i> Machine: {{ failedMessage.receiving_endpoint.host }}</span>
320322
<span v-if="failedMessage.redirect" class="metadata"><i class="fa pa-redirect-source pa-redirect-small"></i> Redirect: {{ failedMessage.redirect }}</span>
321323
</div>

0 commit comments

Comments
 (0)