Skip to content

Commit f521388

Browse files
authored
Merge pull request #2580 from Particular/john/new-options
2 parents ba2c0c7 + e49a7f3 commit f521388

File tree

8 files changed

+34
-7
lines changed

8 files changed

+34
-7
lines changed

src/Frontend/src/views/throughputreport/EndpointsView.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,20 @@ describe("EndpointsView tests", () => {
4444
return { debug, driver };
4545
}
4646

47-
test("instructions by default are showing", async () => {
47+
test("instructions by default are not showing", async () => {
4848
await renderComponent();
4949

50-
expect(screen.queryByText(/Hide Endpoint Types meaning/i)).toBeInTheDocument();
50+
expect(screen.queryByText(/Show Endpoint Types meaning/i)).toBeInTheDocument();
5151
});
5252

53-
test("hide instructions", async () => {
53+
test("show instructions", async () => {
5454
await renderComponent();
5555

5656
const use = userEvent.setup();
5757

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

60-
expect(screen.queryByText(/Show Endpoint Types meaning/i)).toBeInTheDocument();
60+
expect(screen.queryByText(/Hide Endpoint Types meaning/i)).toBeInTheDocument();
6161
});
6262

6363
test("broker displays the two tabs", async () => {

src/Frontend/src/views/throughputreport/EndpointsView.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@ import LegendTransactionalSessionProcessorEndpoint from "./LegendTransactionalSe
1212
import LegendSendOnlyEndpoint from "./LegendSendOnlyEndpoint.vue";
1313
import LegendPlannedToDecommission from "./LegendPlannedToDecommission.vue";
1414
import LegendNotNServiceBusEndpoint from "./LegendNotNServiceBusEndpoint.vue";
15+
import LegendGatewayOrBridgeEndpoint from "./LegendGatewayOrBridgeEndpoint.vue";
16+
import LegendParticularPlatformEndpoint from "./LegendParticularPlatformEndpoint.vue";
1517
1618
const { isBrokerTransport } = storeToRefs(useThroughputStore());
17-
const showLegend = ref(true);
19+
const showLegend = ref(false);
1820
1921
const legendOptions = new Map<UserIndicator, Component>([
2022
[UserIndicator.NServiceBusEndpoint, LegendNServiceBusEndpoint],
@@ -23,6 +25,8 @@ const legendOptions = new Map<UserIndicator, Component>([
2325
[UserIndicator.SendOnlyEndpoint, LegendSendOnlyEndpoint],
2426
[UserIndicator.PlannedToDecommission, LegendPlannedToDecommission],
2527
[UserIndicator.NotNServiceBusEndpoint, LegendNotNServiceBusEndpoint],
28+
[UserIndicator.GatewayOrBridgingEndpoint, LegendGatewayOrBridgeEndpoint],
29+
[UserIndicator.ParticularPlatformEndpoint, LegendParticularPlatformEndpoint],
2630
]);
2731
2832
function toggleOptionsLegendVisible() {
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<template>
2+
<span>
3+
This is either part of the <a href="https://docs.particular.net/nservicebus/gateway" target="_blank">Gateway</a> infrastructure or part of the
4+
<a href="https://docs.particular.net/nservicebus/bridge" target="_blank">Messaging Bridge</a> infrastructure.
5+
</span>
6+
</template>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<template>
2+
<span>This is an infrastructure endpoint used by the Particular Platform</span>
3+
</template>

src/Frontend/src/views/throughputreport/endpoints/DetectedBrokerQueuesView.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ const { testResults } = storeToRefs(store);
3131
UserIndicator.SendOnlyEndpoint,
3232
UserIndicator.NServiceBusEndpointNoLongerInUse,
3333
UserIndicator.PlannedToDecommission,
34+
UserIndicator.GatewayOrBridgingEndpoint,
35+
UserIndicator.ParticularPlatformEndpoint,
3436
]"
3537
:source="DataSource.Broker"
3638
column-title="Queue Name"

src/Frontend/src/views/throughputreport/endpoints/DetectedEndpointsView.vue

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,15 @@ const { isBrokerTransport, hasErrors } = storeToRefs(useThroughputStore());
2525
</template>
2626
<DetectedListView
2727
ariaLabel="Detected endpoints"
28-
:indicator-options="[UserIndicator.NServiceBusEndpoint, UserIndicator.TransactionalSessionProcessorEndpoint, UserIndicator.SendOnlyEndpoint, UserIndicator.NServiceBusEndpointNoLongerInUse, UserIndicator.PlannedToDecommission]"
28+
:indicator-options="[
29+
UserIndicator.NServiceBusEndpoint,
30+
UserIndicator.TransactionalSessionProcessorEndpoint,
31+
UserIndicator.SendOnlyEndpoint,
32+
UserIndicator.NServiceBusEndpointNoLongerInUse,
33+
UserIndicator.PlannedToDecommission,
34+
UserIndicator.GatewayOrBridgingEndpoint,
35+
UserIndicator.ParticularPlatformEndpoint,
36+
]"
2937
:source="DataSource.WellKnownEndpoint"
3038
column-title="Endpoint Name"
3139
:show-endpoint-type-placeholder="false"

src/Frontend/src/views/throughputreport/endpoints/userIndicator.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@ export enum UserIndicator {
55
SendOnlyEndpoint = "SendOnlyEndpoint",
66
NServiceBusEndpointNoLongerInUse = "NServiceBusEndpointNoLongerInUse",
77
PlannedToDecommission = "PlannedToDecommission",
8+
GatewayOrBridgingEndpoint = "GatewayOrBridgingEndpoint",
9+
ParticularPlatformEndpoint = "ParticularPlatformEndpoint",
810
}

src/Frontend/src/views/throughputreport/endpoints/userIndicatorMapper.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@ export const userIndicatorMapper = new Map<UserIndicator, string>([
77
[UserIndicator.SendOnlyEndpoint, "Send-Only Endpoint"],
88
[UserIndicator.PlannedToDecommission, "Planned to be decommissioned"],
99
[UserIndicator.NotNServiceBusEndpoint, "Not an NServiceBus Endpoint"],
10+
[UserIndicator.GatewayOrBridgingEndpoint, "Gateway or Bridging Endpoint"],
11+
[UserIndicator.ParticularPlatformEndpoint, "Particular Platform Infrastructure Endpoint"],
1012
]);

0 commit comments

Comments
 (0)