Always set this.dateRangeString when date range is cleared

getodk · Aug 14, 2019 · 92bbdfc · 92bbdfc
1 parent 5958ef9
commit 92bbdfc
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 17 deletions.
diff --git a/src/components/audit/filters.vue b/src/components/audit/filters.vue
@@ -91,26 +91,24 @@ export default {
     filter() {
       this.$emit('filter', { action: this.action, dateRange: this.dateRange });
     },
-    sameDateRange(range1, range2) {
-      return range1[0].valueOf() === range2[0].valueOf() &&
-        range1[1].valueOf() === range2[1].valueOf();
+    todayToToday() {
+      const today = DateTime.local().startOf('day');
+      return [today, today];
     },
     closeCalendar(dates) {
-      if (dates.length !== 0) {
-        const dateRange = dates.map(date => DateTime.fromJSDate(date));
-        if (!this.sameDateRange(dateRange, this.dateRange)) {
-          this.dateRange = dateRange;
-          this.filter();
-        }
-      } else {
-        const today = DateTime.local().startOf('day');
-        const dateRange = [today, today];
-        if (!this.sameDateRange(dateRange, this.dateRange)) {
-          this.dateRange = dateRange;
-          this.dateRangeString = this.dateRangeToString(dateRange);
-          this.filter();
-        }
+      const dateRange = dates.length !== 0
+        ? dates.map(date => DateTime.fromJSDate(date))
+        : this.todayToToday();
+      if (dateRange[0].valueOf() !== this.dateRange[0].valueOf() ||
+        dateRange[1].valueOf() !== this.dateRange[1].valueOf()) {
+        this.dateRange = dateRange;
+        this.filter();
       }
+      // If the date range is cleared, this.dateRangeString will be empty, and
+      // we will need to reset it (regardless of whether this.dateRange
+      // changed).
+      if (dates.length === 0)
+        this.dateRangeString = this.dateRangeToString(dateRange);
     }
   }
 };

diff --git a/test/components/audit/filters.spec.js b/test/components/audit/filters.spec.js
@@ -134,15 +134,38 @@ describe('AuditFilters', () => {
       defaultZoneName: 'utc',
       now: '1970-01-01T12:00:00Z'
     });
+    let called = false;
     return mockHttp()
       .mount(AuditList)
       .respondWithData(() => testData.extendedAudits.sorted())
       .complete()
+      // Select the same date range.
       .request(component => {
         const date = DateTime.fromISO('1970-01-01').toJSDate();
         component.first(AuditFilters).vm.closeCalendar([date, date]);
       })
       .respondWithData([/* no responses */])
+      .complete()
+      // Clear the date range (defaulting to the same date range).
+      .request(component => {
+        const auditFilters = component.first(AuditFilters);
+        const { dateRangeToString } = auditFilters.vm;
+        auditFilters.setMethods({
+          dateRangeToString: (dateRange) => {
+            called = true;
+            return dateRangeToString(dateRange);
+          }
+        });
+        return auditFilters.vm.$nextTick().then(() => {
+          auditFilters.vm.closeCalendar([]);
+        });
+      })
+      .respondWithData([/* no responses */])
+      .then(() => {
+        // The date range has not changed, but the dateRangeString property
+        // still should have been reset.
+        called.should.be.true();
+      })
       .finally(restoreLuxon);
   });
 });