Mforns has submitted this change and it was merged. Change subject: Fix column filter to carry over any date filters ......................................................................
Fix column filter to carry over any date filters Bug: T112183 Change-Id: Ic1d6ab8db75704d52392617b5fe8701947e8317e --- M src/app/data-converters/timeseries-data.js M test/app/timeseries-data.js 2 files changed, 13 insertions(+), 2 deletions(-) Approvals: Mforns: Verified; Looks good to me, approved diff --git a/src/app/data-converters/timeseries-data.js b/src/app/data-converters/timeseries-data.js index 24b8a93..c6d9a6d 100644 --- a/src/app/data-converters/timeseries-data.js +++ b/src/app/data-converters/timeseries-data.js @@ -208,13 +208,15 @@ }); }); - return new TimeseriesData( + var ret = new TimeseriesData( result.header, result.rowsByDate, result.colorLabels, result.patternLabels, this.duplicateDates + ); + return ret.filter(self.fromDate, self.toDate); }; /** diff --git a/test/app/timeseries-data.js b/test/app/timeseries-data.js index cc5f210..974a4fd 100644 --- a/test/app/timeseries-data.js +++ b/test/app/timeseries-data.js @@ -214,9 +214,18 @@ '2015-04-02': [[11, 16]], '2015-04-03': [[19, 24]], '2015-04-04': [[27, 32]] - }); + }); expect(filteredTs.colorLabels).toEqual(['success-rate', 'failure-rate']); expect(filteredTs.patternLabels).toEqual(['VE', 'WT']); }); + + it('should preserve date filters when filtering by column', function () { + var original = new TimeseriesData(), + filterDates = original.filter(1400000000000, 1400000000001), + filteredColumns = filterDates.pickColumns([], []); + + expect(filteredColumns.fromDate).toEqual(1400000000000); + expect(filteredColumns.toDate).toEqual(1400000000001); + }); }); }); -- To view, visit https://gerrit.wikimedia.org/r/237703 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic1d6ab8db75704d52392617b5fe8701947e8317e Gerrit-PatchSet: 1 Gerrit-Project: analytics/dashiki Gerrit-Branch: master Gerrit-Owner: Milimetric <dandree...@wikimedia.org> Gerrit-Reviewer: Mforns <mfo...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits