From 5013d50f7f75efcaba8c3847b46d337ada3bd249 Mon Sep 17 00:00:00 2001 From: henry-tp Date: Fri, 12 Jun 2026 13:30:45 -0700 Subject: [PATCH 1/4] WEB-4578 bump viz --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index c57af70..247a62a 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "@babel/preset-env": "7.25.4", "@godaddy/terminus": "4.12.1", "@tidepool/data-tools": "2.5.0", - "@tidepool/viz": "1.53.0-rc.1", + "@tidepool/viz": "1.56.0", "axios": "1.8.2", "babel-core": "7.0.0-bridge.0", "blob-stream": "0.1.3", diff --git a/yarn.lock b/yarn.lock index 2c10065..3f4af43 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2559,7 +2559,7 @@ __metadata: "@babel/preset-env": 7.25.4 "@godaddy/terminus": 4.12.1 "@tidepool/data-tools": 2.5.0 - "@tidepool/viz": 1.53.0-rc.1 + "@tidepool/viz": 1.56.0 axios: 1.8.2 babel-core: 7.0.0-bridge.0 blob-stream: 0.1.3 @@ -2587,9 +2587,9 @@ __metadata: languageName: unknown linkType: soft -"@tidepool/viz@npm:1.53.0-rc.1": - version: 1.53.0-rc.1 - resolution: "@tidepool/viz@npm:1.53.0-rc.1" +"@tidepool/viz@npm:1.56.0": + version: 1.56.0 + resolution: "@tidepool/viz@npm:1.56.0" dependencies: bluebird: 3.7.2 bows: 1.7.2 @@ -2650,7 +2650,7 @@ __metadata: react-dom: 16.x react-redux: 8.x redux: 4.x - checksum: 50f376810df1125d16325b5861c4f4531f576613a4de3c8f27233eb1e42f3a637ae32f1e3df4c8b23ebcda5929b6f68c510e46b7c094590bfef4e50b3d835d4f + checksum: 8db633933cd824706147d7686779a81e56a3af2e4e0131521e91a2b0711b067cf96f336c8828744a957a11146e6cd8e0b2e07a668add4f4ec9deb815aa1e983a languageName: node linkType: hard From aefe70bc7d95a98d9f00bf4a86cc168010b7d38b Mon Sep 17 00:00:00 2001 From: henry-tp Date: Fri, 12 Jun 2026 13:44:53 -0700 Subject: [PATCH 2/4] WEB-4578 add query for devices + matchedDevices --- lib/report.mjs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/report.mjs b/lib/report.mjs index dfd29f9..bf1bd1a 100644 --- a/lib/report.mjs +++ b/lib/report.mjs @@ -292,7 +292,7 @@ class Report { stats: this.getStatsByChartType('basics', data), excludeDaysWithoutBolus: false, bgPrefs: this.getBGPrefs(), - metaData: 'latestPumpUpload, bgSources', + metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', timePrefs: this.getTimePrefs(), excludedDevices: [], }, @@ -305,7 +305,7 @@ class Report { }, bgSource: 'smbg', bgPrefs: this.getBGPrefs(), - metaData: 'latestPumpUpload, bgSources', + metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', timePrefs: this.getTimePrefs(), excludedDevices: [], }, @@ -325,7 +325,7 @@ class Report { }, bgSource: bgSource || 'cbg', bgPrefs: this.getBGPrefs(), - metaData: 'latestPumpUpload, bgSources', + metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', timePrefs: this.getTimePrefs(), excludedDevices: [], }, @@ -338,7 +338,7 @@ class Report { smbg: {}, }, bgPrefs: this.getBGPrefs(), - metaData: 'latestPumpUpload, bgSources', + metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', timePrefs: this.getTimePrefs(), excludedDevices: [], }, @@ -351,13 +351,13 @@ class Report { cbg: {}, }, bgPrefs: this.getBGPrefs(), - metaData: 'latestPumpUpload, bgSources', + metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', timePrefs: this.getTimePrefs(), excludedDevices: [], }, settings: { bgPrefs: this.getBGPrefs(), - metaData: 'latestPumpUpload, bgSources', + metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', timePrefs: this.getTimePrefs(), excludedDevices: [], }, From 749844b81aec1c68f8dc12ba7baa21fdc99ffeec Mon Sep 17 00:00:00 2001 From: henry-tp Date: Sat, 13 Jun 2026 15:39:56 -0700 Subject: [PATCH 3/4] WEB-4578 fix tests --- test/report.test.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/report.test.js b/test/report.test.js index 85c03c9..6ac5a08 100644 --- a/test/report.test.js +++ b/test/report.test.js @@ -109,7 +109,7 @@ describe('report', () => { settings: { excludedDevices: [], bgPrefs: expectedMmoLPref, - metaData: 'latestPumpUpload, bgSources', + metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', timePrefs: expectedTZPrefs, }, }); @@ -135,7 +135,7 @@ describe('report', () => { bgSource: 'cbg', endpoints: [], excludeDaysWithoutBolus: false, - metaData: 'latestPumpUpload, bgSources', + metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', stats: [ 'timeInRange', 'averageGlucose', @@ -172,7 +172,7 @@ describe('report', () => { bgPrefs: expectedMmoLPref, bgSource: 'cbg', endpoints: [], - metaData: 'latestPumpUpload, bgSources', + metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', stats: [ 'timeInRange', 'averageGlucose', @@ -215,7 +215,7 @@ describe('report', () => { bgPrefs: expectedMgdLPref, bgSource: 'smbg', endpoints: [], - metaData: 'latestPumpUpload, bgSources', + metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', stats: [ 'averageGlucose', 'bgExtents', @@ -250,7 +250,7 @@ describe('report', () => { bgPrefs: expectedMgdLPref, bgSource: 'cbg', endpoints: [], - metaData: 'latestPumpUpload, bgSources', + metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', stats: [ 'averageGlucose', 'bgExtents', @@ -286,7 +286,7 @@ describe('report', () => { bgPrefs: expectedMgdLPref, bgSource: 'smbg', endpoints: [], - metaData: 'latestPumpUpload, bgSources', + metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', stats: [ 'readingsInRange', 'averageGlucose', From e06082b9f16e9b5a29460d0c31a2d60a75c0aa08 Mon Sep 17 00:00:00 2001 From: henry-tp Date: Mon, 15 Jun 2026 12:36:28 -0700 Subject: [PATCH 4/4] WEB-4578 do not pass excludedDevices --- lib/report.mjs | 6 ------ test/report.test.js | 11 +++++------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/lib/report.mjs b/lib/report.mjs index bf1bd1a..8872e6b 100644 --- a/lib/report.mjs +++ b/lib/report.mjs @@ -294,7 +294,6 @@ class Report { bgPrefs: this.getBGPrefs(), metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', timePrefs: this.getTimePrefs(), - excludedDevices: [], }, bgLog: { endpoints: [], @@ -307,7 +306,6 @@ class Report { bgPrefs: this.getBGPrefs(), metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', timePrefs: this.getTimePrefs(), - excludedDevices: [], }, daily: { endpoints: [], @@ -327,7 +325,6 @@ class Report { bgPrefs: this.getBGPrefs(), metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', timePrefs: this.getTimePrefs(), - excludedDevices: [], }, agpBGM: { endpoints: [], @@ -340,7 +337,6 @@ class Report { bgPrefs: this.getBGPrefs(), metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', timePrefs: this.getTimePrefs(), - excludedDevices: [], }, agpCGM: { endpoints: [], @@ -353,13 +349,11 @@ class Report { bgPrefs: this.getBGPrefs(), metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', timePrefs: this.getTimePrefs(), - excludedDevices: [], }, settings: { bgPrefs: this.getBGPrefs(), metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', timePrefs: this.getTimePrefs(), - excludedDevices: [], }, }; if (this.#reports.includes(this.#reportTypes.all)) { diff --git a/test/report.test.js b/test/report.test.js index 6ac5a08..0aa28cb 100644 --- a/test/report.test.js +++ b/test/report.test.js @@ -107,7 +107,6 @@ describe('report', () => { expect(settingReport.buildReportQueries({ data })).toEqual({ settings: { - excludedDevices: [], bgPrefs: expectedMmoLPref, metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', timePrefs: expectedTZPrefs, @@ -130,7 +129,7 @@ describe('report', () => { expect(basicsReport.buildReportQueries(cbgNonAutoNonOverride)).toEqual({ basics: { aggregationsByDate: 'basals, boluses, fingersticks, siteChanges', - excludedDevices: [], + bgPrefs: expectedMgdLPref, bgSource: 'cbg', endpoints: [], @@ -168,7 +167,7 @@ describe('report', () => { expect(dailyReport.buildReportQueries(cbgNonAutoNonOverride)).toEqual({ daily: { aggregationsByDate: 'dataByDate, statsByDate', - excludedDevices: [], + bgPrefs: expectedMmoLPref, bgSource: 'cbg', endpoints: [], @@ -211,7 +210,7 @@ describe('report', () => { expect(agpBGMReport.buildReportQueries(cbgNonAutoNonOverride)).toEqual({ agpBGM: { aggregationsByDate: 'dataByDate, statsByDate', - excludedDevices: [], + bgPrefs: expectedMgdLPref, bgSource: 'smbg', endpoints: [], @@ -246,7 +245,7 @@ describe('report', () => { expect(agpCGMReport.buildReportQueries(cbgNonAutoNonOverride)).toEqual({ agpCGM: { aggregationsByDate: 'dataByDate, statsByDate', - excludedDevices: [], + bgPrefs: expectedMgdLPref, bgSource: 'cbg', endpoints: [], @@ -282,7 +281,7 @@ describe('report', () => { expect(bgLogReport.buildReportQueries(cbgNonAutoNonOverride)).toEqual({ bgLog: { aggregationsByDate: 'dataByDate', - excludedDevices: [], + bgPrefs: expectedMgdLPref, bgSource: 'smbg', endpoints: [],