diff --git a/client/src/components/AnlyticsStatus.vue b/client/src/components/AnlyticsStatus.vue index 478e3ca..cc7b6cb 100644 --- a/client/src/components/AnlyticsStatus.vue +++ b/client/src/components/AnlyticsStatus.vue @@ -9,7 +9,6 @@ import { defineComponent } from 'vue'; import { getStatusGenerator } from '@/services/analytics.service'; - export default defineComponent({ name: 'AnalyticStatus', components: { diff --git a/client/src/components/Graph.vue b/client/src/components/Graph.vue index 192f3b7..f3678d3 100644 --- a/client/src/components/Graph.vue +++ b/client/src/components/Graph.vue @@ -61,10 +61,9 @@ async function addSegment(segment: Segment): Promise { } // TODO: move to store -async function _deleteSegment(from: number, to: number): Promise { +async function _deleteSegment(from: number, to: number): Promise { try { - const id = await deleteSegment(from, to); - return id; + return await deleteSegment(from, to); } catch (e) { this.$notify({ title: "Error during saving segment", @@ -79,18 +78,21 @@ export default defineComponent({ name: 'Graph', props: {}, mounted() { - // const endTime = Math.floor(Date.now() / 1000); - // const startTime = endTime - 1000; // 1000 seconds - // TODO: fill segmentArray from service var s = new SegmentArray(); - var pod = new HasticPod( + this.pod = new HasticPod( document.getElementById('chart'), resolveData.bind(this), addSegment.bind(this), _deleteSegment.bind(this), s ); - pod.render(); + this.pod.render(); + }, + methods: { + async rerender() { + await _deleteSegment.bind(this)(0, Date.now()); + this.pod.fetchData(); + } } }); diff --git a/client/src/components/hastic_pod/index.ts b/client/src/components/hastic_pod/index.ts index ab0dd5d..1c45abd 100644 --- a/client/src/components/hastic_pod/index.ts +++ b/client/src/components/hastic_pod/index.ts @@ -82,7 +82,7 @@ export class HasticPod extends LinePod { console.log('render my metrics'); } - protected fetchData(): void { + public fetchData(): void { let to = Math.floor(Date.now() / 1000); let from = to - 5000; // -5000 seconds diff --git a/client/src/services/analytics.service.ts b/client/src/services/analytics.service.ts index 1507591..51a8544 100644 --- a/client/src/services/analytics.service.ts +++ b/client/src/services/analytics.service.ts @@ -13,7 +13,6 @@ export async function getStatus(): Promise { const uri = ANALYTICS_API_URL + `status`; const res = await axios.get(uri); const data = res['data'] as any; - console.log(data.status); return data.status; } diff --git a/client/src/services/segments.service.ts b/client/src/services/segments.service.ts index b29015e..ef8e915 100644 --- a/client/src/services/segments.service.ts +++ b/client/src/services/segments.service.ts @@ -32,7 +32,7 @@ export async function postSegment(segment: Segment): Promise { return resp['data']['id']; } -export async function deleteSegment(from: number, to: number): Promise { +export async function deleteSegment(from: number, to: number): Promise { const uri = SEGMENTS_API_URL + `?from=${from}&to=${to}`; const resp = await axios.delete(uri); return resp['data']['count']; diff --git a/client/src/views/Home.vue b/client/src/views/Home.vue index 6e92e46..89197fc 100644 --- a/client/src/views/Home.vue +++ b/client/src/views/Home.vue @@ -1,7 +1,7 @@