prevent monitoring test if disabled

Author: WilliamBZA

src/ServicePulse.Host/vue/src/components/configuration/PlatformConnections.vue

@@ -2,7 +2,7 @@
 import { ref } from "vue";
 import LicenseExpired from "../LicenseExpired.vue";
 import { licenseStatus } from "../../composables/serviceLicense.js";
-import { updateServiceControlUrls, serviceControlUrl as configuredServiceControlUrl, monitoringUrl as configuredMonitoringUrl } from "./../../composables/serviceServiceControlUrls.js";
+import { updateServiceControlUrls, serviceControlUrl as configuredServiceControlUrl, monitoringUrl as configuredMonitoringUrl, useIsMonitoringDisabled } from "./../../composables/serviceServiceControlUrls.js";
 import { connectionState, monitoringConnectionState } from "../../composables/serviceServiceControl";
 
 // This is needed because the ConfigurationView.vue routerView expects this event.
@@ -56,6 +56,10 @@ function testMonitoringUrl(event) {
   }
 }
 
+function isMonitoringUrlSpecified() {
+  return monitoringUrl.value && monitoringUrl.value !== "!";
+}
+
 function saveConnections(event) {
   if (event) {
     updateServiceControlUrls(serviceControlUrl, monitoringUrl);
@@ -98,15 +102,15 @@ function saveConnections(event) {
                   <label for="monitoringUrl"
                     >CONNECTION URL
                     <span class="auxilliary-label">(OPTIONAL)</span>
-                    <template v-if="monitoringConnectionState.unableToConnect">
+                    <template v-if="monitoringConnectionState.unableToConnect && !useIsMonitoringDisabled()">
                       <span class="failed-validation"> <i class="fa fa-exclamation-triangle"></i> Unable to connect </span>
                     </template>
                   </label>
                   <input type="text" id="monitoringUrl" name="monitoringUrl" v-model="monitoringUrl" class="form-control" required />
                 </div>
 
                 <div class="col-5 no-side-padding">
-                  <button class="btn btn-default btn-secondary btn-connection-test" :class="{ disabled: !configuredMonitoringUrl }" type="button" @click="testMonitoringUrl">Test</button>
+                  <button class="btn btn-default btn-secondary btn-connection-test" :class="{ disabled: !isMonitoringUrlSpecified() }" type="button" @click="testMonitoringUrl" :disabled="!isMonitoringUrlSpecified()">Test</button>
                   <span class="connection-test connection-testing" v-if="testingMonitoring"> <i class="glyphicon glyphicon-refresh rotate"></i>Testing </span>
                   <span class="connection-test connection-successful" v-if="monitoringValid === true && !testingMonitoring"> <i class="fa fa-check"></i> Connection successful </span>
                   <span class="connection-test connection-failed" v-if="monitoringValid === false && !testingMonitoring"> <i class="fa fa-exclamation-triangle"></i> Connection failed </span>

src/ServicePulse.Host/vue/src/composables/serviceServiceControl.js

@@ -1,7 +1,7 @@
 import { reactive, onMounted, watch, computed } from "vue";
 import { useIsSupported, useIsUpgradeAvailable } from "./serviceSemVer.js";
 import { useServiceProductUrls } from "./serviceProductUrls.js";
-import { useFetchFromServiceControl, useFetchFromMonitoring, serviceControlUrl, monitoringUrl } from "./serviceServiceControlUrls";
+import { useFetchFromServiceControl, useFetchFromMonitoring, serviceControlUrl, monitoringUrl, useIsMonitoringDisabled } from "./serviceServiceControlUrls";
 import { useShowToast } from "./toast.js";
 
 export const stats = reactive({
@@ -101,16 +101,19 @@ export function useServiceControl() {
     }
   });
 
-  watch(monitoringConnectionFailure, async (newValue, oldValue) => {
-    //NOTE to eliminate success msg showing everytime the screen is refreshed
-    if (newValue != oldValue && !(oldValue === null && newValue === false)) {
-      if (newValue) {
-        useShowToast("error", "Error", "Could not connect to the ServiceControl Monitoring service at " + monitoringUrl.value + '. <a class="btn btn-default" href="/configuration#connections">View connection settings</a>');
-      } else {
-        useShowToast("success", "Success", "Connection to ServiceControl Monitoring service was successful at " + monitoringUrl.value + ".");
+  // Only watch the state change if monitoring is enabled
+  if (!useIsMonitoringDisabled()) {
+    watch(monitoringConnectionFailure, async (newValue, oldValue) => {
+      //NOTE to eliminate success msg showing everytime the screen is refreshed
+      if (newValue != oldValue && !(oldValue === null && newValue === false)) {
+        if (newValue) {
+          useShowToast("error", "Error", "Could not connect to the ServiceControl Monitoring service at " + monitoringUrl.value + '. <a class="btn btn-default" href="/configuration#connections">View connection settings</a>');
+        } else {
+          useShowToast("success", "Success", "Connection to ServiceControl Monitoring service was successful at " + monitoringUrl.value + ".");
+        }
       }
-    }
-  });
+    });
+  }
 }
 
 export function useServiceControlStats() {

src/ServicePulse.Host/vue/src/composables/serviceServiceControlUrls.js

@@ -3,12 +3,16 @@ import { ref } from "vue";
 export const serviceControlUrl = ref(null);
 export const monitoringUrl = ref(null);
 
+export function useIsMonitoringDisabled() {
+  return monitoringUrl.value === null || monitoringUrl.value === "" || monitoringUrl.value === "!";
+}
+
 export function useFetchFromServiceControl(suffix) {
   return fetch(serviceControlUrl.value + suffix);
 }
 
 export function useFetchFromMonitoring(suffix) {
-  if (monitoringUrl.value === null || monitoringUrl.value === "" || monitoringUrl.value === "!") {
+  if (useIsMonitoringDisabled()) {
     return Promise.resolve(null);
   }
   return fetch(monitoringUrl.value + suffix);
@@ -99,7 +103,7 @@ export function updateServiceControlUrls(newServiceControlUrl, newMonitoringUrl)
 
   if (!newMonitoringUrl.value) {
     newMonitoringUrl.value = "!"; //disabled
-  } else if (!newMonitoringUrl.value.endsWith("/")) {
+  } else if (!newMonitoringUrl.value.endsWith("/") && newMonitoringUrl.value !== "!") {
     newMonitoringUrl.value += "/";
   }