From 590203849ee16eb8c384aca15f9e6093246dced6 Mon Sep 17 00:00:00 2001 From: John Simons Date: Tue, 12 Aug 2025 11:33:22 +1000 Subject: [PATCH 1/2] Included 2 new options for the endpoint type selection --- .../src/views/throughputreport/EndpointsView.spec.ts | 10 +++++----- .../src/views/throughputreport/EndpointsView.vue | 6 +++++- .../throughputreport/LegendGatewayOrBridgeEndpoint.vue | 3 +++ .../throughputreport/LegendServiceControlEndpoint.vue | 3 +++ .../endpoints/DetectedBrokerQueuesView.vue | 2 ++ .../endpoints/DetectedEndpointsView.vue | 10 +++++++++- .../views/throughputreport/endpoints/userIndicator.ts | 2 ++ .../throughputreport/endpoints/userIndicatorMapper.ts | 2 ++ 8 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 src/Frontend/src/views/throughputreport/LegendGatewayOrBridgeEndpoint.vue create mode 100644 src/Frontend/src/views/throughputreport/LegendServiceControlEndpoint.vue diff --git a/src/Frontend/src/views/throughputreport/EndpointsView.spec.ts b/src/Frontend/src/views/throughputreport/EndpointsView.spec.ts index 3d44e61b0..b93b7c0ba 100644 --- a/src/Frontend/src/views/throughputreport/EndpointsView.spec.ts +++ b/src/Frontend/src/views/throughputreport/EndpointsView.spec.ts @@ -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 () => { diff --git a/src/Frontend/src/views/throughputreport/EndpointsView.vue b/src/Frontend/src/views/throughputreport/EndpointsView.vue index d81d03ee3..6c3ed49a8 100644 --- a/src/Frontend/src/views/throughputreport/EndpointsView.vue +++ b/src/Frontend/src/views/throughputreport/EndpointsView.vue @@ -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 LegendServiceControlEndpoint from "./LegendServiceControlEndpoint.vue"; const { isBrokerTransport } = storeToRefs(useThroughputStore()); -const showLegend = ref(true); +const showLegend = ref(false); const legendOptions = new Map([ [UserIndicator.NServiceBusEndpoint, LegendNServiceBusEndpoint], @@ -23,6 +25,8 @@ const legendOptions = new Map([ [UserIndicator.SendOnlyEndpoint, LegendSendOnlyEndpoint], [UserIndicator.PlannedToDecommission, LegendPlannedToDecommission], [UserIndicator.NotNServiceBusEndpoint, LegendNotNServiceBusEndpoint], + [UserIndicator.GatewayOrBridgingEndpoint, LegendGatewayOrBridgeEndpoint], + [UserIndicator.ServiceControlEndpoint, LegendServiceControlEndpoint], ]); function toggleOptionsLegendVisible() { diff --git a/src/Frontend/src/views/throughputreport/LegendGatewayOrBridgeEndpoint.vue b/src/Frontend/src/views/throughputreport/LegendGatewayOrBridgeEndpoint.vue new file mode 100644 index 000000000..a14e5bb52 --- /dev/null +++ b/src/Frontend/src/views/throughputreport/LegendGatewayOrBridgeEndpoint.vue @@ -0,0 +1,3 @@ + diff --git a/src/Frontend/src/views/throughputreport/LegendServiceControlEndpoint.vue b/src/Frontend/src/views/throughputreport/LegendServiceControlEndpoint.vue new file mode 100644 index 000000000..a14e5bb52 --- /dev/null +++ b/src/Frontend/src/views/throughputreport/LegendServiceControlEndpoint.vue @@ -0,0 +1,3 @@ + diff --git a/src/Frontend/src/views/throughputreport/endpoints/DetectedBrokerQueuesView.vue b/src/Frontend/src/views/throughputreport/endpoints/DetectedBrokerQueuesView.vue index 34c10162e..f7813ef51 100644 --- a/src/Frontend/src/views/throughputreport/endpoints/DetectedBrokerQueuesView.vue +++ b/src/Frontend/src/views/throughputreport/endpoints/DetectedBrokerQueuesView.vue @@ -31,6 +31,8 @@ const { testResults } = storeToRefs(store); UserIndicator.SendOnlyEndpoint, UserIndicator.NServiceBusEndpointNoLongerInUse, UserIndicator.PlannedToDecommission, + UserIndicator.GatewayOrBridgingEndpoint, + UserIndicator.ServiceControlEndpoint, ]" :source="DataSource.Broker" column-title="Queue Name" diff --git a/src/Frontend/src/views/throughputreport/endpoints/DetectedEndpointsView.vue b/src/Frontend/src/views/throughputreport/endpoints/DetectedEndpointsView.vue index 3f5bad574..db36b4a83 100644 --- a/src/Frontend/src/views/throughputreport/endpoints/DetectedEndpointsView.vue +++ b/src/Frontend/src/views/throughputreport/endpoints/DetectedEndpointsView.vue @@ -25,7 +25,15 @@ const { isBrokerTransport, hasErrors } = storeToRefs(useThroughputStore()); ([ [UserIndicator.SendOnlyEndpoint, "Send-Only Endpoint"], [UserIndicator.PlannedToDecommission, "Planned to be decommissioned"], [UserIndicator.NotNServiceBusEndpoint, "Not an NServiceBus Endpoint"], + [UserIndicator.GatewayOrBridgingEndpoint, "Gateway or Bridging Endpoint"], + [UserIndicator.ServiceControlEndpoint, "Service Control Endpoint"], ]); From e49a7f300114df8a3d59076f2dd571bbe213b0dc Mon Sep 17 00:00:00 2001 From: John Simons Date: Tue, 12 Aug 2025 15:01:18 +1000 Subject: [PATCH 2/2] Updates based on feedback --- src/Frontend/src/views/throughputreport/EndpointsView.vue | 4 ++-- .../views/throughputreport/LegendGatewayOrBridgeEndpoint.vue | 5 ++++- ...trolEndpoint.vue => LegendParticularPlatformEndpoint.vue} | 0 .../throughputreport/endpoints/DetectedBrokerQueuesView.vue | 2 +- .../throughputreport/endpoints/DetectedEndpointsView.vue | 2 +- .../src/views/throughputreport/endpoints/userIndicator.ts | 2 +- .../views/throughputreport/endpoints/userIndicatorMapper.ts | 2 +- 7 files changed, 10 insertions(+), 7 deletions(-) rename src/Frontend/src/views/throughputreport/{LegendServiceControlEndpoint.vue => LegendParticularPlatformEndpoint.vue} (100%) diff --git a/src/Frontend/src/views/throughputreport/EndpointsView.vue b/src/Frontend/src/views/throughputreport/EndpointsView.vue index 6c3ed49a8..0a7dab673 100644 --- a/src/Frontend/src/views/throughputreport/EndpointsView.vue +++ b/src/Frontend/src/views/throughputreport/EndpointsView.vue @@ -13,7 +13,7 @@ import LegendSendOnlyEndpoint from "./LegendSendOnlyEndpoint.vue"; import LegendPlannedToDecommission from "./LegendPlannedToDecommission.vue"; import LegendNotNServiceBusEndpoint from "./LegendNotNServiceBusEndpoint.vue"; import LegendGatewayOrBridgeEndpoint from "./LegendGatewayOrBridgeEndpoint.vue"; -import LegendServiceControlEndpoint from "./LegendServiceControlEndpoint.vue"; +import LegendParticularPlatformEndpoint from "./LegendParticularPlatformEndpoint.vue"; const { isBrokerTransport } = storeToRefs(useThroughputStore()); const showLegend = ref(false); @@ -26,7 +26,7 @@ const legendOptions = new Map([ [UserIndicator.PlannedToDecommission, LegendPlannedToDecommission], [UserIndicator.NotNServiceBusEndpoint, LegendNotNServiceBusEndpoint], [UserIndicator.GatewayOrBridgingEndpoint, LegendGatewayOrBridgeEndpoint], - [UserIndicator.ServiceControlEndpoint, LegendServiceControlEndpoint], + [UserIndicator.ParticularPlatformEndpoint, LegendParticularPlatformEndpoint], ]); function toggleOptionsLegendVisible() { diff --git a/src/Frontend/src/views/throughputreport/LegendGatewayOrBridgeEndpoint.vue b/src/Frontend/src/views/throughputreport/LegendGatewayOrBridgeEndpoint.vue index a14e5bb52..40cae6e92 100644 --- a/src/Frontend/src/views/throughputreport/LegendGatewayOrBridgeEndpoint.vue +++ b/src/Frontend/src/views/throughputreport/LegendGatewayOrBridgeEndpoint.vue @@ -1,3 +1,6 @@ diff --git a/src/Frontend/src/views/throughputreport/LegendServiceControlEndpoint.vue b/src/Frontend/src/views/throughputreport/LegendParticularPlatformEndpoint.vue similarity index 100% rename from src/Frontend/src/views/throughputreport/LegendServiceControlEndpoint.vue rename to src/Frontend/src/views/throughputreport/LegendParticularPlatformEndpoint.vue diff --git a/src/Frontend/src/views/throughputreport/endpoints/DetectedBrokerQueuesView.vue b/src/Frontend/src/views/throughputreport/endpoints/DetectedBrokerQueuesView.vue index f7813ef51..b2a990995 100644 --- a/src/Frontend/src/views/throughputreport/endpoints/DetectedBrokerQueuesView.vue +++ b/src/Frontend/src/views/throughputreport/endpoints/DetectedBrokerQueuesView.vue @@ -32,7 +32,7 @@ const { testResults } = storeToRefs(store); UserIndicator.NServiceBusEndpointNoLongerInUse, UserIndicator.PlannedToDecommission, UserIndicator.GatewayOrBridgingEndpoint, - UserIndicator.ServiceControlEndpoint, + UserIndicator.ParticularPlatformEndpoint, ]" :source="DataSource.Broker" column-title="Queue Name" diff --git a/src/Frontend/src/views/throughputreport/endpoints/DetectedEndpointsView.vue b/src/Frontend/src/views/throughputreport/endpoints/DetectedEndpointsView.vue index db36b4a83..05984d089 100644 --- a/src/Frontend/src/views/throughputreport/endpoints/DetectedEndpointsView.vue +++ b/src/Frontend/src/views/throughputreport/endpoints/DetectedEndpointsView.vue @@ -32,7 +32,7 @@ const { isBrokerTransport, hasErrors } = storeToRefs(useThroughputStore()); UserIndicator.NServiceBusEndpointNoLongerInUse, UserIndicator.PlannedToDecommission, UserIndicator.GatewayOrBridgingEndpoint, - UserIndicator.ServiceControlEndpoint, + UserIndicator.ParticularPlatformEndpoint, ]" :source="DataSource.WellKnownEndpoint" column-title="Endpoint Name" diff --git a/src/Frontend/src/views/throughputreport/endpoints/userIndicator.ts b/src/Frontend/src/views/throughputreport/endpoints/userIndicator.ts index 3ea269035..e0d1199d2 100644 --- a/src/Frontend/src/views/throughputreport/endpoints/userIndicator.ts +++ b/src/Frontend/src/views/throughputreport/endpoints/userIndicator.ts @@ -6,5 +6,5 @@ export enum UserIndicator { NServiceBusEndpointNoLongerInUse = "NServiceBusEndpointNoLongerInUse", PlannedToDecommission = "PlannedToDecommission", GatewayOrBridgingEndpoint = "GatewayOrBridgingEndpoint", - ServiceControlEndpoint = "ServiceControlEndpoint", + ParticularPlatformEndpoint = "ParticularPlatformEndpoint", } diff --git a/src/Frontend/src/views/throughputreport/endpoints/userIndicatorMapper.ts b/src/Frontend/src/views/throughputreport/endpoints/userIndicatorMapper.ts index ab26e883f..09f5c8d0d 100644 --- a/src/Frontend/src/views/throughputreport/endpoints/userIndicatorMapper.ts +++ b/src/Frontend/src/views/throughputreport/endpoints/userIndicatorMapper.ts @@ -8,5 +8,5 @@ export const userIndicatorMapper = new Map([ [UserIndicator.PlannedToDecommission, "Planned to be decommissioned"], [UserIndicator.NotNServiceBusEndpoint, "Not an NServiceBus Endpoint"], [UserIndicator.GatewayOrBridgingEndpoint, "Gateway or Bridging Endpoint"], - [UserIndicator.ServiceControlEndpoint, "Service Control Endpoint"], + [UserIndicator.ParticularPlatformEndpoint, "Particular Platform Infrastructure Endpoint"], ]);