Skip to content

Commit 5ed19c3

Browse files
yoshiokatsuneoyoshiokatsuneo
committed
fix error for restyled by prettier
1 parent 34e12bb commit 5ed19c3

File tree

2 files changed

+31
-140
lines changed

2 files changed

+31
-140
lines changed

‎client/app/components/dynamic-parameters/DateRangeParameter.jsx‎

Lines changed: 15 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -9,97 +9,62 @@ const DYNAMIC_DATE_OPTIONS = [
99
name: "This week",
1010
value: getDynamicDateRangeFromString("d_this_week"),
1111
label: () =>
12-
getDynamicDateRangeFromString("d_this_week")
13-
.value()[0]
14-
.format("MMM D") +
12+
getDynamicDateRangeFromString("d_this_week").value()[0].format("MMM D") +
1513
" - " +
16-
getDynamicDateRangeFromString("d_this_week")
17-
.value()[1]
18-
.format("MMM D"),
14+
getDynamicDateRangeFromString("d_this_week").value()[1].format("MMM D"),
1915
},
2016
{
2117
name: "This month",
2218
value: getDynamicDateRangeFromString("d_this_month"),
23-
label: () =>
24-
getDynamicDateRangeFromString("d_this_month")
25-
.value()[0]
26-
.format("MMMM"),
19+
label: () => getDynamicDateRangeFromString("d_this_month").value()[0].format("MMMM"),
2720
},
2821
{
2922
name: "This year",
3023
value: getDynamicDateRangeFromString("d_this_year"),
31-
label: () =>
32-
getDynamicDateRangeFromString("d_this_year")
33-
.value()[0]
34-
.format("YYYY"),
24+
label: () => getDynamicDateRangeFromString("d_this_year").value()[0].format("YYYY"),
3525
},
3626
{
3727
name: "Last week",
3828
value: getDynamicDateRangeFromString("d_last_week"),
3929
label: () =>
40-
getDynamicDateRangeFromString("d_last_week")
41-
.value()[0]
42-
.format("MMM D") +
30+
getDynamicDateRangeFromString("d_last_week").value()[0].format("MMM D") +
4331
" - " +
44-
getDynamicDateRangeFromString("d_last_week")
45-
.value()[1]
46-
.format("MMM D"),
32+
getDynamicDateRangeFromString("d_last_week").value()[1].format("MMM D"),
4733
},
4834
{
4935
name: "Last month",
5036
value: getDynamicDateRangeFromString("d_last_month"),
51-
label: () =>
52-
getDynamicDateRangeFromString("d_last_month")
53-
.value()[0]
54-
.format("MMMM"),
37+
label: () => getDynamicDateRangeFromString("d_last_month").value()[0].format("MMMM"),
5538
},
5639
{
5740
name: "Last year",
5841
value: getDynamicDateRangeFromString("d_last_year"),
59-
label: () =>
60-
getDynamicDateRangeFromString("d_last_year")
61-
.value()[0]
62-
.format("YYYY"),
42+
label: () => getDynamicDateRangeFromString("d_last_year").value()[0].format("YYYY"),
6343
},
6444
{
6545
name: "Last 7 days",
6646
value: getDynamicDateRangeFromString("d_last_7_days"),
67-
label: () =>
68-
getDynamicDateRangeFromString("d_last_7_days")
69-
.value()[0]
70-
.format("MMM D") + " - Today",
47+
label: () => getDynamicDateRangeFromString("d_last_7_days").value()[0].format("MMM D") + " - Today",
7148
},
7249
{
7350
name: "Last 14 days",
7451
value: getDynamicDateRangeFromString("d_last_14_days"),
75-
label: () =>
76-
getDynamicDateRangeFromString("d_last_14_days")
77-
.value()[0]
78-
.format("MMM D") + " - Today",
52+
label: () => getDynamicDateRangeFromString("d_last_14_days").value()[0].format("MMM D") + " - Today",
7953
},
8054
{
8155
name: "Last 30 days",
8256
value: getDynamicDateRangeFromString("d_last_30_days"),
83-
label: () =>
84-
getDynamicDateRangeFromString("d_last_30_days")
85-
.value()[0]
86-
.format("MMM D") + " - Today",
57+
label: () => getDynamicDateRangeFromString("d_last_30_days").value()[0].format("MMM D") + " - Today",
8758
},
8859
{
8960
name: "Last 60 days",
9061
value: getDynamicDateRangeFromString("d_last_60_days"),
91-
label: () =>
92-
getDynamicDateRangeFromString("d_last_60_days")
93-
.value()[0]
94-
.format("MMM D") + " - Today",
62+
label: () => getDynamicDateRangeFromString("d_last_60_days").value()[0].format("MMM D") + " - Today",
9563
},
9664
{
9765
name: "Last 90 days",
9866
value: getDynamicDateRangeFromString("d_last_90_days"),
99-
label: () =>
100-
getDynamicDateRangeFromString("d_last_90_days")
101-
.value()[0]
102-
.format("MMM D") + " - Today",
67+
label: () => getDynamicDateRangeFromString("d_last_90_days").value()[0].format("MMM D") + " - Today",
10368
},
10469
{
10570
name: "Last 12 months",
@@ -117,18 +82,12 @@ const DYNAMIC_DATETIME_OPTIONS = [
11782
{
11883
name: "Today",
11984
value: getDynamicDateRangeFromString("d_today"),
120-
label: () =>
121-
getDynamicDateRangeFromString("d_today")
122-
.value()[0]
123-
.format("MMM D"),
85+
label: () => getDynamicDateRangeFromString("d_today").value()[0].format("MMM D"),
12486
},
12587
{
12688
name: "Yesterday",
12789
value: getDynamicDateRangeFromString("d_yesterday"),
128-
label: () =>
129-
getDynamicDateRangeFromString("d_yesterday")
130-
.value()[0]
131-
.format("MMM D"),
90+
label: () => getDynamicDateRangeFromString("d_yesterday").value()[0].format("MMM D"),
13291
},
13392
...DYNAMIC_DATE_OPTIONS,
13493
];

‎client/app/services/parameters/DateRangeParameter.js‎

Lines changed: 16 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ const DYNAMIC_PREFIX = "d_";
1717
* @param now {function(): moment.Moment=} moment - defaults to now
1818
* @returns {function(withNow: boolean): [moment.Moment, moment.Moment|undefined]}
1919
*/
20-
const untilNow = (from, now = () => moment()) => (withNow = true) => [from(), withNow ? now() : undefined];
20+
const untilNow =
21+
(from, now = () => moment()) =>
22+
(withNow = true) => [from(), withNow ? now() : undefined];
2123

2224
const DYNAMIC_DATE_RANGES = {
2325
today: {
@@ -26,14 +28,7 @@ const DYNAMIC_DATE_RANGES = {
2628
},
2729
yesterday: {
2830
name: "Yesterday",
29-
value: () => [
30-
moment()
31-
.subtract(1, "day")
32-
.startOf("day"),
33-
moment()
34-
.subtract(1, "day")
35-
.endOf("day"),
36-
],
31+
value: () => [moment().subtract(1, "day").startOf("day"), moment().subtract(1, "day").endOf("day")],
3732
},
3833
this_week: {
3934
name: "This week",
@@ -49,36 +44,15 @@ const DYNAMIC_DATE_RANGES = {
4944
},
5045
last_week: {
5146
name: "Last week",
52-
value: () => [
53-
moment()
54-
.subtract(1, "week")
55-
.startOf("week"),
56-
moment()
57-
.subtract(1, "week")
58-
.endOf("week"),
59-
],
47+
value: () => [moment().subtract(1, "week").startOf("week"), moment().subtract(1, "week").endOf("week")],
6048
},
6149
last_month: {
6250
name: "Last month",
63-
value: () => [
64-
moment()
65-
.subtract(1, "month")
66-
.startOf("month"),
67-
moment()
68-
.subtract(1, "month")
69-
.endOf("month"),
70-
],
51+
value: () => [moment().subtract(1, "month").startOf("month"), moment().subtract(1, "month").endOf("month")],
7152
},
7253
last_year: {
7354
name: "Last year",
74-
value: () => [
75-
moment()
76-
.subtract(1, "year")
77-
.startOf("year"),
78-
moment()
79-
.subtract(1, "year")
80-
.endOf("year"),
81-
],
55+
value: () => [moment().subtract(1, "year").startOf("year"), moment().subtract(1, "year").endOf("year")],
8256
},
8357
last_hour: {
8458
name: "Last hour",
@@ -94,73 +68,31 @@ const DYNAMIC_DATE_RANGES = {
9468
},
9569
last_7_days: {
9670
name: "Last 7 days",
97-
value: untilNow(
98-
() =>
99-
moment()
100-
.subtract(7, "days")
101-
.startOf("day"),
102-
() => moment().endOf("day")
103-
),
71+
value: untilNow(() => moment().subtract(7, "days").startOf("day")),
10472
},
10573
last_14_days: {
10674
name: "Last 14 days",
107-
value: untilNow(
108-
() =>
109-
moment()
110-
.subtract(14, "days")
111-
.startOf("day"),
112-
() => moment().endOf("day")
113-
),
75+
value: untilNow(() => moment().subtract(14, "days").startOf("day")),
11476
},
11577
last_30_days: {
11678
name: "Last 30 days",
117-
value: untilNow(
118-
() =>
119-
moment()
120-
.subtract(30, "days")
121-
.startOf("day"),
122-
() => moment().endOf("day")
123-
),
79+
value: untilNow(() => moment().subtract(30, "days").startOf("day")),
12480
},
12581
last_60_days: {
12682
name: "Last 60 days",
127-
value: untilNow(
128-
() =>
129-
moment()
130-
.subtract(60, "days")
131-
.startOf("day"),
132-
() => moment().endOf("day")
133-
),
83+
value: untilNow(() => moment().subtract(60, "days").startOf("day")),
13484
},
13585
last_90_days: {
13686
name: "Last 90 days",
137-
value: untilNow(
138-
() =>
139-
moment()
140-
.subtract(90, "days")
141-
.startOf("day"),
142-
() => moment().endOf("day")
143-
),
87+
value: untilNow(() => moment().subtract(90, "days").startOf("day")),
14488
},
14589
last_12_months: {
14690
name: "Last 12 months",
147-
value: untilNow(
148-
() =>
149-
moment()
150-
.subtract(12, "months")
151-
.startOf("day"),
152-
() => moment().endOf("day")
153-
),
91+
value: untilNow(() => moment().subtract(12, "months").startOf("day")),
15492
},
15593
last_10_years: {
15694
name: "Last 10 years",
157-
value: untilNow(
158-
() =>
159-
moment()
160-
.subtract(10, "years")
161-
.startOf("day"),
162-
() => moment().endOf("day")
163-
),
95+
value: untilNow(() => moment().subtract(10, "years").startOf("day")),
16496
},
16597
};
16698

@@ -174,7 +106,7 @@ export function isDynamicDateRangeString(value) {
174106
}
175107

176108
export function getDynamicDateRangeStringFromName(dynamicRangeName) {
177-
const key = findKey(DYNAMIC_DATE_RANGES, range => range.name === dynamicRangeName);
109+
const key = findKey(DYNAMIC_DATE_RANGES, (range) => range.name === dynamicRangeName);
178110
return key ? DYNAMIC_PREFIX + key : undefined;
179111
}
180112

@@ -243,7 +175,7 @@ class DateRangeParameter extends Parameter {
243175

244176
getExecutionValue() {
245177
if (this.hasDynamicValue) {
246-
const format = date => date.format(DATETIME_FORMATS[this.type]);
178+
const format = (date) => date.format(DATETIME_FORMATS[this.type]);
247179
const [start, end] = this.normalizedValue.value().map(format);
248180
return { start, end };
249181
}

0 commit comments

Comments
 (0)