Skip to content

Remove show/hide address #2366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove show/hide address #2366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
70 changes: 31 additions & 39 deletions src/Frontend/src/components/messages2/FlowDiagram/FlowDiagram.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import TimeSince from "../../TimeSince.vue";
import routeLinks from "@/router/routeLinks.ts";
import Message, { MessageIntent, MessageStatus, SagaInfo } from "@/resources/Message.ts";
import { NServiceBusHeaders } from "@/resources/Header.ts";
import { ControlButton, Controls } from "@vue-flow/controls";
import { Controls } from "@vue-flow/controls";
import { useMessageStore } from "@/stores/MessageStore.ts";
import LoadingSpinner from "@/components/LoadingSpinner.vue";
import { storeToRefs } from "pinia";
Expand Down Expand Up @@ -204,7 +204,7 @@ onMounted(async () => {
});

async function layoutGraph() {
nodes.value = layout(nodes.value, edges.value, showAddress.value);
nodes.value = layout(nodes.value, edges.value);

await nextTick(() => {
if (store.state.data.id) {
Expand All @@ -213,42 +213,31 @@ async function layoutGraph() {
});
}

const showAddress = ref(true);

async function toggleAddress() {
showAddress.value = !showAddress.value;
await layoutGraph();
}

const blackColor = hexToCSSFilter("#000000").filter;
const greenColor = hexToCSSFilter("#1E5E3C").filter;
const errorColor = hexToCSSFilter("#be514a").filter;
const selectedErrorColor = hexToCSSFilter("#e8e6e8").filter;
</script>

<template>
<div v-if="store.conversationData.failed_to_load" class="alert alert-info">FlowDiagram data is unavailable.</div>
<LoadingSpinner v-else-if="store.conversationData.loading" />
<div v-else id="tree-container">
<VueFlow :nodes="nodes" :edges="edges" :min-zoom="0.1" :max-zoom="1.2" :only-render-visible-elements="true" @nodes-initialized="layoutGraph">
<Controls :show-interactive="false" position="top-left" class="controls">
<ControlButton v-tippy="showAddress ? `Hide endpoints` : `Show endpoints`" @click="toggleAddress">
<i class="fa pa-flow-endpoint" :style="{ filter: showAddress ? greenColor : blackColor }"></i>
</ControlButton>
</Controls>
<Controls :show-interactive="false" position="top-left" class="controls" />
<template #node-message="{ id, data }: { id: string; data: NodeData }">
<div v-if="showAddress">
<TextEllipses class="address" :text="`${data.sendingEndpoint.name}@${data.sendingEndpoint.host}`" />
</div>
<TextEllipses class="address" :text="`${data.sendingEndpoint.name}@${data.sendingEndpoint.host}`" />
<div class="node" :class="{ error: data.isError, 'current-message': id === store.state.data.id }">
<div class="node-text">
<i class="fa" :class="{ 'pa-flow-timeout': data.isTimeout, 'pa-flow-command': data.isCommand, 'pa-flow-event': data.isEvent }" v-tippy="data.type" />
<div class="lead">
<strong>
<RouterLink v-if="data.isError" :to="{ path: routeLinks.messages.failedMessage.link(id), query: { back: backLink } }"><TextEllipses style="width: 204px" :text="data.label" ellipses-style="LeftSide" /></RouterLink>
<RouterLink v-else :to="{ path: routeLinks.messages.successMessage.link(data.messageId, id), query: { back: backLink } }"><TextEllipses style="width: 204px" :text="data.label" ellipses-style="LeftSide" /></RouterLink>
</strong>
<i
class="fa"
:style="data.isError && id === store.state.data.id ? { filter: selectedErrorColor } : {}"
:class="{ 'pa-flow-timeout': data.isTimeout, 'pa-flow-command': data.isCommand, 'pa-flow-event': data.isEvent }"
v-tippy="data.type"
/>
<div class="typeName">
<RouterLink v-if="data.isError" :to="{ path: routeLinks.messages.failedMessage.link(id), query: { back: backLink } }"><TextEllipses style="width: 204px" :text="data.label" ellipses-style="LeftSide" /></RouterLink>
<RouterLink v-else :to="{ path: routeLinks.messages.successMessage.link(data.messageId, id), query: { back: backLink } }"><TextEllipses style="width: 204px" :text="data.label" ellipses-style="LeftSide" /></RouterLink>
</div>
<i v-if="data.isError" class="fa pa-flow-failed" :style="id !== store.state.data.id ? { filter: errorColor } : {}" />
<i v-if="data.isError" class="fa pa-flow-failed" :style="id !== store.state.data.id ? { filter: errorColor } : { filter: selectedErrorColor }" />
<div class="time-sent">
<time-since class="time-since" :date-utc="data.timeSent" />
</div>
Expand All @@ -264,9 +253,7 @@ const errorColor = hexToCSSFilter("#be514a").filter;
</div>
</div>
</div>
<div v-if="showAddress">
<TextEllipses class="address" :text="`${data.receivingEndpoint.name}@${data.receivingEndpoint.host}`" />
</div>
<TextEllipses class="address" :text="`${data.receivingEndpoint.name}@${data.receivingEndpoint.host}`" />
</template>
</VueFlow>
</div>
Expand Down Expand Up @@ -347,10 +334,14 @@ const errorColor = hexToCSSFilter("#be514a").filter;
margin-right: 5px;
}

.node-text .lead {
.node-text .typeName {
display: inline-block;
position: relative;
top: 4px;
font-weight: bold;
}

.node-text a {
color: #777f7f;
}

.address {
Expand All @@ -369,6 +360,15 @@ const errorColor = hexToCSSFilter("#be514a").filter;
background-color: #be514a !important;
}

.current-message.error .node-text .typeName a {
color: #e8e6e8;
font-weight: 900;
}

.current-message.error .node-text .time-since {
color: #e8e6e8;
}

.error {
border-color: #be514a;
}
Expand All @@ -386,14 +386,6 @@ const errorColor = hexToCSSFilter("#be514a").filter;
text-decoration: underline;
}

.pa-flow-endpoint {
background-image: url("@/assets/endpoint.svg");
background-position: center;
background-repeat: no-repeat;
height: 15px;
width: 15px;
}

.pa-flow-failed {
background-image: url("@/assets/failed-msg.svg");
background-position: center;
Expand Down
4 changes: 2 additions & 2 deletions src/Frontend/src/components/messages2/FlowDiagram/useLayout.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export function useLayout() {

const graph = ref(new dagre.graphlib.Graph());

function layout(nodes: Node[], edges: DefaultEdge[], showAddress: boolean) {
function layout(nodes: Node[], edges: DefaultEdge[]) {
// we create a new graph instance, in case some nodes/edges were removed, otherwise dagre would act as if they were still there
const dagreGraph = new dagre.graphlib.Graph();

Expand All @@ -22,7 +22,7 @@ export function useLayout() {
const graphNode = findNode(node.id);
if (graphNode === undefined) continue;

dagreGraph.setNode(node.id, { width: graphNode.dimensions.width || 250, height: (graphNode.dimensions.height || 55) + (showAddress ? 40 : 0) });
dagreGraph.setNode(node.id, { width: graphNode.dimensions.width || 250, height: graphNode.dimensions.height || 55 });
}

for (const edge of edges) {
Expand Down