Skip to content

Commit 050f700

Browse files
committed
move initial request to be called from InputTimeInterval
1 parent 435896a commit 050f700

3 files changed

Lines changed: 12 additions & 16 deletions

File tree

src/components/InputTimeInterval.vue

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<template lang="pug">
22
div
33
div
4-
b-alert(v-if="mode == 'range' && invalidDaterange" variant="warning" show)
4+
b-alert(v-if="mode == 'range' && invalidDaterange", variant="warning", show)
55
| The selected date range is invalid. The second date must be greater than the first date.
6-
b-alert(v-if="mode == 'range' && daterangeTooLong" variant="warning" show)
6+
b-alert(v-if="mode == 'range' && daterangeTooLong", variant="warning", show)
77
| The selected date range is too long. The maximum is {{ maxDuration/(24*60*60) }} days.
88

99
table
1010
tr
1111
th.pr-2
1212
label(for="mode") Interval mode:
1313
td
14-
select(id="mode" v-model="mode")
14+
select(id="mode", v-model="mode")
1515
option(value='last_duration') Last duration
1616
option(value='range') Date range
1717
tr(v-if="mode == 'last_duration'")
1818
th.pr-2
1919
label(for="duration") Show last:
2020
td
21-
select(id="duration" v-model="duration" @change="valueChanged")
21+
select(id="duration", v-model="duration", @change="valueChanged")
2222
option(:value="15*60") 15min
2323
option(:value="30*60") 30min
2424
option(:value="60*60") 1h
@@ -30,8 +30,8 @@ div
3030
tr(v-if="mode == 'range'")
3131
th.pr-2 Range:
3232
td
33-
input(type="date" v-model="start")
34-
input(type="date" v-model="end")
33+
input(type="date", v-model="start")
34+
input(type="date", v-model="end")
3535
button(
3636
class="btn btn-outline-dark btn-sm",
3737
type="button",
@@ -85,6 +85,9 @@ export default {
8585
return moment(this.start).add(this.maxDuration, 'seconds').isBefore(moment(this.end));
8686
},
8787
},
88+
mounted() {
89+
this.valueChanged();
90+
},
8891
methods: {
8992
valueChanged() {
9093
if (

src/views/Bucket.vue

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ div
3232
</template>
3333

3434
<script>
35-
import moment from 'moment';
3635
export default {
3736
name: 'Bucket',
3837
props: {
@@ -43,7 +42,7 @@ export default {
4342
bucket_with_events: { events: [] },
4443
events: [],
4544
eventcount: '?',
46-
daterange: [moment().subtract(1, 'hour'), moment()],
45+
daterange: null,
4746
maxDuration: 31 * 24 * 60 * 60,
4847
};
4948
},
@@ -59,7 +58,6 @@ export default {
5958
},
6059
mounted: async function () {
6160
await this.$store.dispatch('buckets/ensureBuckets');
62-
await this.getEvents(this.id);
6361
await this.getEventCount(this.id);
6462
},
6563
methods: {

src/views/Timeline.vue

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
div
33
h2 Timeline
44

5-
input-timeinterval(v-model="daterange", :defaultDuration="timeintervalDefaultDuration" :maxDuration="maxDuration")
5+
input-timeinterval(v-model="daterange", :defaultDuration="timeintervalDefaultDuration", :maxDuration="maxDuration")
66

77
div(v-show="buckets !== null")
88
div
@@ -17,11 +17,10 @@ div
1717
</template>
1818

1919
<script>
20-
import moment from 'moment';
2120
import _ from 'lodash';
2221
export default {
2322
name: 'Timeline',
24-
data: () => {
23+
data() {
2524
return {
2625
buckets: null,
2726
daterange: null,
@@ -39,10 +38,6 @@ export default {
3938
this.getBuckets();
4039
},
4140
},
42-
mounted: function () {
43-
(this.daterange = [moment().subtract(this.timeintervalDefaultDuration, 'seconds'), moment()]),
44-
this.getBuckets(this.daterange);
45-
},
4641
methods: {
4742
getBuckets: async function () {
4843
this.buckets = await this.$store.dispatch('buckets/getBucketsWithEvents', {

0 commit comments

Comments
 (0)