Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/Frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/Frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"bootstrap": "^5.3.5",
"bootstrap-icons": "^1.11.3",
"codemirror": "^6.0.1",
"hex-to-css-filter": "^6.0.0",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lib to help convert hex to filter

"lodash.debounce": "^4.0.8",
"lossless-json": "^4.0.2",
"memoize-one": "^6.0.0",
Expand Down
8 changes: 4 additions & 4 deletions src/Frontend/src/assets/endpoint.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion src/Frontend/src/components/failedmessages/MessageList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import TimeSince from "../TimeSince.vue";
import NoData from "../NoData.vue";
import routeLinks from "@/router/routeLinks";
import { FailedMessageStatus, ExtendedFailedMessage } from "@/resources/FailedMessage";
import { hexToCSSFilter } from "hex-to-css-filter";

export interface IMessageList {
getSelectedMessages(): ExtendedFailedMessage[];
Expand Down Expand Up @@ -89,6 +90,7 @@ defineExpose<IMessageList>({
isAnythingDisplayed,
numberDisplayed,
});
const endpointColor = hexToCSSFilter("#929E9E").filter;
</script>

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

<span class="metadata"><i class="fa fa-clock-o"></i> Failed: <time-since :dateUtc="message.time_of_failure"></time-since></span>
<span class="metadata"><i class="fa pa-endpoint"></i> Endpoint: {{ message.receiving_endpoint.name }}</span>
<span class="metadata"><i class="fa pa-endpoint" :style="{ filter: endpointColor }"></i> Endpoint: {{ message.receiving_endpoint.name }}</span>
<span class="metadata"><i class="fa fa-laptop"></i> Machine: {{ message.receiving_endpoint.host }}</span>
<span class="metadata" v-if="message.redirect"><i class="fa pa-redirect-source pa-redirect-small"></i> Redirect: {{ message.redirect }}</span>
<!-- for deleted messages-->
Expand Down
2 changes: 1 addition & 1 deletion src/Frontend/src/components/heartbeats/LastHeartbeat.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ defineProps<{ date?: string; tooltipTarget: string }>();
<p>No heartbeat data received for this {{ tooltipTarget }}.</p>
<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>
</template>
<span title="Last Heartbeat">No data available</span>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was causing a double up of tooltips

<span>No data available</span>
</tippy>
</p>
</template>
4 changes: 3 additions & 1 deletion src/Frontend/src/components/messages/MessageView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import HeadersView from "@/components/messages/HeadersView.vue";
import StackTraceView from "@/components/messages/StacktraceView.vue";
import { stringify, parse } from "lossless-json";
import xmlFormat from "xml-formatter";
import { hexToCSSFilter } from "hex-to-css-filter";

let refreshInterval: number | undefined;
let pollingFaster = false;
Expand Down Expand Up @@ -278,6 +279,7 @@ onMounted(async () => {
onUnmounted(() => {
stopRefreshInterval();
});
const endpointColor = hexToCSSFilter("#929E9E").filter;
</script>

<template>
Expand Down Expand Up @@ -315,7 +317,7 @@ onUnmounted(() => {
<i class="fa fa-history"></i> <RouterLink :to="{ path: routeLinks.messages.failedMessage.link(failedMessage.edit_of), query: { back: route.path } }">View previous version</RouterLink>
</span>
<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>
<span class="metadata"><i class="fa pa-endpoint"></i> Endpoint: {{ failedMessage.receiving_endpoint.name }}</span>
<span class="metadata"><i class="fa pa-endpoint" :style="{ filter: endpointColor }"></i> Endpoint: {{ failedMessage.receiving_endpoint.name }}</span>
<span class="metadata"><i class="fa fa-laptop"></i> Machine: {{ failedMessage.receiving_endpoint.host }}</span>
<span v-if="failedMessage.redirect" class="metadata"><i class="fa pa-redirect-source pa-redirect-small"></i> Redirect: {{ failedMessage.redirect }}</span>
</div>
Expand Down
Loading