@@ -26,14 +26,7 @@ const DYNAMIC_DATE_RANGES = {
26
26
} ,
27
27
yesterday : {
28
28
name : "Yesterday" ,
29
- value : ( ) => [
30
- moment ( )
31
- . subtract ( 1 , "day" )
32
- . startOf ( "day" ) ,
33
- moment ( )
34
- . subtract ( 1 , "day" )
35
- . endOf ( "day" ) ,
36
- ] ,
29
+ value : ( ) => [ moment ( ) . subtract ( 1 , "day" ) . startOf ( "day" ) , moment ( ) . subtract ( 1 , "day" ) . endOf ( "day" ) ] ,
37
30
} ,
38
31
this_week : {
39
32
name : "This week" ,
@@ -49,36 +42,15 @@ const DYNAMIC_DATE_RANGES = {
49
42
} ,
50
43
last_week : {
51
44
name : "Last week" ,
52
- value : ( ) => [
53
- moment ( )
54
- . subtract ( 1 , "week" )
55
- . startOf ( "week" ) ,
56
- moment ( )
57
- . subtract ( 1 , "week" )
58
- . endOf ( "week" ) ,
59
- ] ,
45
+ value : ( ) => [ moment ( ) . subtract ( 1 , "week" ) . startOf ( "week" ) , moment ( ) . subtract ( 1 , "week" ) . endOf ( "week" ) ] ,
60
46
} ,
61
47
last_month : {
62
48
name : "Last month" ,
63
- value : ( ) => [
64
- moment ( )
65
- . subtract ( 1 , "month" )
66
- . startOf ( "month" ) ,
67
- moment ( )
68
- . subtract ( 1 , "month" )
69
- . endOf ( "month" ) ,
70
- ] ,
49
+ value : ( ) => [ moment ( ) . subtract ( 1 , "month" ) . startOf ( "month" ) , moment ( ) . subtract ( 1 , "month" ) . endOf ( "month" ) ] ,
71
50
} ,
72
51
last_year : {
73
52
name : "Last year" ,
74
- value : ( ) => [
75
- moment ( )
76
- . subtract ( 1 , "year" )
77
- . startOf ( "year" ) ,
78
- moment ( )
79
- . subtract ( 1 , "year" )
80
- . endOf ( "year" ) ,
81
- ] ,
53
+ value : ( ) => [ moment ( ) . subtract ( 1 , "year" ) . startOf ( "year" ) , moment ( ) . subtract ( 1 , "year" ) . endOf ( "year" ) ] ,
82
54
} ,
83
55
last_hour : {
84
56
name : "Last hour" ,
@@ -95,71 +67,43 @@ const DYNAMIC_DATE_RANGES = {
95
67
last_7_days : {
96
68
name : "Last 7 days" ,
97
69
value : untilNow (
98
- ( ) =>
99
- moment ( )
100
- . subtract ( 7 , "days" )
101
- . startOf ( "day" ) ,
102
- ( ) => moment ( ) . endOf ( "day" )
70
+ ( ) => moment ( ) . subtract ( 7 , "days" ) . startOf ( "day" ) ,
103
71
) ,
104
72
} ,
105
73
last_14_days : {
106
74
name : "Last 14 days" ,
107
75
value : untilNow (
108
- ( ) =>
109
- moment ( )
110
- . subtract ( 14 , "days" )
111
- . startOf ( "day" ) ,
112
- ( ) => moment ( ) . endOf ( "day" )
76
+ ( ) => moment ( ) . subtract ( 14 , "days" ) . startOf ( "day" ) ,
113
77
) ,
114
78
} ,
115
79
last_30_days : {
116
80
name : "Last 30 days" ,
117
81
value : untilNow (
118
- ( ) =>
119
- moment ( )
120
- . subtract ( 30 , "days" )
121
- . startOf ( "day" ) ,
122
- ( ) => moment ( ) . endOf ( "day" )
82
+ ( ) => moment ( ) . subtract ( 30 , "days" ) . startOf ( "day" ) ,
123
83
) ,
124
84
} ,
125
85
last_60_days : {
126
86
name : "Last 60 days" ,
127
87
value : untilNow (
128
- ( ) =>
129
- moment ( )
130
- . subtract ( 60 , "days" )
131
- . startOf ( "day" ) ,
132
- ( ) => moment ( ) . endOf ( "day" )
88
+ ( ) => moment ( ) . subtract ( 60 , "days" ) . startOf ( "day" ) ,
133
89
) ,
134
90
} ,
135
91
last_90_days : {
136
92
name : "Last 90 days" ,
137
93
value : untilNow (
138
- ( ) =>
139
- moment ( )
140
- . subtract ( 90 , "days" )
141
- . startOf ( "day" ) ,
142
- ( ) => moment ( ) . endOf ( "day" )
94
+ ( ) => moment ( ) . subtract ( 90 , "days" ) . startOf ( "day" ) ,
143
95
) ,
144
96
} ,
145
97
last_12_months : {
146
98
name : "Last 12 months" ,
147
99
value : untilNow (
148
- ( ) =>
149
- moment ( )
150
- . subtract ( 12 , "months" )
151
- . startOf ( "day" ) ,
152
- ( ) => moment ( ) . endOf ( "day" )
100
+ ( ) => moment ( ) . subtract ( 12 , "months" ) . startOf ( "day" ) ,
153
101
) ,
154
102
} ,
155
103
last_10_years : {
156
104
name : "Last 10 years" ,
157
105
value : untilNow (
158
- ( ) =>
159
- moment ( )
160
- . subtract ( 10 , "years" )
161
- . startOf ( "day" ) ,
162
- ( ) => moment ( ) . endOf ( "day" )
106
+ ( ) => moment ( ) . subtract ( 10 , "years" ) . startOf ( "day" ) ,
163
107
) ,
164
108
} ,
165
109
} ;
@@ -174,7 +118,7 @@ export function isDynamicDateRangeString(value) {
174
118
}
175
119
176
120
export function getDynamicDateRangeStringFromName ( dynamicRangeName ) {
177
- const key = findKey ( DYNAMIC_DATE_RANGES , range => range . name === dynamicRangeName ) ;
121
+ const key = findKey ( DYNAMIC_DATE_RANGES , ( range ) => range . name === dynamicRangeName ) ;
178
122
return key ? DYNAMIC_PREFIX + key : undefined ;
179
123
}
180
124
@@ -243,7 +187,7 @@ class DateRangeParameter extends Parameter {
243
187
244
188
getExecutionValue ( ) {
245
189
if ( this . hasDynamicValue ) {
246
- const format = date => date . format ( DATETIME_FORMATS [ this . type ] ) ;
190
+ const format = ( date ) => date . format ( DATETIME_FORMATS [ this . type ] ) ;
247
191
const [ start , end ] = this . normalizedValue . value ( ) . map ( format ) ;
248
192
return { start, end } ;
249
193
}
0 commit comments