From 65a79fa9b0ea5660bd3bea13c3532b3330b561ab Mon Sep 17 00:00:00 2001
From: John Simons <john.simons@particular.net>
Date: Fri, 22 Aug 2025 13:39:35 +1000
Subject: [PATCH 1/2] Improving the connection setup instructions

This improves the rendering of the instructions so that it support empty list of instructions.
---
 .../setup/ConnectionSetupView.vue             | 76 ++++++++++---------
 1 file changed, 40 insertions(+), 36 deletions(-)

diff --git a/src/Frontend/src/views/throughputreport/setup/ConnectionSetupView.vue b/src/Frontend/src/views/throughputreport/setup/ConnectionSetupView.vue
index 9ab420cb6..45f86e0b1 100644
--- a/src/Frontend/src/views/throughputreport/setup/ConnectionSetupView.vue
+++ b/src/Frontend/src/views/throughputreport/setup/ConnectionSetupView.vue
@@ -20,7 +20,7 @@ onMounted(async () => {
 
 <template>
   <div class="row">
-    <p v-if="(settingsInfo?.broker_settings.length ?? 0 > 0) || (!isBrokerTransport && useIsMonitoringEnabled())">
+    <p v-if="(settingsInfo?.broker_settings.length ?? 0 > 0) || ((settingsInfo?.monitoring_settings.length ?? 0 > 0) && useIsMonitoringEnabled()) || (settingsInfo?.service_control_settings.length ?? 0 > 0)">
       In order for ServicePulse to collect usage data from {{ store.transportNameForInstructions() }} you need to configure the below settings.<br />
       There are two configuration options, as environment variables or directly in the
       <a href="https://docs.particular.net/servicecontrol/creating-config-file"><code>ServiceControl.exe.config</code></a> file.
@@ -48,45 +48,49 @@ onMounted(async () => {
       </div>
     </div>
   </template>
-  <template v-if="!isBrokerTransport && useIsMonitoringEnabled()">
-    <div class="row configuration">
-      <div class="col-12">
-        <h4>ServiceControl Settings</h4>
-        <p class="nogap">
-          For more information read the
-          <a href="https://docs.particular.net/servicecontrol/creating-config-file#usage-reporting-when-using-servicecontrol-licensingcomponentservicecontrolthroughputdataqueue">LicensingComponent/ServiceControlThroughputDataQueue</a> settings
-          documentation.
-        </p>
-        <ConfigurationCode :settings="settingsInfo?.service_control_settings ?? []">
-          <template #configInstructions>
-            <div>Paste the settings above into the <code>ServiceControl.exe.config</code> file of the ServiceControl Error instance.</div>
-          </template>
-          <template #environmentVariableInstructions>
-            <div>Execute the above instructions in a terminal to set the environment variables , these variables need to be set for the account under which the ServiceControl Error instance is running.</div>
-          </template>
-        </ConfigurationCode>
+  <template v-if="!isBrokerTransport">
+    <template v-if="settingsInfo?.service_control_settings.length ?? 0 > 0">
+      <div class="row configuration">
+        <div class="col-12">
+          <h4>ServiceControl Settings</h4>
+          <p class="nogap">
+            For more information read the
+            <a href="https://docs.particular.net/servicecontrol/creating-config-file#usage-reporting-when-using-servicecontrol-licensingcomponentservicecontrolthroughputdataqueue">LicensingComponent/ServiceControlThroughputDataQueue</a> settings
+            documentation.
+          </p>
+          <ConfigurationCode :settings="settingsInfo?.service_control_settings ?? []">
+            <template #configInstructions>
+              <div>Paste the settings above into the <code>ServiceControl.exe.config</code> file of the ServiceControl Error instance.</div>
+            </template>
+            <template #environmentVariableInstructions>
+              <div>Execute the above instructions in a terminal to set the environment variables , these variables need to be set for the account under which the ServiceControl Error instance is running.</div>
+            </template>
+          </ConfigurationCode>
+        </div>
       </div>
-    </div>
-    <div class="row configuration">
-      <div class="col-12">
-        <h4>Monitoring Settings</h4>
-        <p class="nogap">
-          For more information read the
-          <a href="https://docs.particular.net/servicecontrol/monitoring-instances/installation/creating-config-file#usage-reporting-monitoringservicecontrolthroughputdataqueue">Monitoring/ServiceControlThroughputDataQueue</a> settings documentation.
-        </p>
-        <ConfigurationCode :settings="settingsInfo?.monitoring_settings ?? []" configFileName="ServiceControl.Monitoring.exe.config">
-          <template #configInstructions>
-            <div>Paste the settings above into the <code>ServiceControl.Monitoring.exe.config</code> file of the ServiceControl Monitoring instance.</div>
-          </template>
-          <template #environmentVariableInstructions>
-            <div>Execute the above instructions in a terminal to set the environment variables, these variables need to be set for the account under which the ServiceControl Monitoring instance is running.</div>
-          </template>
-        </ConfigurationCode>
+    </template>
+    <template v-if="useIsMonitoringEnabled() && (settingsInfo?.monitoring_settings.length ?? 0 > 0)">
+      <div class="row configuration">
+        <div class="col-12">
+          <h4>Monitoring Settings</h4>
+          <p class="nogap">
+            For more information read the
+            <a href="https://docs.particular.net/servicecontrol/monitoring-instances/installation/creating-config-file#usage-reporting-monitoringservicecontrolthroughputdataqueue">Monitoring/ServiceControlThroughputDataQueue</a> settings
+            documentation.
+          </p>
+          <ConfigurationCode :settings="settingsInfo?.monitoring_settings ?? []" configFileName="ServiceControl.Monitoring.exe.config">
+            <template #configInstructions>
+              <div>Paste the settings above into the <code>ServiceControl.Monitoring.exe.config</code> file of the ServiceControl Monitoring instance.</div>
+            </template>
+            <template #environmentVariableInstructions>
+              <div>Execute the above instructions in a terminal to set the environment variables, these variables need to be set for the account under which the ServiceControl Monitoring instance is running.</div>
+            </template>
+          </ConfigurationCode>
+        </div>
       </div>
-    </div>
+    </template>
   </template>
 </template>
-
 <style scoped>
 .configuration {
   margin-bottom: 15px;

From 99f41e2d159b7c8f8e0f1b85600450d20c679eba Mon Sep 17 00:00:00 2001
From: John Simons <john.simons@particular.net>
Date: Wed, 27 Aug 2025 09:57:59 +1000
Subject: [PATCH 2/2] Improvement based on feedback

---
 .../throughputreport/setup/ConnectionSetupView.vue    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Frontend/src/views/throughputreport/setup/ConnectionSetupView.vue b/src/Frontend/src/views/throughputreport/setup/ConnectionSetupView.vue
index 45f86e0b1..37c096c70 100644
--- a/src/Frontend/src/views/throughputreport/setup/ConnectionSetupView.vue
+++ b/src/Frontend/src/views/throughputreport/setup/ConnectionSetupView.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onMounted, ref } from "vue";
+import { computed, onMounted, ref } from "vue";
 import ThroughputConnectionSettings from "@/resources/ThroughputConnectionSettings";
 import throughputClient from "@/views/throughputreport/throughputClient";
 import { useIsMonitoringEnabled } from "@/composables/serviceServiceControlUrls";
@@ -16,11 +16,18 @@ const settingsInfo = ref<ThroughputConnectionSettings | null>(null);
 onMounted(async () => {
   settingsInfo.value = await throughputClient.setting();
 });
+
+const needsConfiguration = computed(() => {
+  const broker = settingsInfo.value?.broker_settings?.length ?? 0;
+  const monitoring = settingsInfo.value?.monitoring_settings?.length ?? 0;
+  const serviceControl = settingsInfo.value?.service_control_settings?.length ?? 0;
+  return broker > 0 || (monitoring > 0 && useIsMonitoringEnabled()) || serviceControl > 0;
+});
 </script>
 
 <template>
   <div class="row">
-    <p v-if="(settingsInfo?.broker_settings.length ?? 0 > 0) || ((settingsInfo?.monitoring_settings.length ?? 0 > 0) && useIsMonitoringEnabled()) || (settingsInfo?.service_control_settings.length ?? 0 > 0)">
+    <p v-if="needsConfiguration">
       In order for ServicePulse to collect usage data from {{ store.transportNameForInstructions() }} you need to configure the below settings.<br />
       There are two configuration options, as environment variables or directly in the
       <a href="https://docs.particular.net/servicecontrol/creating-config-file"><code>ServiceControl.exe.config</code></a> file.