diff --git a/lib/report.mjs b/lib/report.mjs index dfd29f9..8872e6b 100644 --- a/lib/report.mjs +++ b/lib/report.mjs @@ -292,9 +292,8 @@ class Report { stats: this.getStatsByChartType('basics', data), excludeDaysWithoutBolus: false, bgPrefs: this.getBGPrefs(), - metaData: 'latestPumpUpload, bgSources', + metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', timePrefs: this.getTimePrefs(), - excludedDevices: [], }, bgLog: { endpoints: [], @@ -305,9 +304,8 @@ class Report { }, bgSource: 'smbg', bgPrefs: this.getBGPrefs(), - metaData: 'latestPumpUpload, bgSources', + metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', timePrefs: this.getTimePrefs(), - excludedDevices: [], }, daily: { endpoints: [], @@ -325,9 +323,8 @@ class Report { }, bgSource: bgSource || 'cbg', bgPrefs: this.getBGPrefs(), - metaData: 'latestPumpUpload, bgSources', + metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', timePrefs: this.getTimePrefs(), - excludedDevices: [], }, agpBGM: { endpoints: [], @@ -338,9 +335,8 @@ class Report { smbg: {}, }, bgPrefs: this.getBGPrefs(), - metaData: 'latestPumpUpload, bgSources', + metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', timePrefs: this.getTimePrefs(), - excludedDevices: [], }, agpCGM: { endpoints: [], @@ -351,15 +347,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: [], }, }; if (this.#reports.includes(this.#reportTypes.all)) { 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/test/report.test.js b/test/report.test.js index 85c03c9..0aa28cb 100644 --- a/test/report.test.js +++ b/test/report.test.js @@ -107,9 +107,8 @@ describe('report', () => { expect(settingReport.buildReportQueries({ data })).toEqual({ settings: { - excludedDevices: [], bgPrefs: expectedMmoLPref, - metaData: 'latestPumpUpload, bgSources', + metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', timePrefs: expectedTZPrefs, }, }); @@ -130,12 +129,12 @@ describe('report', () => { expect(basicsReport.buildReportQueries(cbgNonAutoNonOverride)).toEqual({ basics: { aggregationsByDate: 'basals, boluses, fingersticks, siteChanges', - excludedDevices: [], + bgPrefs: expectedMgdLPref, bgSource: 'cbg', endpoints: [], excludeDaysWithoutBolus: false, - metaData: 'latestPumpUpload, bgSources', + metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', stats: [ 'timeInRange', 'averageGlucose', @@ -168,11 +167,11 @@ describe('report', () => { expect(dailyReport.buildReportQueries(cbgNonAutoNonOverride)).toEqual({ daily: { aggregationsByDate: 'dataByDate, statsByDate', - excludedDevices: [], + bgPrefs: expectedMmoLPref, bgSource: 'cbg', endpoints: [], - metaData: 'latestPumpUpload, bgSources', + metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', stats: [ 'timeInRange', 'averageGlucose', @@ -211,11 +210,11 @@ describe('report', () => { expect(agpBGMReport.buildReportQueries(cbgNonAutoNonOverride)).toEqual({ agpBGM: { aggregationsByDate: 'dataByDate, statsByDate', - excludedDevices: [], + bgPrefs: expectedMgdLPref, bgSource: 'smbg', endpoints: [], - metaData: 'latestPumpUpload, bgSources', + metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', stats: [ 'averageGlucose', 'bgExtents', @@ -246,11 +245,11 @@ describe('report', () => { expect(agpCGMReport.buildReportQueries(cbgNonAutoNonOverride)).toEqual({ agpCGM: { aggregationsByDate: 'dataByDate, statsByDate', - excludedDevices: [], + bgPrefs: expectedMgdLPref, bgSource: 'cbg', endpoints: [], - metaData: 'latestPumpUpload, bgSources', + metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', stats: [ 'averageGlucose', 'bgExtents', @@ -282,11 +281,11 @@ describe('report', () => { expect(bgLogReport.buildReportQueries(cbgNonAutoNonOverride)).toEqual({ bgLog: { aggregationsByDate: 'dataByDate', - excludedDevices: [], + bgPrefs: expectedMgdLPref, bgSource: 'smbg', endpoints: [], - metaData: 'latestPumpUpload, bgSources', + metaData: 'latestPumpUpload, bgSources, devices, matchedDevices', stats: [ 'readingsInRange', 'averageGlucose', 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