From 1a0f0ede4980b148d81e61ef56185833728d61bc Mon Sep 17 00:00:00 2001 From: clintonium-119 Date: Wed, 26 Jun 2024 11:43:22 -0400 Subject: [PATCH 01/10] Change raw data export filename to match expected name in viz storybook import --- app/redux/reducers/data.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/redux/reducers/data.js b/app/redux/reducers/data.js index c4c1c2a258..91616088cb 100644 --- a/app/redux/reducers/data.js +++ b/app/redux/reducers/data.js @@ -62,7 +62,7 @@ const data = (state = initialState.data, action) => { if (destination !== 'redux') { if (destination === 'window') window.patientData = result; - if (destination === 'download') console.save(result, 'patientData.json'); + if (destination === 'download') console.save(result, result?.query?.raw ? 'rawData.json' : 'patientData.json'); return state; } From c9607d311e9a7b904ce15a596e5588e97a2b8031 Mon Sep 17 00:00:00 2001 From: clintonium-119 Date: Tue, 9 Jul 2024 22:34:36 -0400 Subject: [PATCH 02/10] make sure we always fetch and store the latest pump settings --- app/redux/actions/async.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/redux/actions/async.js b/app/redux/actions/async.js index 937e888979..7732723036 100644 --- a/app/redux/actions/async.js +++ b/app/redux/actions/async.js @@ -1042,6 +1042,7 @@ export function fetchPatientData(api, options, id) { }); let latestUpload; + let latestPumpSettings; return (dispatch, getState) => { // If we have a valid cache of the data in our redux store, return without dispatching the fetch @@ -1120,7 +1121,7 @@ export function fetchPatientData(api, options, id) { // We want to make sure the latest upload, which may be beyond the data range we'll be // fetching, is stored so we can include it with the fetched results latestUpload = _.find(latestDatums, { type: 'upload' }); - const latestPumpSettings = _.find(latestDatums, { type: 'pumpSettings' }); + latestPumpSettings = _.find(latestDatums, { type: 'pumpSettings' }); const latestPumpSettingsUploadId = _.get(latestPumpSettings || {}, 'uploadId'); const latestPumpSettingsUpload = _.find(latestDatums, { type: 'upload', uploadId: latestPumpSettingsUploadId }); @@ -1206,11 +1207,14 @@ export function fetchPatientData(api, options, id) { ...resultsVal.teamNotes, ]; - // If the latest upload is later than the latest diabetes datum, it would have been + // If the latest upload or pumpSettings is later than the latest diabetes datum, it would have been // outside of the fetched data range, and needs to be added. if (latestUpload && !_.find(combinedData, { id: latestUpload.id })) { combinedData.push(latestUpload); } + if (latestPumpSettings && !_.find(combinedData, { id: latestPumpSettings.id })) { + combinedData.push(latestPumpSettings); + } handleFetchSuccess(combinedData, id, options); } From 315a253a3ff502f926c58035557e2bd740e5a758 Mon Sep 17 00:00:00 2001 From: clintonium-119 Date: Wed, 17 Jul 2024 09:38:25 -0400 Subject: [PATCH 03/10] Fetch dosing decision data --- app/core/constants.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/core/constants.js b/app/core/constants.js index d3fee5f971..d437047e5b 100644 --- a/app/core/constants.js +++ b/app/core/constants.js @@ -71,6 +71,7 @@ export const ALL_FETCHED_DATA_TYPES = [ ...DIABETES_DATA_TYPES, 'cgmSettings', 'deviceEvent', + 'dosingDecision', 'insulin', 'physicalActivity', 'pumpSettings', From 6cae5f4dbded2d287f91457cb7fe4ad6548cb05a Mon Sep 17 00:00:00 2001 From: clintonium-119 Date: Fri, 26 Jul 2024 12:20:37 -0400 Subject: [PATCH 04/10] Pass bgPrefs to override tooltip --- app/components/chart/daily.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/components/chart/daily.js b/app/components/chart/daily.js index 847c955b17..d4a1218057 100644 --- a/app/components/chart/daily.js +++ b/app/components/chart/daily.js @@ -396,6 +396,7 @@ class Daily extends Component { }} side={this.state.hoveredPumpSettingsOverride.side} override={this.state.hoveredPumpSettingsOverride.data} + bgPrefs={bgPrefs} timePrefs={timePrefs} />} From d692e4899c80142e24c6c7c8dc07dc9515b65ee6 Mon Sep 17 00:00:00 2001 From: clintonium-119 Date: Mon, 29 Jul 2024 15:03:55 -0400 Subject: [PATCH 05/10] Fix broken tests --- test/unit/app/core/constants.test.js | 1 + 1 file changed, 1 insertion(+) diff --git a/test/unit/app/core/constants.test.js b/test/unit/app/core/constants.test.js index 4a3c588544..3dfc627efe 100644 --- a/test/unit/app/core/constants.test.js +++ b/test/unit/app/core/constants.test.js @@ -130,6 +130,7 @@ describe('constants', function() { 'food', 'cgmSettings', 'deviceEvent', + 'dosingDecision', 'insulin', 'physicalActivity', 'pumpSettings', From cf741add136f92525e00c3cce4cd17211ca7c392 Mon Sep 17 00:00:00 2001 From: clintonium-119 Date: Tue, 30 Jul 2024 21:56:51 -0400 Subject: [PATCH 06/10] Bump viz and tideline --- package.json | 4 ++-- yarn.lock | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index c5742ea232..e8149830bb 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "@storybook/react": "7.5.0", "@storybook/react-webpack5": "7.5.0", "@testing-library/react-hooks": "8.0.1", - "@tidepool/viz": "1.41.0", + "@tidepool/viz": "1.42.0-web-3005-web-3306-web-3007-web-3008-loop-stats.1", "async": "2.6.4", "autoprefixer": "10.4.16", "babel-core": "7.0.0-bridge.0", @@ -184,7 +184,7 @@ "terser": "5.22.0", "terser-webpack-plugin": "5.3.9", "theme-ui": "0.16.1", - "tideline": "1.28.1", + "tideline": "1.30.0-web-3005-web-3306-web-3007-web-3008-loop-stats.1", "tidepool-platform-client": "0.59.0", "tidepool-standard-action": "0.1.1", "ua-parser-js": "1.0.36", diff --git a/yarn.lock b/yarn.lock index cea36ba433..6f629dd2fc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5268,9 +5268,9 @@ __metadata: languageName: node linkType: hard -"@tidepool/viz@npm:1.41.0": - version: 1.41.0 - resolution: "@tidepool/viz@npm:1.41.0" +"@tidepool/viz@npm:1.42.0-web-3005-web-3306-web-3007-web-3008-loop-stats.1": + version: 1.42.0-web-3005-web-3306-web-3007-web-3008-loop-stats.1 + resolution: "@tidepool/viz@npm:1.42.0-web-3005-web-3306-web-3007-web-3008-loop-stats.1" dependencies: bluebird: 3.7.2 bows: 1.7.2 @@ -5330,7 +5330,7 @@ __metadata: react-dom: 16.x react-redux: 8.x redux: 4.x - checksum: 0941b1ad9a835a68b4183e2ab7bf82fa6337dcaab33acbfe2b95a4f428d4671d36248603c292f7c17428ce4a52fd333ef6dee76b08b82e1cfe733791e07af72d + checksum: 8744fcd2942cf011bee335de5c3afc6e1692e2220fda957ac643a9748cfd99f4d955a9812f92dd6c4ee88cf71ab9145da072b4df5f34d86607eaf4b34e214922 languageName: node linkType: hard @@ -7427,7 +7427,7 @@ __metadata: "@storybook/react": 7.5.0 "@storybook/react-webpack5": 7.5.0 "@testing-library/react-hooks": 8.0.1 - "@tidepool/viz": 1.41.0 + "@tidepool/viz": 1.42.0-web-3005-web-3306-web-3007-web-3008-loop-stats.1 async: 2.6.4 autoprefixer: 10.4.16 babel-core: 7.0.0-bridge.0 @@ -7552,7 +7552,7 @@ __metadata: terser: 5.22.0 terser-webpack-plugin: 5.3.9 theme-ui: 0.16.1 - tideline: 1.28.1 + tideline: 1.30.0-web-3005-web-3306-web-3007-web-3008-loop-stats.1 tidepool-platform-client: 0.59.0 tidepool-standard-action: 0.1.1 ua-parser-js: 1.0.36 @@ -22992,9 +22992,9 @@ __metadata: languageName: node linkType: hard -"tideline@npm:1.28.1": - version: 1.28.1 - resolution: "tideline@npm:1.28.1" +"tideline@npm:1.30.0-web-3005-web-3306-web-3007-web-3008-loop-stats.1": + version: 1.30.0-web-3005-web-3306-web-3007-web-3008-loop-stats.1 + resolution: "tideline@npm:1.30.0-web-3005-web-3306-web-3007-web-3008-loop-stats.1" dependencies: bows: 1.7.2 classnames: 2.3.2 @@ -23014,7 +23014,7 @@ __metadata: peerDependencies: babel-core: 6.x || 7.0.0-bridge.0 lodash: ^4.17.21 - checksum: e65581c9cdd8f067190339831700e9eb73834b20c54b8d70f621c13db3437b898af1508e8ba8e40e7bded27153d4065b3ea66c0337c7eec926e8fc9cc72eb789 + checksum: cc11a683c8b29931493de204aa151bfed638d2c485f278207caa7889528fc6a921d74515de255b3331162de8677f2861e7f86699e455d1f3ec8110476e982fec languageName: node linkType: hard From 2905b5cf0ba1e2e17d294764e37f066d6aee5688 Mon Sep 17 00:00:00 2001 From: clintonium-119 Date: Tue, 30 Jul 2024 21:57:08 -0400 Subject: [PATCH 07/10] v1.81.0-web-3005-web-3306-web-3007-web-3008-loop-stats.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e8149830bb..2fffeab4a9 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "node": "20.8.0" }, "packageManager": "yarn@3.6.4", - "version": "1.80.0", + "version": "1.81.0-web-3005-web-3306-web-3007-web-3008-loop-stats.1", "private": true, "scripts": { "test": "TZ=UTC NODE_ENV=test NODE_OPTIONS='--max-old-space-size=4096' yarn karma start", From 3fda6b598e2f61e0dbd76cc6d8c5c37224759e49 Mon Sep 17 00:00:00 2001 From: clintonium-119 Date: Tue, 30 Jul 2024 22:28:48 -0400 Subject: [PATCH 08/10] Fix for js error from passing missing manufacturer as empty object instead of undefined to viz --- app/pages/patientdata/patientdata.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/pages/patientdata/patientdata.js b/app/pages/patientdata/patientdata.js index f1c2ecb5e6..db0f6c26f4 100644 --- a/app/pages/patientdata/patientdata.js +++ b/app/pages/patientdata/patientdata.js @@ -832,7 +832,7 @@ export const PatientDataClass = createReactClass({ chartType, } = state; - const manufacturer = this.getMetaData('latestPumpUpload.manufacturer'); + const manufacturer = this.getMetaData('latestPumpUpload.manufacturer', ''); const bgSource = this.getMetaData('bgSources.current'); const endpoints = this.getCurrentData('endpoints'); const { averageDailyDose, ...statsData } = this.getCurrentData('stats'); From 159a4668c9b6d737ca7d97333ac3febf5e0b804d Mon Sep 17 00:00:00 2001 From: clintonium-119 Date: Tue, 30 Jul 2024 22:52:00 -0400 Subject: [PATCH 09/10] Fix issue where agp report gen fails if no images are generated due to data insufficiency --- app/pages/patientdata/patientdata.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/pages/patientdata/patientdata.js b/app/pages/patientdata/patientdata.js index db0f6c26f4..2f6e645fbc 100644 --- a/app/pages/patientdata/patientdata.js +++ b/app/pages/patientdata/patientdata.js @@ -955,6 +955,8 @@ export const PatientDataClass = createReactClass({ }, {}); props.generateAGPImagesSuccess(processedImages); + } else { + props.generateAGPImagesSuccess(results); } }, From 3b411b56b1ce2532afcf73e0ef43b6c67c9c70b8 Mon Sep 17 00:00:00 2001 From: clintonium-119 Date: Mon, 5 Aug 2024 09:54:58 -0400 Subject: [PATCH 10/10] Bump viz --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 2fffeab4a9..f875e1a45f 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "@storybook/react": "7.5.0", "@storybook/react-webpack5": "7.5.0", "@testing-library/react-hooks": "8.0.1", - "@tidepool/viz": "1.42.0-web-3005-web-3306-web-3007-web-3008-loop-stats.1", + "@tidepool/viz": "1.42.0-web-3005-web-3306-web-3007-web-3008-loop-stats.2", "async": "2.6.4", "autoprefixer": "10.4.16", "babel-core": "7.0.0-bridge.0", diff --git a/yarn.lock b/yarn.lock index 6f629dd2fc..55bec0c20c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5268,9 +5268,9 @@ __metadata: languageName: node linkType: hard -"@tidepool/viz@npm:1.42.0-web-3005-web-3306-web-3007-web-3008-loop-stats.1": - version: 1.42.0-web-3005-web-3306-web-3007-web-3008-loop-stats.1 - resolution: "@tidepool/viz@npm:1.42.0-web-3005-web-3306-web-3007-web-3008-loop-stats.1" +"@tidepool/viz@npm:1.42.0-web-3005-web-3306-web-3007-web-3008-loop-stats.2": + version: 1.42.0-web-3005-web-3306-web-3007-web-3008-loop-stats.2 + resolution: "@tidepool/viz@npm:1.42.0-web-3005-web-3306-web-3007-web-3008-loop-stats.2" dependencies: bluebird: 3.7.2 bows: 1.7.2 @@ -5330,7 +5330,7 @@ __metadata: react-dom: 16.x react-redux: 8.x redux: 4.x - checksum: 8744fcd2942cf011bee335de5c3afc6e1692e2220fda957ac643a9748cfd99f4d955a9812f92dd6c4ee88cf71ab9145da072b4df5f34d86607eaf4b34e214922 + checksum: d64737a66f6f59d7df463e34035e8b7584ec0d37c4a71ae1224598a072999ec13c5ef43699fa9e7b077e33b41783ffa398a71b7a68cd448cde188b7e4809e88a languageName: node linkType: hard @@ -7427,7 +7427,7 @@ __metadata: "@storybook/react": 7.5.0 "@storybook/react-webpack5": 7.5.0 "@testing-library/react-hooks": 8.0.1 - "@tidepool/viz": 1.42.0-web-3005-web-3306-web-3007-web-3008-loop-stats.1 + "@tidepool/viz": 1.42.0-web-3005-web-3306-web-3007-web-3008-loop-stats.2 async: 2.6.4 autoprefixer: 10.4.16 babel-core: 7.0.0-bridge.0