diff --git a/src/dashboard.py b/src/dashboard.py index 5675bd41..6b7e2bda 100644 --- a/src/dashboard.py +++ b/src/dashboard.py @@ -751,7 +751,7 @@ def API_addPeers(configName): status, result = config.addPeers(keyPairs) DashboardWebHooks.RunWebHook('peer_created', { "configuration": config.Name, - "peers": list(map(lambda p : p.id, keyPairs)) + "peers": list(map(lambda p : p['id'], keyPairs)) }) return ResponseObject(status=status, message=result['message'], data=result['peers']) diff --git a/src/static/app/src/components/navbar.vue b/src/static/app/src/components/navbar.vue index 2adeb0a5..f83b7fe3 100644 --- a/src/static/app/src/components/navbar.vue +++ b/src/static/app/src/components/navbar.vue @@ -90,6 +90,13 @@ export default { +
  • + + + + +
  • diff --git a/src/static/app/src/components/settingsComponent/dashboardWebHooks.vue b/src/static/app/src/components/settingsComponent/dashboardWebHooks.vue index 51d04d0e..e24ef9ed 100644 --- a/src/static/app/src/components/settingsComponent/dashboardWebHooks.vue +++ b/src/static/app/src/components/settingsComponent/dashboardWebHooks.vue @@ -4,6 +4,8 @@ import { fetchGet } from "@/utilities/fetch.js" import {onMounted, ref} from "vue"; import AddWebHook from "@/components/settingsComponent/dashboardWebHooksComponents/addWebHook.vue"; import WebHookSessions from "@/components/settingsComponent/dashboardWebHooksComponents/webHookSessions.vue"; +import ClientGroup from "@/components/clientComponents/clientGroup.vue"; +import ClientSettings from "@/components/clientComponents/clientSettings.vue"; const webHooks = ref([]) const webHooksLoaded = ref(false) @@ -24,31 +26,33 @@ const view = ref("edit") diff --git a/src/static/app/src/components/settingsComponent/dashboardWebHooksComponents/previousWebHookSession.vue b/src/static/app/src/components/settingsComponent/dashboardWebHooksComponents/previousWebHookSession.vue new file mode 100644 index 00000000..dd043391 --- /dev/null +++ b/src/static/app/src/components/settingsComponent/dashboardWebHooksComponents/previousWebHookSession.vue @@ -0,0 +1,34 @@ + + + + + \ No newline at end of file diff --git a/src/static/app/src/components/settingsComponent/dashboardWebHooksComponents/webHookSession.vue b/src/static/app/src/components/settingsComponent/dashboardWebHooksComponents/webHookSession.vue new file mode 100644 index 00000000..ea2ab415 --- /dev/null +++ b/src/static/app/src/components/settingsComponent/dashboardWebHooksComponents/webHookSession.vue @@ -0,0 +1,105 @@ + + + + + \ No newline at end of file diff --git a/src/static/app/src/components/settingsComponent/dashboardWebHooksComponents/webHookSessions.vue b/src/static/app/src/components/settingsComponent/dashboardWebHooksComponents/webHookSessions.vue index 9b14bbd6..86ada694 100644 --- a/src/static/app/src/components/settingsComponent/dashboardWebHooksComponents/webHookSessions.vue +++ b/src/static/app/src/components/settingsComponent/dashboardWebHooksComponents/webHookSessions.vue @@ -1,7 +1,10 @@ diff --git a/src/static/app/src/components/systemStatusComponents/networkInterface.vue b/src/static/app/src/components/systemStatusComponents/networkInterface.vue index 3bae22b7..7c13815e 100644 --- a/src/static/app/src/components/systemStatusComponents/networkInterface.vue +++ b/src/static/app/src/components/systemStatusComponents/networkInterface.vue @@ -75,12 +75,19 @@ const networkSpeedChartOption = computed(() => { }) const networkSpeedHistoricalChartData = computed(() => { + let bytes_recv = [] + let bytes_sent = [] + if (props.historicalNetworkSpeed.bytes_recv && props.historicalNetworkSpeed.bytes_sent){ + bytes_recv = [...props.historicalNetworkSpeed.bytes_recv] + bytes_sent = [...props.historicalNetworkSpeed.bytes_sent] + } + return { labels: [...props.historicalChartTimestamp], datasets: [ { label: GetLocale('Real Time Received Data Usage'), - data: [...props.historicalNetworkSpeed.bytes_recv], + data: bytes_recv, fill: 'origin', borderColor: '#0dcaf0', backgroundColor: '#0dcaf090', @@ -90,7 +97,7 @@ const networkSpeedHistoricalChartData = computed(() => { }, { label: GetLocale('Real Time Sent Data Usage'), - data: [...props.historicalNetworkSpeed.bytes_sent], + data: bytes_sent, fill: 'origin', backgroundColor: '#ffc10790', borderColor: '#ffc107', diff --git a/src/static/app/src/router/router.js b/src/static/app/src/router/router.js index e73b835c..ffd76ec4 100644 --- a/src/static/app/src/router/router.js +++ b/src/static/app/src/router/router.js @@ -124,6 +124,14 @@ const router = createRouter({ } ] }, + { + name: "Webhooks", + path: "webhooks", + component: () => import("@/components/settingsComponent/dashboardWebHooks.vue"), + meta: { + title: "Webhooks" + } + }, { name: "Configuration", path: 'configuration/:id', diff --git a/src/static/app/src/views/systemStatus.vue b/src/static/app/src/views/systemStatus.vue index acf57cba..03ceacd8 100644 --- a/src/static/app/src/views/systemStatus.vue +++ b/src/static/app/src/views/systemStatus.vue @@ -8,9 +8,11 @@ import Process from "@/components/systemStatusComponents/process.vue"; import {DashboardConfigurationStore} from "@/stores/DashboardConfigurationStore.js"; const dashboardStore = DashboardConfigurationStore() +const loaded = ref(false) const data = computed(() => { - return dashboardStore.SystemStatus + return loaded.value ? dashboardStore.SystemStatus : undefined }) + let interval = null; import { Chart, @@ -59,16 +61,10 @@ const historicalChartTimestamp = ref([]) const historicalCpuUsage = ref([]) const historicalVirtualMemoryUsage = ref([]) const historicalSwapMemoryUsage = ref([]) -const historicalNetworkData = ref({ - bytes_recv: [], - bytes_sent: [] -}) -const historicalNetworkSpeed = reactive({ +const historicalNetworkSpeed = reactive({}) -}) - -const getData = () => { - fetchGet("/api/systemStatus", {}, (res) => { +const getData = async () => { + await fetchGet("/api/systemStatus", {}, (res) => { historicalChartTimestamp.value.push(dayjs().format("HH:mm:ss A")) dashboardStore.SystemStatus = res.data historicalCpuUsage.value.push(res.data.CPU.cpu_percent) @@ -85,6 +81,7 @@ const getData = () => { historicalNetworkSpeed[i].bytes_recv.push(res.data.NetworkInterfaces[i].realtime.recv) historicalNetworkSpeed[i].bytes_sent.push(res.data.NetworkInterfaces[i].realtime.sent) } + loaded.value = true }) } @@ -125,43 +122,6 @@ const chartOption = computed(() => { } } }) -const networkSpeedChartOption = computed(() => { - return { - responsive: true, - plugins: { - legend: { - display: true - }, - tooltip: { - callbacks: { - label: (tooltipItem) => { - return `${tooltipItem.formattedValue} MB/s` - } - } - } - }, - scales: { - x: { - ticks: { - display: false, - }, - grid: { - display: false - }, - }, - y:{ - ticks: { - callback: (val, index) => { - return `${val} MB/s` - } - }, - grid: { - display: false - }, - } - } - } -}) const cpuHistoricalChartData = computed(() => { return { labels: [...historicalChartTimestamp.value], @@ -208,33 +168,6 @@ const memoryHistoricalChartData = computed(() => { } }) -const networkSpeedHistoricalChartData = computed(() => { - return { - labels: [...historicalChartTimestamp.value], - datasets: [ - { - label: GetLocale('Real Time Received Data Usage'), - data: [...historicalNetworkSpeed.value.bytes_recv], - fill: 'origin', - borderColor: '#0dcaf0', - backgroundColor: '#0dcaf090', - tension: 0, - pointRadius: 2, - borderWidth: 1, - }, - { - label: GetLocale('Real Time Sent Data Usage'), - data: [...historicalNetworkSpeed.value.bytes_sent], - fill: 'origin', - backgroundColor: '#ffc10790', - borderColor: '#ffc107', - tension: 0, - pointRadius: 2, - borderWidth: 1, - } - ] - } -})