Skip to content

Commit ed7ac22

Browse files
committed
semantics
1 parent 37ecf7a commit ed7ac22

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

src/lib/Filters.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@ export const Constraints = {
7676
composable: true,
7777
comparable: true,
7878
},
79-
afterOrOn: {
80-
name: 'is after or on',
79+
onOrAfter: {
80+
name: 'is on or after',
8181
field: 'Date',
8282
composable: true,
8383
comparable: true,
8484
},
85-
beforeOrOn: {
86-
name: 'is before or on',
85+
onOrBefore: {
86+
name: 'is on or before',
8787
field: 'Date',
8888
composable: true,
8989
comparable: true,
@@ -186,9 +186,9 @@ export const FieldConstraints = {
186186
'exists',
187187
'dne',
188188
'before',
189-
'beforeOrOn',
189+
'onOrBefore',
190190
'after',
191-
'afterOrOn',
191+
'onOrAfter',
192192
'unique',
193193
],
194194
Object: [

src/lib/queryFromFilters.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,14 @@ function addConstraint(query, filter) {
127127
query.lessThan(filter.get('field'), filter.get('compareTo'));
128128
break;
129129
case 'lte':
130+
case 'onOrBefore':
130131
query.lessThanOrEqualTo(filter.get('field'), filter.get('compareTo'));
131132
break;
132133
case 'gt':
133134
query.greaterThan(filter.get('field'), filter.get('compareTo'));
134135
break;
135136
case 'gte':
137+
case 'onOrAfter':
136138
query.greaterThanOrEqualTo(filter.get('field'), filter.get('compareTo'));
137139
break;
138140
case 'starts':
@@ -152,15 +154,9 @@ function addConstraint(query, filter) {
152154
case 'before':
153155
query.lessThan(filter.get('field'), filter.get('compareTo'));
154156
break;
155-
case 'beforeOrOn':
156-
query.lessThanOrEqualTo(filter.get('field'), filter.get('compareTo'));
157-
break;
158157
case 'after':
159158
query.greaterThan(filter.get('field'), filter.get('compareTo'));
160159
break;
161-
case 'afterOrOn':
162-
query.greaterThanOrEqualTo(filter.get('field'), filter.get('compareTo'));
163-
break;
164160
case 'containsString':
165161
case 'containsNumber':
166162
query.equalTo(filter.get('field'), filter.get('compareTo'));

0 commit comments

Comments
 (0)