diff --git a/src/ServicePulse.Host/vue/src/components/BusyIndicator.vue b/src/ServicePulse.Host/vue/src/components/BusyIndicator.vue
index edd77df854..ff80337874 100644
--- a/src/ServicePulse.Host/vue/src/components/BusyIndicator.vue
+++ b/src/ServicePulse.Host/vue/src/components/BusyIndicator.vue
@@ -1,4 +1,4 @@
-<script setup></script>
+<script setup lang="ts"></script>
 
 <template>
   <div class="row">
diff --git a/src/ServicePulse.Host/vue/src/components/ConfirmDialog.vue b/src/ServicePulse.Host/vue/src/components/ConfirmDialog.vue
index e4fea878d6..4a8ab33809 100644
--- a/src/ServicePulse.Host/vue/src/components/ConfirmDialog.vue
+++ b/src/ServicePulse.Host/vue/src/components/ConfirmDialog.vue
@@ -1,14 +1,14 @@
-<script setup>
+<script setup lang="ts">
 import { onMounted, onUnmounted } from "vue";
 
 const emit = defineEmits(["confirm", "cancel"]);
 
-const settings = defineProps({
-  heading: String,
-  body: String,
-  secondParagraph: String,
-  hideCancel: Boolean,
-});
+const settings = defineProps<{
+  heading: string;
+  body: string;
+  secondParagraph: string;
+  hideCancel: boolean;
+}>();
 
 function confirm() {
   emit("confirm", settings);
diff --git a/src/ServicePulse.Host/vue/src/components/DashboardItem.vue b/src/ServicePulse.Host/vue/src/components/DashboardItem.vue
index 0985c0d369..016e1ecb37 100644
--- a/src/ServicePulse.Host/vue/src/components/DashboardItem.vue
+++ b/src/ServicePulse.Host/vue/src/components/DashboardItem.vue
@@ -1,9 +1,9 @@
-<script setup>
-const props = defineProps({
-  counter: Number,
-  url: String,
-  iconClass: String,
-});
+<script setup lang="ts">
+const props = defineProps<{
+  counter: number;
+  url: string;
+  iconClass: string;
+}>();
 </script>
 
 <template>
diff --git a/src/ServicePulse.Host/vue/src/components/DataView.vue b/src/ServicePulse.Host/vue/src/components/DataView.vue
index 6860e9a607..44ddf87e70 100644
--- a/src/ServicePulse.Host/vue/src/components/DataView.vue
+++ b/src/ServicePulse.Host/vue/src/components/DataView.vue
@@ -1,36 +1,27 @@
-<script setup>
+<script setup lang="ts" generic="T">
 import { onMounted, onUnmounted, ref, watch } from "vue";
-import { useFetchFromServiceControl } from "../composables/serviceServiceControlUrls";
-import ItemsPerPage from "../components/ItemsPerPage.vue";
-import PaginationStrip from "../components/PaginationStrip.vue";
-const props = defineProps({
-  apiUrl: String,
-  itemsPerPageOptions: {
-    type: Array,
-    default: () => [20, 35, 50, 75],
-  },
-  itemsPerPage: {
-    type: Number,
-    default: 50,
-  },
-  autoRefreshSeconds: {
-    type: Number,
-  },
-  showPagination: {
-    type: Boolean,
-    default: true,
-  },
-  showItemsPerPage: {
-    type: Boolean,
-    default: false,
-  },
-});
+import { useTypedFetchFromServiceControl } from "@/composables/serviceServiceControlUrls";
+import ItemsPerPage from "@/components/ItemsPerPage.vue";
+import PaginationStrip from "@/components/PaginationStrip.vue";
+import type DataViewPageModel from "./DataViewPageModel";
+
+const props = withDefaults(
+  defineProps<{
+    apiUrl: string;
+    itemsPerPageOptions?: number[];
+    itemsPerPage?: number;
+    autoRefreshSeconds: number;
+    showPagination?: boolean;
+    showItemsPerPage?: boolean;
+  }>(),
+  { itemsPerPageOptions: () => [20, 35, 50, 75], itemsPerPage: 50, showPagination: true, showItemsPerPage: false }
+);
+
+let refreshTimer: number | undefined;
+const viewModel = defineModel<DataViewPageModel<T>>({ required: true });
 
-const refreshTimer = ref();
-const items = ref([]);
 const pageNumber = ref(1);
 const itemsPerPage = ref(props.itemsPerPage);
-const totalCount = ref(0);
 
 watch(
   () => props.autoRefreshSeconds,
@@ -44,30 +35,23 @@ watch(itemsPerPage, () => loadData());
 watch(pageNumber, () => loadData());
 
 async function loadData() {
-  try {
-    const response = await useFetchFromServiceControl(`${props.apiUrl}?page=${pageNumber.value}&per_page=${itemsPerPage.value}`);
-    if (response.ok) {
-      totalCount.value = parseInt(response.headers.get("Total-Count"));
-      const data = await response.json();
-      items.value = data;
-    }
-  } catch (error) {
-    console.log(error);
+  const [response, data] = await useTypedFetchFromServiceControl<T[]>(`${props.apiUrl}?page=${pageNumber.value}&per_page=${itemsPerPage.value}`);
+  if (response.ok) {
+    viewModel.value.totalCount = parseInt(response.headers.get("Total-Count") ?? "0");
+    viewModel.value.data = data;
   }
 }
 
 function startRefreshTimer() {
   if (props.autoRefreshSeconds) {
-    refreshTimer.value = setInterval(() => {
+    refreshTimer = window.setInterval(() => {
       loadData();
     }, props.autoRefreshSeconds * 1000);
   }
 }
 
 function stopRefreshTimer() {
-  if (refreshTimer.value) {
-    clearInterval(refreshTimer.value);
-  }
+  window.clearInterval(refreshTimer);
 }
 
 onMounted(() => {
@@ -81,10 +65,10 @@ onUnmounted(() => {
 </script>
 
 <template>
-  <slot name="data" v-bind="items"></slot>
+  <slot name="data"></slot>
   <div class="row">
     <ItemsPerPage v-if="showItemsPerPage" v-model="itemsPerPage" :options="itemsPerPageOptions" />
-    <PaginationStrip v-if="showPagination" v-model="pageNumber" :totalCount="totalCount" :itemsPerPage="itemsPerPage" />
+    <PaginationStrip v-if="showPagination" v-model="pageNumber" :totalCount="viewModel.totalCount" :itemsPerPage="itemsPerPage" />
   </div>
-  <slot name="footer" :count="totalCount"></slot>
+  <slot name="footer"></slot>
 </template>
diff --git a/src/ServicePulse.Host/vue/src/components/DataViewPageModel.ts b/src/ServicePulse.Host/vue/src/components/DataViewPageModel.ts
new file mode 100644
index 0000000000..84474be8a1
--- /dev/null
+++ b/src/ServicePulse.Host/vue/src/components/DataViewPageModel.ts
@@ -0,0 +1,4 @@
+export default interface DataViewPageModel<T> {
+  data: T[];
+  totalCount: number;
+}
diff --git a/src/ServicePulse.Host/vue/src/components/EventItemShort.vue b/src/ServicePulse.Host/vue/src/components/EventItemShort.vue
index 579d4c9be2..3eeb8863f5 100644
--- a/src/ServicePulse.Host/vue/src/components/EventItemShort.vue
+++ b/src/ServicePulse.Host/vue/src/components/EventItemShort.vue
@@ -1,20 +1,26 @@
-<script setup>
-import DataView from "../components/DataView.vue";
-import EventLogItem from "../components/EventLogItem.vue";
+<script setup lang="ts">
+import DataView from "@/components/DataView.vue";
+import EventLogItem from "@/components/EventLogItem.vue";
+import type EventLogItemType from "@/resources/EventLogItem";
+import { ref } from "vue";
 import { RouterLink } from "vue-router";
+
+import type DataViewPageModel from "@/components/DataViewPageModel";
+
+const pageModel = ref<DataViewPageModel<EventLogItemType>>({ data: [], totalCount: 0 });
 </script>
 
 <template>
   <div class="events">
-    <DataView api-url="eventlogitems" :auto-refresh-seconds="5" :itemsPerPage="10" :show-pagination="false">
-      <template #data="items">
+    <DataView api-url="eventlogitems" v-model="pageModel" :auto-refresh-seconds="5" :itemsPerPage="10" :show-pagination="false">
+      <template #data>
         <div class="col-12">
           <h6>Last 10 events</h6>
-          <EventLogItem v-for="item of items" :eventLogItem="item" :key="item.id" />
+          <EventLogItem v-for="item of pageModel.data" :eventLogItem="item" :key="item.id" />
         </div>
       </template>
-      <template #footer="{ count }">
-        <div v-if="count > 10" class="row text-center">
+      <template #footer>
+        <div v-if="pageModel.totalCount > 10" class="row text-center">
           <div class="col-12">
             <RouterLink :to="{ name: 'events' }" class="btn btn-default btn-secondary btn-all-events">View all events</RouterLink>
           </div>
diff --git a/src/ServicePulse.Host/vue/src/components/EventLogItem.vue b/src/ServicePulse.Host/vue/src/components/EventLogItem.vue
index 3cd766508b..31ef3465a4 100644
--- a/src/ServicePulse.Host/vue/src/components/EventLogItem.vue
+++ b/src/ServicePulse.Host/vue/src/components/EventLogItem.vue
@@ -1,25 +1,25 @@
-<script setup>
+<script setup lang="ts">
 import { useRouter } from "vue-router";
 import TimeSince from "../components/TimeSince.vue";
+import type EventLogItem from "@/resources/EventLogItem";
+import { Severity } from "@/resources/EventLogItem";
 
-defineProps({
-  eventLogItem: Object,
-});
+defineProps<{ eventLogItem: EventLogItem }>();
 const router = useRouter();
 
-function navigateToEvent(eventLogItem) {
+function navigateToEvent(eventLogItem: EventLogItem) {
   switch (eventLogItem.category) {
     case "Endpoints":
       router.push({ name: "endpoint-connection" });
       break;
     case "HeartbeatMonitoring":
-      window.location = "/a/#/endpoints";
+      window.location.assign("/a/#/endpoints");
       break;
     case "CustomChecks":
-      window.location = "/a/#/custom-checks";
+      window.location.assign("/a/#/custom-checks");
       break;
     case "EndpointControl":
-      window.location = "/a/#/endpoints";
+      window.location.assign("/a/#/endpoints");
       break;
     case "MessageFailures":
       if (eventLogItem.related_to?.length && eventLogItem.related_to[0].search("message") > 0) {
@@ -39,10 +39,10 @@ function navigateToEvent(eventLogItem) {
   }
 }
 
-function iconClasses(eventItem) {
+function iconClasses(eventItem: EventLogItem) {
   return {
-    normal: eventItem.severity === "info",
-    danger: eventItem.severity === "error",
+    normal: eventItem.severity === Severity.Info,
+    danger: eventItem.severity === Severity.Error,
     "fa-heartbeat": eventItem.category === "Endpoints" || eventItem.category === "EndpointControl" || eventItem.category === "HeartbeatMonitoring",
     "fa-check": eventItem.category === "CustomChecks",
     "fa-envelope": eventItem.category === "MessageFailures" || eventItem.category === "Recoverability",
@@ -51,12 +51,12 @@ function iconClasses(eventItem) {
   };
 }
 
-function iconSubClasses(eventItem) {
+function iconSubClasses(eventItem: EventLogItem) {
   return {
-    "fa-times fa-error": (eventItem.severity === "error" || eventItem.category === "MessageRedirects") && eventItem.severity === "error",
-    "fa-pencil": (eventItem.severity === "error" || eventItem.category === "MessageRedirects") && eventItem.category === "MessageRedirects" && eventItem.event_type === "MessageRedirectChanged",
-    "fa-plus": (eventItem.severity === "error" || eventItem.category === "MessageRedirects") && eventItem.category === "MessageRedirects" && eventItem.event_type === "MessageRedirectCreated",
-    "fa-trash": (eventItem.severity === "error" || eventItem.category === "MessageRedirects") && eventItem.category === "MessageRedirects" && eventItem.event_type === "MessageRedirectRemoved",
+    "fa-times fa-error": (eventItem.severity === Severity.Error || eventItem.category === "MessageRedirects") && eventItem.severity === Severity.Error,
+    "fa-pencil": (eventItem.severity === Severity.Error || eventItem.category === "MessageRedirects") && eventItem.category === "MessageRedirects" && eventItem.event_type === "MessageRedirectChanged",
+    "fa-plus": (eventItem.severity === Severity.Error || eventItem.category === "MessageRedirects") && eventItem.category === "MessageRedirects" && eventItem.event_type === "MessageRedirectCreated",
+    "fa-trash": (eventItem.severity === Severity.Error || eventItem.category === "MessageRedirects") && eventItem.category === "MessageRedirects" && eventItem.event_type === "MessageRedirectRemoved",
   };
 }
 </script>
@@ -68,7 +68,7 @@ function iconSubClasses(eventItem) {
         <div class="col-1">
           <span class="fa-stack fa-lg">
             <i class="fa fa-stack-2x" :class="iconClasses(eventLogItem)" />
-            <i v-if="eventLogItem.severity === 'error' || eventLogItem.category === 'MessageRedirects'" class="fa fa-o fa-stack-1x fa-inverse" :class="iconSubClasses(eventLogItem)" />
+            <i v-if="eventLogItem.severity === Severity.Error || eventLogItem.category === 'MessageRedirects'" class="fa fa-o fa-stack-1x fa-inverse" :class="iconSubClasses(eventLogItem)" />
           </span>
         </div>
         <div class="col-9">
diff --git a/src/ServicePulse.Host/vue/src/components/ExclamationMark.vue b/src/ServicePulse.Host/vue/src/components/ExclamationMark.vue
index b87975667e..4af179addc 100644
--- a/src/ServicePulse.Host/vue/src/components/ExclamationMark.vue
+++ b/src/ServicePulse.Host/vue/src/components/ExclamationMark.vue
@@ -1,11 +1,16 @@
-<script setup>
-const props = defineProps({
-  type: String,
-});
+<script setup lang="ts">
+import { WarningLevel } from "@/components/WarningLevel";
+
+const props = withDefaults(
+  defineProps<{
+    type: WarningLevel;
+  }>(),
+  { type: WarningLevel.None }
+);
 </script>
 
 <template>
-  <template v-if="props.type">
-    <span class="fa fa-exclamation-triangle" :class="type"></span>
+  <template v-if="props.type !== WarningLevel.None">
+    <span class="fa fa-exclamation-triangle" :class="props.type"></span>
   </template>
 </template>
diff --git a/src/ServicePulse.Host/vue/src/components/ItemsPerPage.vue b/src/ServicePulse.Host/vue/src/components/ItemsPerPage.vue
index 9c9c02c611..77b3e9240b 100644
--- a/src/ServicePulse.Host/vue/src/components/ItemsPerPage.vue
+++ b/src/ServicePulse.Host/vue/src/components/ItemsPerPage.vue
@@ -1,15 +1,12 @@
-<script setup>
-defineProps({
-  options: {
-    type: Array,
-    default: () => [20, 35, 50, 75],
-  },
-});
+<script setup lang="ts">
+withDefaults(
+  defineProps<{
+    options: number[];
+  }>(),
+  { options: () => [20, 35, 50, 75] }
+);
 
-const current = defineModel({
-  type: Number,
-  default: 50,
-});
+const current = defineModel<number>({ default: 50 });
 </script>
 
 <template>
diff --git a/src/ServicePulse.Host/vue/src/components/LicenseExpired.vue b/src/ServicePulse.Host/vue/src/components/LicenseExpired.vue
index 79e3a59fa8..1949911eda 100644
--- a/src/ServicePulse.Host/vue/src/components/LicenseExpired.vue
+++ b/src/ServicePulse.Host/vue/src/components/LicenseExpired.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts">
 import { licenseStatus } from "../composables/serviceLicense";
 </script>
 
diff --git a/src/ServicePulse.Host/vue/src/components/NoData.vue b/src/ServicePulse.Host/vue/src/components/NoData.vue
index a826a5ba97..c89646c2bb 100644
--- a/src/ServicePulse.Host/vue/src/components/NoData.vue
+++ b/src/ServicePulse.Host/vue/src/components/NoData.vue
@@ -1,8 +1,8 @@
-<script setup>
-const props = defineProps({
-  title: String,
-  message: String,
-});
+<script setup lang="ts">
+const props = defineProps<{
+  title: string;
+  message: string;
+}>();
 </script>
 
 <template>
diff --git a/src/ServicePulse.Host/vue/src/components/PageFooter.vue b/src/ServicePulse.Host/vue/src/components/PageFooter.vue
index 945ff5fec0..1bf96de15a 100644
--- a/src/ServicePulse.Host/vue/src/components/PageFooter.vue
+++ b/src/ServicePulse.Host/vue/src/components/PageFooter.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts">
 import { computed } from "vue";
 import { connectionState, environment, monitoringConnectionState, newVersions } from "../composables/serviceServiceControl";
 import { monitoringUrl, serviceControlUrl } from "../composables/serviceServiceControlUrls";
@@ -8,11 +8,11 @@ const isMonitoringEnabled = computed(() => {
 });
 
 const scAddressTooltip = computed(() => {
-  return "ServiceControl URL " + serviceControlUrl.value;
+  return `ServiceControl URL ${serviceControlUrl.value}`;
 });
 
 const scMonitoringAddressTooltip = computed(() => {
-  return "Monitoring URL " + monitoringUrl.value;
+  return `Monitoring URL ${monitoringUrl.value}`;
 });
 </script>
 
diff --git a/src/ServicePulse.Host/vue/src/components/PageHeader.vue b/src/ServicePulse.Host/vue/src/components/PageHeader.vue
index 12f9bd1bb8..f7b9e17f02 100644
--- a/src/ServicePulse.Host/vue/src/components/PageHeader.vue
+++ b/src/ServicePulse.Host/vue/src/components/PageHeader.vue
@@ -5,6 +5,7 @@ import { connectionState, monitoringConnectionState, stats } from "../composable
 import { useIsMonitoringEnabled } from "../composables/serviceServiceControlUrls";
 import { licenseStatus } from "../composables/serviceLicense";
 import ExclamationMark from "./ExclamationMark.vue";
+import { LicenseWarningLevel } from "@/composables/LicenseStatus";
 
 const baseUrl = window.defaultConfig.base_url;
 
@@ -17,10 +18,10 @@ function subIsActive(input, exact) {
 }
 
 const displayWarn = computed(() => {
-  return licenseStatus.warningLevel === "warning";
+  return licenseStatus.warningLevel === LicenseWarningLevel.Warning;
 });
 const displayDanger = computed(() => {
-  return connectionState.unableToConnect || (monitoringConnectionState.unableToConnect && useIsMonitoringEnabled()) || licenseStatus.warningLevel === "danger";
+  return connectionState.unableToConnect || (monitoringConnectionState.unableToConnect && useIsMonitoringEnabled()) || licenseStatus.warningLevel === LicenseWarningLevel.Danger;
 });
 </script>
 
@@ -79,8 +80,8 @@ const displayDanger = computed(() => {
             <RouterLink :to="{ name: 'license' }" exact>
               <i class="fa fa-cog icon-white" title="Configuration"></i>
               <span class="navbar-label">Configuration</span>
-              <exclamation-mark :type="'warning'" v-if="displayWarn" />
-              <exclamation-mark :type="'danger'" v-if="displayDanger" />
+              <exclamation-mark :type="WarningLevel.Warning" v-if="displayWarn" />
+              <exclamation-mark :type="WarningLevel.Danger" v-if="displayDanger" />
             </RouterLink>
           </li>
           <li>
diff --git a/src/ServicePulse.Host/vue/src/components/PaginationStrip.vue b/src/ServicePulse.Host/vue/src/components/PaginationStrip.vue
index 1544cb22d4..c7521aab46 100644
--- a/src/ServicePulse.Host/vue/src/components/PaginationStrip.vue
+++ b/src/ServicePulse.Host/vue/src/components/PaginationStrip.vue
@@ -1,25 +1,16 @@
-<script setup>
+<script setup lang="ts">
 import { computed } from "vue";
 
-const props = defineProps({
-  itemsPerPage: {
-    type: Number,
-    required: true,
-  },
-  totalCount: {
-    type: Number,
-    required: true,
-  },
-  pageBuffer: {
-    type: Number,
-    default: 5,
-  },
-});
+const props = withDefaults(
+  defineProps<{
+    itemsPerPage: number;
+    totalCount: number;
+    pageBuffer?: number;
+  }>(),
+  { pageBuffer: 5 }
+);
 
-const pageNumber = defineModel({
-  type: Number,
-  required: true,
-});
+const pageNumber = defineModel<number>({ required: true });
 
 const numberOfPages = computed(() => {
   return Math.ceil(props.totalCount / props.itemsPerPage);
@@ -31,8 +22,17 @@ const showPagination = computed(() => {
 
 const doublePageBuffer = computed(() => props.pageBuffer * 2);
 
+interface PageData {
+  label: string;
+  page: number;
+  key: string;
+  class?: {
+    disabled?: boolean;
+    active?: boolean;
+  };
+}
 const pages = computed(() => {
-  const pages = [];
+  const pages: PageData[] = [];
   pages.push({
     label: "Previous",
     page: Math.max(pageNumber.value - 1, 1),
diff --git a/src/ServicePulse.Host/vue/src/components/ServiceControlNotAvailable.vue b/src/ServicePulse.Host/vue/src/components/ServiceControlNotAvailable.vue
index 11224e00ca..eb66757333 100644
--- a/src/ServicePulse.Host/vue/src/components/ServiceControlNotAvailable.vue
+++ b/src/ServicePulse.Host/vue/src/components/ServiceControlNotAvailable.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts">
 import { connectionState } from "./../composables/serviceServiceControl";
 import { serviceControlUrl } from "./../composables/serviceServiceControlUrls";
 </script>
diff --git a/src/ServicePulse.Host/vue/src/components/ToastPopup.vue b/src/ServicePulse.Host/vue/src/components/ToastPopup.vue
index b4262e4367..246835a63b 100644
--- a/src/ServicePulse.Host/vue/src/components/ToastPopup.vue
+++ b/src/ServicePulse.Host/vue/src/components/ToastPopup.vue
@@ -1,14 +1,16 @@
-<script setup>
-const props = defineProps({
-  type: String,
-  title: String,
-  message: String,
-});
+<script setup lang="ts">
+import { TYPE } from "vue-toastification";
+
+const props = defineProps<{
+  type: TYPE;
+  title: string;
+  message: string;
+}>();
 </script>
 
 <template>
   <div>
-    <template v-if="props.type === 'success'">
+    <template v-if="props.type === TYPE.SUCCESS">
       <div class="toast-success">
         <p>
           <strong>{{ props.title }}</strong>
@@ -16,7 +18,7 @@ const props = defineProps({
         <span v-html="props.message"></span>
       </div>
     </template>
-    <template v-if="props.type === 'info'">
+    <template v-if="props.type === TYPE.INFO">
       <div class="toast-info">
         <p>
           <strong>{{ props.title }}</strong>
@@ -24,7 +26,7 @@ const props = defineProps({
         <span v-html="props.message"></span>
       </div>
     </template>
-    <template v-if="props.type === 'error'">
+    <template v-if="props.type === TYPE.ERROR">
       <div class="toast-error">
         <p>
           <strong>{{ props.title }}</strong>
@@ -32,7 +34,7 @@ const props = defineProps({
         <span v-html="props.message"></span>
       </div>
     </template>
-    <template v-if="props.type === 'warning'">
+    <template v-if="props.type === TYPE.WARNING">
       <div class="toast-warning">
         <p>
           <strong>{{ props.title }}</strong>
@@ -40,7 +42,7 @@ const props = defineProps({
         <span v-html="props.message"></span>
       </div>
     </template>
-    <template v-if="props.type === 'default'">
+    <template v-if="props.type === TYPE.DEFAULT">
       <div class="toast-default">
         <p>
           <strong>{{ props.title }}</strong>
diff --git a/src/ServicePulse.Host/vue/src/components/WarningLevel.ts b/src/ServicePulse.Host/vue/src/components/WarningLevel.ts
new file mode 100644
index 0000000000..eef486b287
--- /dev/null
+++ b/src/ServicePulse.Host/vue/src/components/WarningLevel.ts
@@ -0,0 +1,5 @@
+export enum WarningLevel {
+  None = "none",
+  Warning = "warning",
+  Danger = "danger",
+}
diff --git a/src/ServicePulse.Host/vue/src/components/configuration/PlatformLicense.vue b/src/ServicePulse.Host/vue/src/components/configuration/PlatformLicense.vue
index 2ffeb242b2..fb407cc4ab 100644
--- a/src/ServicePulse.Host/vue/src/components/configuration/PlatformLicense.vue
+++ b/src/ServicePulse.Host/vue/src/components/configuration/PlatformLicense.vue
@@ -5,6 +5,7 @@ import ServiceControlNotAvailable from "../ServiceControlNotAvailable.vue";
 import { connectionState } from "@/composables/serviceServiceControl";
 import BusyIndicator from "../BusyIndicator.vue";
 import ExclamationMark from "./../../components/ExclamationMark.vue";
+import convertToWarningLevel from "@/components/configuration/convertToWarningLevel";
 
 // This is needed because the ConfigurationView.vue routerView expects this event.
 // The event is only actually emitted on the RetryRedirects.vue component
@@ -40,7 +41,7 @@ const loading = computed(() => {
                     >
                       {{ license.formattedExpirationDate }}
                       {{ licenseStatus.subscriptionDaysLeft }}
-                      <exclamation-mark :type="licenseStatus.warningLevel" />
+                      <exclamation-mark :type="convertToWarningLevel(licenseStatus.warningLevel)" />
                     </span>
                     <div class="license-expired-text" v-if="licenseStatus.isPlatformExpired">Your license expired. Please update the license to continue using the Particular Service Platform.</div>
                   </div>
@@ -55,7 +56,7 @@ const loading = computed(() => {
                     >
                       {{ license.formattedExpirationDate }}
                       {{ licenseStatus.trialDaysLeft }}
-                      <exclamation-mark :type="licenseStatus.warningLevel" />
+                      <exclamation-mark :type="convertToWarningLevel(licenseStatus.warningLevel)" />
                     </span>
                     <div class="license-expired-text" v-if="licenseStatus.isPlatformTrialExpired">Your license expired. To continue using the Particular Service Platform you'll need to extend your license.</div>
                     <div class="license-page-extend-trial" v-if="licenseStatus.isPlatformTrialExpiring && licenseStatus.isPlatformTrialExpired">
@@ -74,7 +75,7 @@ const loading = computed(() => {
                       >
                         {{ license.formattedUpgradeProtectionExpiration }}
                         {{ licenseStatus.upgradeDaysLeft }}
-                        <exclamation-mark :type="licenseStatus.warningLevel" />
+                        <exclamation-mark :type="convertToWarningLevel(licenseStatus.warningLevel)" />
                       </span>
                     </span>
                     <div class="license-expired-text" v-if="licenseStatus.isValidWithExpiredUpgradeProtection || licenseStatus.isValidWithExpiringUpgradeProtection">
diff --git a/src/ServicePulse.Host/vue/src/components/configuration/convertToWarningLevel.ts b/src/ServicePulse.Host/vue/src/components/configuration/convertToWarningLevel.ts
new file mode 100644
index 0000000000..b808e88193
--- /dev/null
+++ b/src/ServicePulse.Host/vue/src/components/configuration/convertToWarningLevel.ts
@@ -0,0 +1,13 @@
+import { LicenseWarningLevel } from "@/composables/LicenseStatus";
+import { WarningLevel } from "@/components/WarningLevel";
+
+export default function convertToWarningLevel(level: LicenseWarningLevel) {
+  switch (level) {
+    case LicenseWarningLevel.None:
+      return WarningLevel.None;
+    case LicenseWarningLevel.Warning:
+      return WarningLevel.Warning;
+    case LicenseWarningLevel.Danger:
+      return WarningLevel.Danger;
+  }
+}
diff --git a/src/ServicePulse.Host/vue/src/composables/LicenseStatus.ts b/src/ServicePulse.Host/vue/src/composables/LicenseStatus.ts
new file mode 100644
index 0000000000..47c2e74113
--- /dev/null
+++ b/src/ServicePulse.Host/vue/src/composables/LicenseStatus.ts
@@ -0,0 +1,5 @@
+export enum LicenseWarningLevel {
+  None = "none",
+  Warning = "warning",
+  Danger = "danger",
+}
diff --git a/src/ServicePulse.Host/vue/src/composables/serviceLicense.ts b/src/ServicePulse.Host/vue/src/composables/serviceLicense.ts
index 58f36dc95b..8f9f2131a3 100644
--- a/src/ServicePulse.Host/vue/src/composables/serviceLicense.ts
+++ b/src/ServicePulse.Host/vue/src/composables/serviceLicense.ts
@@ -5,6 +5,7 @@ import { useShowToast } from "./toast";
 import { TYPE } from "vue-toastification";
 import type LicenseInfo from "@/resources/LicenseInfo";
 import { LicenseStatus } from "@/resources/LicenseInfo";
+import { LicenseWarningLevel } from "@/composables/LicenseStatus";
 
 const subscriptionExpiring =
   '<div class="license-warning"><strong>Platform license expires soon</strong><div>Once the license expires you\'ll no longer be able to continue using the Particular Service Platform.</div><a href="#/configuration" class="btn btn-license-warning">View license details</a></div>';
@@ -62,7 +63,7 @@ export const licenseStatus = reactive({
   upgradeDaysLeft: "",
   subscriptionDaysLeft: "",
   trialDaysLeft: "",
-  warningLevel: "",
+  warningLevel: LicenseWarningLevel.None,
 });
 
 export async function useLicense() {
@@ -101,9 +102,10 @@ export async function useLicense() {
 }
 
 function getLicenseWarningLevel(licenseStatus: LicenseStatus) {
-  if (licenseStatus === "InvalidDueToExpiredTrial" || licenseStatus === "InvalidDueToExpiredSubscription" || licenseStatus === "InvalidDueToExpiredUpgradeProtection") return "danger";
-  else if (licenseStatus === "ValidWithExpiringUpgradeProtection" || licenseStatus === "ValidWithExpiringTrial" || licenseStatus === "ValidWithExpiredUpgradeProtection" || licenseStatus === "ValidWithExpiringSubscription") return "warning";
-  return "";
+  if (licenseStatus === "InvalidDueToExpiredTrial" || licenseStatus === "InvalidDueToExpiredSubscription" || licenseStatus === "InvalidDueToExpiredUpgradeProtection") return LicenseWarningLevel.Danger;
+  else if (licenseStatus === "ValidWithExpiringUpgradeProtection" || licenseStatus === "ValidWithExpiringTrial" || licenseStatus === "ValidWithExpiredUpgradeProtection" || licenseStatus === "ValidWithExpiringSubscription")
+    return LicenseWarningLevel.Warning;
+  return LicenseWarningLevel.None;
 }
 
 function isUpgradeProtectionLicense(license: UnwrapNestedRefs<License>) {
diff --git a/src/ServicePulse.Host/vue/src/composables/toast.ts b/src/ServicePulse.Host/vue/src/composables/toast.ts
index 82f8da6bfe..60df39947f 100644
--- a/src/ServicePulse.Host/vue/src/composables/toast.ts
+++ b/src/ServicePulse.Host/vue/src/composables/toast.ts
@@ -1,4 +1,4 @@
-import ToastPopup from "../components/ToastPopup.vue";
+import ToastPopup from "@/components/ToastPopup.vue";
 import { TYPE, useToast } from "vue-toastification";
 
 export function useShowToast(type: TYPE, title: string, message: string, doNotUseTimeout: boolean = false) {
diff --git a/src/ServicePulse.Host/vue/src/resources/EventLogItem.ts b/src/ServicePulse.Host/vue/src/resources/EventLogItem.ts
index 3279299a33..02722b12c5 100644
--- a/src/ServicePulse.Host/vue/src/resources/EventLogItem.ts
+++ b/src/ServicePulse.Host/vue/src/resources/EventLogItem.ts
@@ -1,9 +1,16 @@
 export default interface EventLogItem {
   id: string;
   description: string;
-  severity: string;
+  severity: Severity;
   raised_at: string;
   related_to: string[];
   category: string;
   event_type: string;
 }
+
+export enum Severity {
+  Critical = "critical",
+  Error = "error",
+  Warning = "warning",
+  Info = "info",
+}
diff --git a/src/ServicePulse.Host/vue/src/views/ConfigurationView.vue b/src/ServicePulse.Host/vue/src/views/ConfigurationView.vue
index a9634bd1c5..28191323ef 100644
--- a/src/ServicePulse.Host/vue/src/views/ConfigurationView.vue
+++ b/src/ServicePulse.Host/vue/src/views/ConfigurationView.vue
@@ -5,6 +5,7 @@ import { connectionState, monitoringConnectionState } from "../composables/servi
 import { useIsMonitoringEnabled } from "../composables/serviceServiceControlUrls";
 import { useRedirects } from "../composables/serviceRedirects";
 import ExclamationMark from "../components/ExclamationMark.vue";
+import convertToWarningLevel from "@/components/configuration/convertToWarningLevel";
 
 const redirectCount = ref(0);
 
@@ -34,7 +35,7 @@ onMounted(async () => {
         <div class="nav tabs">
           <h5 :class="{ active: subIsActive('configuration'), disabled: !connectionState.connected && !connectionState.connectedRecently }" class="nav-item">
             <RouterLink :to="{ name: 'license' }">License</RouterLink>
-            <exclamation-mark :type="licenseStatus.warningLevel" />
+            <exclamation-mark :type="convertToWarningLevel(licenseStatus.warningLevel)" />
           </h5>
           <h5 v-if="!licenseStatus.isExpired" :class="{ active: subIsActive('health-check-notifications'), disabled: !connectionState.connected && !connectionState.connectedRecently }" class="nav-item">
             <RouterLink :to="{ name: 'health-check-notifications' }">Health Check Notifications</RouterLink>
diff --git a/src/ServicePulse.Host/vue/src/views/DashboardView.vue b/src/ServicePulse.Host/vue/src/views/DashboardView.vue
index 5506d2800e..0d51949588 100644
--- a/src/ServicePulse.Host/vue/src/views/DashboardView.vue
+++ b/src/ServicePulse.Host/vue/src/views/DashboardView.vue
@@ -1,10 +1,10 @@
-<script setup>
-import DashboardItem from "../components/DashboardItem.vue";
-import EventItemShort from "../components/EventItemShort.vue";
-import LicenseExpired from "../components/LicenseExpired.vue";
-import ServiceControlNotAvailable from "../components/ServiceControlNotAvailable.vue";
-import { connectionState, stats } from "../composables/serviceServiceControl";
-import { licenseStatus } from "../composables/serviceLicense";
+<script setup lang="ts">
+import DashboardItem from "@/components/DashboardItem.vue";
+import EventItemShort from "@/components/EventItemShort.vue";
+import LicenseExpired from "@/components/LicenseExpired.vue";
+import ServiceControlNotAvailable from "@/components/ServiceControlNotAvailable.vue";
+import { connectionState, stats } from "@/composables/serviceServiceControl";
+import { licenseStatus } from "@/composables/serviceLicense";
 </script>
 
 <template>
diff --git a/src/ServicePulse.Host/vue/src/views/EventsView.vue b/src/ServicePulse.Host/vue/src/views/EventsView.vue
index cbf8e49e60..864f15476a 100644
--- a/src/ServicePulse.Host/vue/src/views/EventsView.vue
+++ b/src/ServicePulse.Host/vue/src/views/EventsView.vue
@@ -1,10 +1,15 @@
-<script setup>
-import { licenseStatus } from "../composables/serviceLicense";
-import { connectionState } from "../composables/serviceServiceControl";
-import LicenseExpired from "../components/LicenseExpired.vue";
-import DataView from "../components/DataView.vue";
-import EventLogItem from "../components/EventLogItem.vue";
-import ServiceControlNotAvailable from "../components/ServiceControlNotAvailable.vue";
+<script setup lang="ts">
+import { licenseStatus } from "@/composables/serviceLicense";
+import { connectionState } from "@/composables/serviceServiceControl";
+import LicenseExpired from "@/components/LicenseExpired.vue";
+import DataView from "@/components/DataView.vue";
+import EventLogItem from "@/components/EventLogItem.vue";
+import ServiceControlNotAvailable from "@/components/ServiceControlNotAvailable.vue";
+import type EventLogItemType from "@/resources/EventLogItem";
+import { ref } from "vue";
+import type DataViewPageModel from "@/components/DataViewPageModel";
+
+const pageModel = ref<DataViewPageModel<EventLogItemType>>({ data: [], totalCount: 0 });
 </script>
 
 <template>
@@ -13,12 +18,12 @@ import ServiceControlNotAvailable from "../components/ServiceControlNotAvailable
     <ServiceControlNotAvailable />
     <template v-if="connectionState.connected">
       <div class="events events-view">
-        <DataView api-url="eventlogitems" :auto-refresh-seconds="5" :show-items-per-page="true" :items-per-page="20">
-          <template #data="items">
+        <DataView api-url="eventlogitems" v-model="pageModel" :auto-refresh-seconds="5" :show-items-per-page="true" :items-per-page="20">
+          <template #data>
             <div class="row">
               <div class="col-sm-12">
                 <h1>Events</h1>
-                <EventLogItem v-for="item of items" :eventLogItem="item" :key="item.id" />
+                <EventLogItem v-for="item of pageModel.data" :eventLogItem="item" :key="item.id" />
               </div>
             </div>
           </template>