Skip to content

[WEB-4585, 4577, 4578] - Carb Modifications + Device Names + Deduplicate Healthkit #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
henry-tp wants to merge 4 commits into
base: master
Choose a base branch
from
+23 −30
Open

[WEB-4585, 4577, 4578] - Carb Modifications + Device Names + Deduplicate Healthkit #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5013d50
WEB-4578 bump viz
henry-tp Jun 12, 2026
aefe70b
WEB-4578 add query for devices + matchedDevices
henry-tp Jun 12, 2026
749844b
WEB-4578 fix tests
henry-tp Jun 13, 2026
e06082b
WEB-4578 do not pass excludedDevices
henry-tp Jun 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions lib/report.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,9 +292,8 @@ class Report {
stats: this.getStatsByChartType('basics', data),
excludeDaysWithoutBolus: false,
bgPrefs: this.getBGPrefs(),
metaData: 'latestPumpUpload, bgSources',

@henry-tp henry-tp Jun 13, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mirrors this change which was needed to get the correct device name:

https://github.com/tidepool-org/blip/pull/1851/changes#diff-db3e63408cd99b33752ad54ec85da7dfbc87f67c608673c6bcb42a653c65a1b2R896

metaData: 'latestPumpUpload, bgSources, devices, matchedDevices',
timePrefs: this.getTimePrefs(),
excludedDevices: [],

@henry-tp henry-tp Jun 15, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to allow Viz to run the code that detects and sets the excludedDevices by not forcing through this argument of [].

However, Viz will usually just use its fallback arg of []

},
bgLog: {
endpoints: [],
Expand All @@ -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: [],
Expand All @@ -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: [],
Expand All @@ -338,9 +335,8 @@ class Report {
smbg: {},
},
bgPrefs: this.getBGPrefs(),
metaData: 'latestPumpUpload, bgSources',
metaData: 'latestPumpUpload, bgSources, devices, matchedDevices',
timePrefs: this.getTimePrefs(),
excludedDevices: [],
},
agpCGM: {
endpoints: [],
Expand All @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
23 changes: 11 additions & 12 deletions test/report.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
});
Expand All @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -2650,7 +2650,7 @@ __metadata:
react-dom: 16.x
react-redux: 8.x
redux: 4.x
checksum: 50f376810df1125d16325b5861c4f4531f576613a4de3c8f27233eb1e42f3a637ae32f1e3df4c8b23ebcda5929b6f68c510e46b7c094590bfef4e50b3d835d4f
checksum: 8db633933cd824706147d7686779a81e56a3af2e4e0131521e91a2b0711b067cf96f336c8828744a957a11146e6cd8e0b2e07a668add4f4ec9deb815aa1e983a
languageName: node
linkType: hard

Expand Down
Loading