diff --git a/src/Frontend/env.d.ts b/src/Frontend/env.d.ts index 25bf2dc33..9ccd02604 100644 --- a/src/Frontend/env.d.ts +++ b/src/Frontend/env.d.ts @@ -10,6 +10,7 @@ declare global { service_control_url: string; monitoring_urls: string[]; showPendingRetry: boolean; + embedded?: boolean; }; } } diff --git a/src/Frontend/src/components/BackendChecksNotifications.vue b/src/Frontend/src/components/BackendChecksNotifications.vue index 2273a3b91..5f666d9a8 100644 --- a/src/Frontend/src/components/BackendChecksNotifications.vue +++ b/src/Frontend/src/components/BackendChecksNotifications.vue @@ -19,17 +19,19 @@ const environment = environmentStore.environment; const primaryConnectionFailure = computed(() => connectionState.unableToConnect); const monitoringConnectionFailure = computed(() => monitoringConnectionState.unableToConnect); -watch(primaryConnectionFailure, (newValue, oldValue) => { - //NOTE to eliminate success msg showing everytime the screen is refreshed - if (newValue !== oldValue && !(oldValue === null && newValue === false)) { - const connectionUrl = router.resolve(routeLinks.configuration.connections.link).href; - if (newValue) { - useShowToast(TYPE.ERROR, "Error", `Could not connect to ServiceControl at ${serviceControlClient.url}. View connection settings`); - } else { - useShowToast(TYPE.SUCCESS, "Success", `Connection to ServiceControl was successful at ${serviceControlClient.url}.`); +if (!window.defaultConfig.embedded) { + watch(primaryConnectionFailure, (newValue, oldValue) => { + //NOTE to eliminate success msg showing everytime the screen is refreshed + if (newValue !== oldValue && !(oldValue === null && newValue === false)) { + const connectionUrl = router.resolve(routeLinks.configuration.connections.link).href; + if (newValue) { + useShowToast(TYPE.ERROR, "Error", `Could not connect to ServiceControl at ${serviceControlClient.url}. View connection settings`); + } else { + useShowToast(TYPE.SUCCESS, "Success", `Connection to ServiceControl was successful at ${serviceControlClient.url}.`); + } } - } -}); + }); +} watch(monitoringConnectionFailure, (newValue, oldValue) => { // Only watch the state change if monitoring is enabled diff --git a/src/Frontend/src/components/PageFooter.vue b/src/Frontend/src/components/PageFooter.vue index ecb826af4..b0e6b946f 100644 --- a/src/Frontend/src/components/PageFooter.vue +++ b/src/Frontend/src/components/PageFooter.vue @@ -21,6 +21,7 @@ const environment = environmentAndVersionsStore.environment; const licenseStore = useLicenseStore(); const { licenseStatus, license } = licenseStore; const isMonitoringEnabled = monitoringClient.isMonitoringEnabled; +const isEmbedded = window.defaultConfig.embedded; const scAddressTooltip = computed(() => { return `ServiceControl URL ${serviceControlClient.url}`; @@ -43,26 +44,33 @@ const { configuration } = storeToRefs(configurationStore); Connect new endpoint - - ServicePulse v{{ environment.sp_version }} - - ServicePulse v{{ environment.sp_version }} ( - v{{ newVersions.newSPVersion.newspversionnumber }} available) - - - Service Control: - -
- Connected - v{{ environment.sc_version }} - ( v{{ newVersions.newSCVersion.newscversionnumber }} available) + +