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
10 changes: 5 additions & 5 deletions src/Frontend/src/views/throughputreport/EndpointsView.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,20 +44,20 @@ describe("EndpointsView tests", () => {
return { debug, driver };
}

test("instructions by default are showing", async () => {
test("instructions by default are not showing", async () => {
await renderComponent();

expect(screen.queryByText(/Hide Endpoint Types meaning/i)).toBeInTheDocument();
expect(screen.queryByText(/Show Endpoint Types meaning/i)).toBeInTheDocument();
});

test("hide instructions", async () => {
test("show instructions", async () => {
await renderComponent();

const use = userEvent.setup();

await use.click(screen.getByRole("link", { name: /Hide Endpoint Types meaning/i }));
await use.click(screen.getByRole("link", { name: /Show Endpoint Types meaning/i }));

expect(screen.queryByText(/Show Endpoint Types meaning/i)).toBeInTheDocument();
expect(screen.queryByText(/Hide Endpoint Types meaning/i)).toBeInTheDocument();
});

test("broker displays the two tabs", async () => {
Expand Down
6 changes: 5 additions & 1 deletion src/Frontend/src/views/throughputreport/EndpointsView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ import LegendTransactionalSessionProcessorEndpoint from "./LegendTransactionalSe
import LegendSendOnlyEndpoint from "./LegendSendOnlyEndpoint.vue";
import LegendPlannedToDecommission from "./LegendPlannedToDecommission.vue";
import LegendNotNServiceBusEndpoint from "./LegendNotNServiceBusEndpoint.vue";
import LegendGatewayOrBridgeEndpoint from "./LegendGatewayOrBridgeEndpoint.vue";
import LegendParticularPlatformEndpoint from "./LegendParticularPlatformEndpoint.vue";

const { isBrokerTransport } = storeToRefs(useThroughputStore());
const showLegend = ref(true);
Copy link
Member Author

Choose a reason for hiding this comment

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

Decided to hide the legend by default, given that it is occupying quite a bit of space and pushing the relevant UI down.

const showLegend = ref(false);

const legendOptions = new Map<UserIndicator, Component>([
[UserIndicator.NServiceBusEndpoint, LegendNServiceBusEndpoint],
Expand All @@ -23,6 +25,8 @@ const legendOptions = new Map<UserIndicator, Component>([
[UserIndicator.SendOnlyEndpoint, LegendSendOnlyEndpoint],
[UserIndicator.PlannedToDecommission, LegendPlannedToDecommission],
[UserIndicator.NotNServiceBusEndpoint, LegendNotNServiceBusEndpoint],
[UserIndicator.GatewayOrBridgingEndpoint, LegendGatewayOrBridgeEndpoint],
[UserIndicator.ParticularPlatformEndpoint, LegendParticularPlatformEndpoint],
]);

function toggleOptionsLegendVisible() {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<template>
<span>
This is either part of the <a href="https://docs.particular.net/nservicebus/gateway" target="_blank">Gateway</a> infrastructure or part of the
<a href="https://docs.particular.net/nservicebus/bridge" target="_blank">Messaging Bridge</a> infrastructure.
</span>
</template>
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<template>
<span>This is an infrastructure endpoint used by the Particular Platform</span>
</template>
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ const { testResults } = storeToRefs(store);
UserIndicator.SendOnlyEndpoint,
UserIndicator.NServiceBusEndpointNoLongerInUse,
UserIndicator.PlannedToDecommission,
UserIndicator.GatewayOrBridgingEndpoint,
UserIndicator.ParticularPlatformEndpoint,
]"
:source="DataSource.Broker"
column-title="Queue Name"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,15 @@ const { isBrokerTransport, hasErrors } = storeToRefs(useThroughputStore());
</template>
<DetectedListView
ariaLabel="Detected endpoints"
:indicator-options="[UserIndicator.NServiceBusEndpoint, UserIndicator.TransactionalSessionProcessorEndpoint, UserIndicator.SendOnlyEndpoint, UserIndicator.NServiceBusEndpointNoLongerInUse, UserIndicator.PlannedToDecommission]"
:indicator-options="[
UserIndicator.NServiceBusEndpoint,
UserIndicator.TransactionalSessionProcessorEndpoint,
UserIndicator.SendOnlyEndpoint,
UserIndicator.NServiceBusEndpointNoLongerInUse,
UserIndicator.PlannedToDecommission,
UserIndicator.GatewayOrBridgingEndpoint,
UserIndicator.ParticularPlatformEndpoint,
]"
:source="DataSource.WellKnownEndpoint"
column-title="Endpoint Name"
:show-endpoint-type-placeholder="false"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ export enum UserIndicator {
SendOnlyEndpoint = "SendOnlyEndpoint",
NServiceBusEndpointNoLongerInUse = "NServiceBusEndpointNoLongerInUse",
PlannedToDecommission = "PlannedToDecommission",
GatewayOrBridgingEndpoint = "GatewayOrBridgingEndpoint",
ParticularPlatformEndpoint = "ParticularPlatformEndpoint",
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@ export const userIndicatorMapper = new Map<UserIndicator, string>([
[UserIndicator.SendOnlyEndpoint, "Send-Only Endpoint"],
[UserIndicator.PlannedToDecommission, "Planned to be decommissioned"],
[UserIndicator.NotNServiceBusEndpoint, "Not an NServiceBus Endpoint"],
[UserIndicator.GatewayOrBridgingEndpoint, "Gateway or Bridging Endpoint"],
[UserIndicator.ParticularPlatformEndpoint, "Particular Platform Infrastructure Endpoint"],
]);
Loading