From 40961722e79b37b55b5315541ad8bf5be005444e Mon Sep 17 00:00:00 2001 From: Udi Dahan Date: Tue, 6 Oct 2026 16:45:59 +0300 Subject: [PATCH 1/7] Reorder the list of endpoint types To better reflect context, like that a TransactionSession is "under" / a type of Send-Only endpoint. --- .../views/throughputreport/queues/DetectedEndpointsView.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Frontend/src/views/throughputreport/queues/DetectedEndpointsView.vue b/src/Frontend/src/views/throughputreport/queues/DetectedEndpointsView.vue index a6d3b91e4..c71e7b157 100644 --- a/src/Frontend/src/views/throughputreport/queues/DetectedEndpointsView.vue +++ b/src/Frontend/src/views/throughputreport/queues/DetectedEndpointsView.vue @@ -28,12 +28,12 @@ const { isBrokerTransport, hasErrors } = storeToRefs(store); ariaLabel="Detected endpoints" :indicator-options="[ UserIndicator.NServiceBusEndpoint, - UserIndicator.TransactionalSessionProcessorEndpoint, UserIndicator.SendOnlyEndpoint, - UserIndicator.NServiceBusEndpointNoLongerInUse, - UserIndicator.PlannedToDecommission, + UserIndicator.TransactionalSessionProcessorEndpoint, UserIndicator.GatewayOrBridgingEndpoint, UserIndicator.ParticularPlatformEndpoint, + UserIndicator.PlannedToDecommission, + UserIndicator.NServiceBusEndpointNoLongerInUse, ]" :source="DataSource.WellKnownEndpoint" column-title="Endpoint Name" From c80998bd790fc9a958ee37500f9a800b91c1de01 Mon Sep 17 00:00:00 2001 From: Udi Dahan Date: Tue, 6 Oct 2026 16:48:16 +0300 Subject: [PATCH 2/7] Update DetectedBrokerQueuesView.vue --- .../throughputreport/queues/DetectedBrokerQueuesView.vue | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Frontend/src/views/throughputreport/queues/DetectedBrokerQueuesView.vue b/src/Frontend/src/views/throughputreport/queues/DetectedBrokerQueuesView.vue index 56914f305..63602c736 100644 --- a/src/Frontend/src/views/throughputreport/queues/DetectedBrokerQueuesView.vue +++ b/src/Frontend/src/views/throughputreport/queues/DetectedBrokerQueuesView.vue @@ -26,13 +26,12 @@ const { testResults } = storeToRefs(store); ariaLabel="Detected broker queues" :indicator-options="[ UserIndicator.NServiceBusEndpoint, - UserIndicator.NotNServiceBusEndpoint, - UserIndicator.TransactionalSessionProcessorEndpoint, UserIndicator.SendOnlyEndpoint, - UserIndicator.NServiceBusEndpointNoLongerInUse, - UserIndicator.PlannedToDecommission, + UserIndicator.TransactionalSessionProcessorEndpoint, UserIndicator.GatewayOrBridgingEndpoint, UserIndicator.ParticularPlatformEndpoint, + UserIndicator.PlannedToDecommission, + UserIndicator.NServiceBusEndpointNoLongerInUse, ]" :source="DataSource.Broker" column-title="Queue Name" From b90de5b962c405dc793e89a6e96d3757673313dd Mon Sep 17 00:00:00 2001 From: Udi Dahan Date: Tue, 6 Oct 2026 16:52:29 +0300 Subject: [PATCH 3/7] Update DetectedBrokerQueuesView.vue --- .../views/throughputreport/queues/DetectedBrokerQueuesView.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Frontend/src/views/throughputreport/queues/DetectedBrokerQueuesView.vue b/src/Frontend/src/views/throughputreport/queues/DetectedBrokerQueuesView.vue index 63602c736..7fa538936 100644 --- a/src/Frontend/src/views/throughputreport/queues/DetectedBrokerQueuesView.vue +++ b/src/Frontend/src/views/throughputreport/queues/DetectedBrokerQueuesView.vue @@ -30,6 +30,7 @@ const { testResults } = storeToRefs(store); UserIndicator.TransactionalSessionProcessorEndpoint, UserIndicator.GatewayOrBridgingEndpoint, UserIndicator.ParticularPlatformEndpoint, + UserIndicator.NotNServiceBusEndpoint, UserIndicator.PlannedToDecommission, UserIndicator.NServiceBusEndpointNoLongerInUse, ]" From f568311bd8f7bde2feb5fed70579ff35f05c13a2 Mon Sep 17 00:00:00 2001 From: Udi Dahan Date: Tue, 6 Oct 2026 16:53:08 +0300 Subject: [PATCH 4/7] Update DetectedBrokerQueuesView.vue --- .../views/throughputreport/queues/DetectedBrokerQueuesView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Frontend/src/views/throughputreport/queues/DetectedBrokerQueuesView.vue b/src/Frontend/src/views/throughputreport/queues/DetectedBrokerQueuesView.vue index 7fa538936..a4d70ebc7 100644 --- a/src/Frontend/src/views/throughputreport/queues/DetectedBrokerQueuesView.vue +++ b/src/Frontend/src/views/throughputreport/queues/DetectedBrokerQueuesView.vue @@ -30,9 +30,9 @@ const { testResults } = storeToRefs(store); UserIndicator.TransactionalSessionProcessorEndpoint, UserIndicator.GatewayOrBridgingEndpoint, UserIndicator.ParticularPlatformEndpoint, - UserIndicator.NotNServiceBusEndpoint, UserIndicator.PlannedToDecommission, UserIndicator.NServiceBusEndpointNoLongerInUse, + UserIndicator.NotNServiceBusEndpoint, ]" :source="DataSource.Broker" column-title="Queue Name" From 41feb70a5ce5f57cc648a6eaeca932cff085c42c Mon Sep 17 00:00:00 2001 From: Udi Dahan Date: Tue, 6 Oct 2026 17:13:03 +0300 Subject: [PATCH 5/7] Update DetectedBrokerQueuesView.vue --- .../views/throughputreport/queues/DetectedBrokerQueuesView.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Frontend/src/views/throughputreport/queues/DetectedBrokerQueuesView.vue b/src/Frontend/src/views/throughputreport/queues/DetectedBrokerQueuesView.vue index a4d70ebc7..02ad07118 100644 --- a/src/Frontend/src/views/throughputreport/queues/DetectedBrokerQueuesView.vue +++ b/src/Frontend/src/views/throughputreport/queues/DetectedBrokerQueuesView.vue @@ -30,7 +30,6 @@ const { testResults } = storeToRefs(store); UserIndicator.TransactionalSessionProcessorEndpoint, UserIndicator.GatewayOrBridgingEndpoint, UserIndicator.ParticularPlatformEndpoint, - UserIndicator.PlannedToDecommission, UserIndicator.NServiceBusEndpointNoLongerInUse, UserIndicator.NotNServiceBusEndpoint, ]" From 0dfc9af8e7177cd578ffcf682896d29c9d443fd3 Mon Sep 17 00:00:00 2001 From: Udi Dahan Date: Tue, 6 Oct 2026 17:13:27 +0300 Subject: [PATCH 6/7] Update DetectedEndpointsView.vue --- .../src/views/throughputreport/queues/DetectedEndpointsView.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Frontend/src/views/throughputreport/queues/DetectedEndpointsView.vue b/src/Frontend/src/views/throughputreport/queues/DetectedEndpointsView.vue index c71e7b157..6ba44e106 100644 --- a/src/Frontend/src/views/throughputreport/queues/DetectedEndpointsView.vue +++ b/src/Frontend/src/views/throughputreport/queues/DetectedEndpointsView.vue @@ -32,7 +32,6 @@ const { isBrokerTransport, hasErrors } = storeToRefs(store); UserIndicator.TransactionalSessionProcessorEndpoint, UserIndicator.GatewayOrBridgingEndpoint, UserIndicator.ParticularPlatformEndpoint, - UserIndicator.PlannedToDecommission, UserIndicator.NServiceBusEndpointNoLongerInUse, ]" :source="DataSource.WellKnownEndpoint" From 69e14f7b95784cc78b3e74603b964856a02ad045 Mon Sep 17 00:00:00 2001 From: Phil Bastian Date: Wed, 7 Oct 2026 10:43:42 +0800 Subject: [PATCH 7/7] remove plannedtodecommission type, WIP --- .../src/views/throughputreport/EndpointsView.vue | 8 +++----- .../LegendPlannedToDecommission.vue | 3 --- .../queues/DetectedListView.spec.ts | 16 +++++++++------- .../throughputreport/queues/userIndicator.ts | 1 - .../queues/userIndicatorMapper.ts | 1 - 5 files changed, 12 insertions(+), 17 deletions(-) delete mode 100644 src/Frontend/src/views/throughputreport/LegendPlannedToDecommission.vue diff --git a/src/Frontend/src/views/throughputreport/EndpointsView.vue b/src/Frontend/src/views/throughputreport/EndpointsView.vue index 65e4b9845..d54fddbf2 100644 --- a/src/Frontend/src/views/throughputreport/EndpointsView.vue +++ b/src/Frontend/src/views/throughputreport/EndpointsView.vue @@ -9,7 +9,6 @@ import LegendNServiceBusEndpoint from "./LegendNServiceBusEndpoint.vue"; import LegendNServiceBusEndpointNoLongerInUse from "./LegendNServiceBusEndpointNoLongerInUse.vue"; import LegendTransactionalSessionProcessorEndpoint from "./LegendTransactionalSessionProcessorEndpoint.vue"; 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"; @@ -32,13 +31,12 @@ const showLegend = ref(false); const legendOptions = new Map([ [UserIndicator.NServiceBusEndpoint, LegendNServiceBusEndpoint], - [UserIndicator.NServiceBusEndpointNoLongerInUse, LegendNServiceBusEndpointNoLongerInUse], - [UserIndicator.TransactionalSessionProcessorEndpoint, LegendTransactionalSessionProcessorEndpoint], [UserIndicator.SendOnlyEndpoint, LegendSendOnlyEndpoint], - [UserIndicator.PlannedToDecommission, LegendPlannedToDecommission], - [UserIndicator.NotNServiceBusEndpoint, LegendNotNServiceBusEndpoint], + [UserIndicator.TransactionalSessionProcessorEndpoint, LegendTransactionalSessionProcessorEndpoint], [UserIndicator.GatewayOrBridgingEndpoint, LegendGatewayOrBridgeEndpoint], [UserIndicator.ParticularPlatformEndpoint, LegendParticularPlatformEndpoint], + [UserIndicator.NServiceBusEndpointNoLongerInUse, LegendNServiceBusEndpointNoLongerInUse], + [UserIndicator.NotNServiceBusEndpoint, LegendNotNServiceBusEndpoint], ]); function toggleOptionsLegendVisible() { diff --git a/src/Frontend/src/views/throughputreport/LegendPlannedToDecommission.vue b/src/Frontend/src/views/throughputreport/LegendPlannedToDecommission.vue deleted file mode 100644 index 02393eb69..000000000 --- a/src/Frontend/src/views/throughputreport/LegendPlannedToDecommission.vue +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/src/Frontend/src/views/throughputreport/queues/DetectedListView.spec.ts b/src/Frontend/src/views/throughputreport/queues/DetectedListView.spec.ts index fd1808570..5aa0c0a94 100644 --- a/src/Frontend/src/views/throughputreport/queues/DetectedListView.spec.ts +++ b/src/Frontend/src/views/throughputreport/queues/DetectedListView.spec.ts @@ -163,9 +163,9 @@ describe("DetectedListView tests", () => { await renderComponent({ source: DataSource.Broker, indicatorOptions: [UserIndicator.NServiceBusEndpoint], ariaLabel: tableName }, async (driver) => { await driver.setUp( precondition.hasLicensingEndpoints([ - ...[...Array(5).keys()].map((i) => ({ name: `${i}Beta`, name_hash: "", is_known_endpoint: false, user_indicator: UserIndicator.PlannedToDecommission, max_daily_throughput: i })), - ...[...Array(8).keys()].map((i) => ({ name: `${i}Beta`, name_hash: "", is_known_endpoint: false, user_indicator: UserIndicator.PlannedToDecommission, max_daily_throughput: i })), - ...[...Array(2).keys()].map((i) => ({ name: `${i}Delta${i}`, name_hash: "", is_known_endpoint: false, user_indicator: UserIndicator.PlannedToDecommission, max_daily_throughput: i })), + ...[...Array(5).keys()].map((i) => ({ name: `${i}Beta`, name_hash: "", is_known_endpoint: false, user_indicator: UserIndicator.NServiceBusEndpointNoLongerInUse, max_daily_throughput: i })), + ...[...Array(8).keys()].map((i) => ({ name: `${i}Beta`, name_hash: "", is_known_endpoint: false, user_indicator: UserIndicator.NServiceBusEndpointNoLongerInUse, max_daily_throughput: i })), + ...[...Array(2).keys()].map((i) => ({ name: `${i}Delta${i}`, name_hash: "", is_known_endpoint: false, user_indicator: UserIndicator.NServiceBusEndpointNoLongerInUse, max_daily_throughput: i })), { name: "boo", name_hash: "", is_known_endpoint: false, user_indicator: "", max_daily_throughput: 11 }, ]) ); @@ -194,7 +194,7 @@ describe("DetectedListView tests", () => { await renderComponent({ source: DataSource.Broker, indicatorOptions: [UserIndicator.NServiceBusEndpoint], ariaLabel: tableName }, async (driver) => { await driver.setUp( - precondition.hasLicensingEndpoints([...[...Array(dataLength).keys()].map((i) => ({ name: `${i}Beta`, name_hash: "", is_known_endpoint: false, user_indicator: UserIndicator.PlannedToDecommission, max_daily_throughput: i }))]) + precondition.hasLicensingEndpoints([...[...Array(dataLength).keys()].map((i) => ({ name: `${i}Beta`, name_hash: "", is_known_endpoint: false, user_indicator: UserIndicator.NServiceBusEndpointNoLongerInUse, max_daily_throughput: i }))]) ); }); @@ -245,7 +245,9 @@ describe("DetectedListView tests", () => { ]; await renderComponent({ source: DataSource.Broker, indicatorOptions: [UserIndicator.NServiceBusEndpoint], ariaLabel: tableName }, async (driver) => { - await driver.setUp(precondition.hasLicensingEndpoints([...[...unsortedNames].map((name, idx) => ({ name, name_hash: "", is_known_endpoint: false, user_indicator: UserIndicator.PlannedToDecommission, max_daily_throughput: idx }))])); + await driver.setUp( + precondition.hasLicensingEndpoints([...[...unsortedNames].map((name, idx) => ({ name, name_hash: "", is_known_endpoint: false, user_indicator: UserIndicator.NServiceBusEndpointNoLongerInUse, max_daily_throughput: idx }))]) + ); }); const user = userEvent.setup(); @@ -293,11 +295,11 @@ describe("DetectedListView tests", () => { const setup = async () => { const tableName = "Special table"; - const { driver } = await renderComponent({ source: DataSource.Broker, indicatorOptions: [UserIndicator.PlannedToDecommission, UserIndicator.NServiceBusEndpoint], ariaLabel: tableName }, async (driver) => { + const { driver } = await renderComponent({ source: DataSource.Broker, indicatorOptions: [UserIndicator.NServiceBusEndpointNoLongerInUse, UserIndicator.NServiceBusEndpoint], ariaLabel: tableName }, async (driver) => { await driver.setUp( precondition.hasLicensingEndpoints([ { name: `Not set yet`, name_hash: "", is_known_endpoint: false, user_indicator: "", max_daily_throughput: 100 }, - { name: `Set and needs updating`, name_hash: "", is_known_endpoint: false, user_indicator: UserIndicator.PlannedToDecommission, max_daily_throughput: 50 }, + { name: `Set and needs updating`, name_hash: "", is_known_endpoint: false, user_indicator: UserIndicator.NServiceBusEndpointNoLongerInUse, max_daily_throughput: 50 }, ]) ); await driver.setUp(updateLicensingEndpoints()); diff --git a/src/Frontend/src/views/throughputreport/queues/userIndicator.ts b/src/Frontend/src/views/throughputreport/queues/userIndicator.ts index e0d1199d2..c1687c0d5 100644 --- a/src/Frontend/src/views/throughputreport/queues/userIndicator.ts +++ b/src/Frontend/src/views/throughputreport/queues/userIndicator.ts @@ -4,7 +4,6 @@ export enum UserIndicator { TransactionalSessionProcessorEndpoint = "TransactionalSessionProcessorEndpoint", SendOnlyEndpoint = "SendOnlyEndpoint", NServiceBusEndpointNoLongerInUse = "NServiceBusEndpointNoLongerInUse", - PlannedToDecommission = "PlannedToDecommission", GatewayOrBridgingEndpoint = "GatewayOrBridgingEndpoint", ParticularPlatformEndpoint = "ParticularPlatformEndpoint", } diff --git a/src/Frontend/src/views/throughputreport/queues/userIndicatorMapper.ts b/src/Frontend/src/views/throughputreport/queues/userIndicatorMapper.ts index 7ae3d57da..80a2a0941 100644 --- a/src/Frontend/src/views/throughputreport/queues/userIndicatorMapper.ts +++ b/src/Frontend/src/views/throughputreport/queues/userIndicatorMapper.ts @@ -5,7 +5,6 @@ export const userIndicatorMapper = new Map([ [UserIndicator.NServiceBusEndpointNoLongerInUse, "No longer in use"], [UserIndicator.TransactionalSessionProcessorEndpoint, "Transactional Session Processor Endpoint"], [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"],