From 91ea131bb741be63186609badeb69c15fa9eaf14 Mon Sep 17 00:00:00 2001 From: clintonium-119 Date: Mon, 22 Jul 2024 13:26:38 -0400 Subject: [PATCH 01/11] Bump viz and platform-client --- package.json | 4 ++-- yarn.lock | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index f2cf3280c3..5bd0023798 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.40.0-web-2994-web-2993-last-reviewed.2", + "@tidepool/viz": "1.41.0-rc.1", "async": "2.6.4", "autoprefixer": "10.4.16", "babel-core": "7.0.0-bridge.0", @@ -185,7 +185,7 @@ "terser-webpack-plugin": "5.3.9", "theme-ui": "0.16.1", "tideline": "1.28.1", - "tidepool-platform-client": "0.59.0-web-2994-web-2993-last-reviewed.2", + "tidepool-platform-client": "0.59.0-rc.1", "tidepool-standard-action": "0.1.1", "ua-parser-js": "1.0.36", "url-loader": "4.1.1", diff --git a/yarn.lock b/yarn.lock index 01e527a81d..c124d4222d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5268,9 +5268,9 @@ __metadata: languageName: node linkType: hard -"@tidepool/viz@npm:1.40.0-web-2994-web-2993-last-reviewed.2": - version: 1.40.0-web-2994-web-2993-last-reviewed.2 - resolution: "@tidepool/viz@npm:1.40.0-web-2994-web-2993-last-reviewed.2" +"@tidepool/viz@npm:1.41.0-rc.1": + version: 1.41.0-rc.1 + resolution: "@tidepool/viz@npm:1.41.0-rc.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: ce581bb918ad82c4f630c4989962874441e59b6827460b5da737cb6268bda2c45303c4113788e98282cb8e45642bea30560e7145f0f946a499a0adddf034a8c3 + checksum: 9fa0482dc33e5a6ee28067b0197d7371c5f165693ac10d8e2637f7536e14cbf2db2452d4f536b5075a163bd9f7fc8addcc6dce2a037f2c6a1e27aebf17726623 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.40.0-web-2994-web-2993-last-reviewed.2 + "@tidepool/viz": 1.41.0-rc.1 async: 2.6.4 autoprefixer: 10.4.16 babel-core: 7.0.0-bridge.0 @@ -7553,7 +7553,7 @@ __metadata: terser-webpack-plugin: 5.3.9 theme-ui: 0.16.1 tideline: 1.28.1 - tidepool-platform-client: 0.59.0-web-2994-web-2993-last-reviewed.2 + tidepool-platform-client: 0.59.0-rc.1 tidepool-standard-action: 0.1.1 ua-parser-js: 1.0.36 url-loader: 4.1.1 @@ -23018,15 +23018,15 @@ __metadata: languageName: node linkType: hard -"tidepool-platform-client@npm:0.59.0-web-2994-web-2993-last-reviewed.2": - version: 0.59.0-web-2994-web-2993-last-reviewed.2 - resolution: "tidepool-platform-client@npm:0.59.0-web-2994-web-2993-last-reviewed.2" +"tidepool-platform-client@npm:0.59.0-rc.1": + version: 0.59.0-rc.1 + resolution: "tidepool-platform-client@npm:0.59.0-rc.1" dependencies: async: 0.9.0 lodash: 4.17.21 superagent: 5.2.2 uuid: 3.1.0 - checksum: 966e2f0692cec8ddf6f714b718c175b742f322e2a4e406f3a946c2a6e866136e4437d1f42bcc58c9f34118fed07c9e6bf72e219d5d48aa143739355b04c90cdf + checksum: d503e8e819055a5b42f2c8a6477812f8afeb9b904b0b6814c0d86520a50e0b5d030f06a7968c03e75356139fe630c45dc7878f19e12360f3d3520d68ccc6adda languageName: node linkType: hard From f5ec780e182e30badbd962df849253c787f19872 Mon Sep 17 00:00:00 2001 From: clintonium-119 Date: Mon, 22 Jul 2024 13:27:02 -0400 Subject: [PATCH 02/11] v1.80.0-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5bd0023798..fea8c42b86 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "node": "20.8.0" }, "packageManager": "yarn@3.6.4", - "version": "1.80.0-web-2994-web-2993-last-reviewed.1", + "version": "1.80.0-rc.1", "private": true, "scripts": { "test": "TZ=UTC NODE_ENV=test NODE_OPTIONS='--max-old-space-size=4096' yarn karma start", From 018a1bb01c7d3b0d4cf5b557eea7aafc1b59d242 Mon Sep 17 00:00:00 2001 From: Chris McGee Date: Tue, 23 Jul 2024 00:54:07 -0400 Subject: [PATCH 03/11] [WEB-3038] move profile redirect into useEffect to avoid render loop --- app/pages/uploadredirect/uploadredirect.js | 37 +++++++++++++--------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/app/pages/uploadredirect/uploadredirect.js b/app/pages/uploadredirect/uploadredirect.js index 9ba6c17bf2..811f3b6edb 100644 --- a/app/pages/uploadredirect/uploadredirect.js +++ b/app/pages/uploadredirect/uploadredirect.js @@ -1,4 +1,4 @@ -import React from 'react'; +import React, { useEffect } from 'react'; import { withTranslation, Trans } from 'react-i18next'; import { Flex, Box, Text } from 'theme-ui'; import customProtocolCheck from 'custom-protocol-check'; @@ -28,6 +28,7 @@ const UploadRedirect = (props) => { const fromProfile = props.location.state?.referrer === 'profile'; const linkUrl = `tidepooluploader://localhost/keycloak-redirect${props.location.hash}`; const ua = new UAParser().getResult(); + const shouldRedirectToLogin = !props.location.hash && !fromProfile; let openText = 'Open Tidepool Uploader'; switch (ua.browser.name) { case 'Firefox': @@ -38,27 +39,33 @@ const UploadRedirect = (props) => { break; case 'Safari': openText = 'Allow' + break; default: break; } - if (!props.location.hash && !fromProfile) { + useEffect(() => { + if (!userHasFullName && !shouldRedirectToLogin) { + if (isClinicianAccount && !userHasClinicProfile) { + dispatch( + push({ + pathname: '/clinic-details/profile', + state: { referrer: 'upload-launch' }, + }) + ); + } else { + dispatch( + push({ pathname: '/profile', state: { referrer: 'upload-launch' } }) + ); + } + } + }, [dispatch, isClinicianAccount, userHasClinicProfile, userHasFullName, shouldRedirectToLogin]); + + if (shouldRedirectToLogin) { return ; } - if (!userHasFullName) { - if (isClinicianAccount && !userHasClinicProfile) { - dispatch( - push({ - pathname: '/clinic-details/profile', - state: { referrer: 'upload-launch' }, - }) - ); - } else { - dispatch( - push({ pathname: '/profile', state: { referrer: 'upload-launch' } }) - ); - } + if(!userHasFullName) { return null; } From 91a7080e64afb57073c75879228ce928a7cf2a79 Mon Sep 17 00:00:00 2001 From: Chris McGee Date: Tue, 23 Jul 2024 00:57:59 -0400 Subject: [PATCH 04/11] v1.80.0-web-3083-redirect-loop.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f2cf3280c3..032298e12d 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "node": "20.8.0" }, "packageManager": "yarn@3.6.4", - "version": "1.80.0-web-2994-web-2993-last-reviewed.1", + "version": "1.80.0-web-3083-redirect-loop.1", "private": true, "scripts": { "test": "TZ=UTC NODE_ENV=test NODE_OPTIONS='--max-old-space-size=4096' yarn karma start", From a479bf0a24c32cc461031b3d2919d78ecaa770d3 Mon Sep 17 00:00:00 2001 From: Chris McGee Date: Tue, 23 Jul 2024 00:59:50 -0400 Subject: [PATCH 05/11] v1.80.0-web-3038-redirect-loop.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 032298e12d..d8a2d516a9 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "node": "20.8.0" }, "packageManager": "yarn@3.6.4", - "version": "1.80.0-web-3083-redirect-loop.1", + "version": "1.80.0-web-3038-redirect-loop.1", "private": true, "scripts": { "test": "TZ=UTC NODE_ENV=test NODE_OPTIONS='--max-old-space-size=4096' yarn karma start", From d64a764cecbef179cd5e732e6ce9c31a6b3d0169 Mon Sep 17 00:00:00 2001 From: Chris McGee Date: Tue, 23 Jul 2024 11:38:41 -0400 Subject: [PATCH 06/11] v1.80.0-rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 39d67c652f..0e4ab06487 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "node": "20.8.0" }, "packageManager": "yarn@3.6.4", - "version": "1.80.0-web-3038-redirect-loop.1", + "version": "1.80.0-rc.2", "private": true, "scripts": { "test": "TZ=UTC NODE_ENV=test NODE_OPTIONS='--max-old-space-size=4096' yarn karma start", From efe32e0727168a5100f4ad167aae46c63fd9574f Mon Sep 17 00:00:00 2001 From: clintonium-119 Date: Mon, 29 Jul 2024 11:07:11 -0400 Subject: [PATCH 07/11] Limit patient tags column width on pop health --- app/pages/clinicworkspace/ClinicPatients.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/pages/clinicworkspace/ClinicPatients.js b/app/pages/clinicworkspace/ClinicPatients.js index 3e2186645e..1bf0f62be4 100644 --- a/app/pages/clinicworkspace/ClinicPatients.js +++ b/app/pages/clinicworkspace/ClinicPatients.js @@ -289,7 +289,8 @@ const PatientTags = ({ return !!filteredPatientTags.length ? ( Date: Mon, 29 Jul 2024 11:07:28 -0400 Subject: [PATCH 08/11] v1.80.0-rc.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0e4ab06487..9b9699f07a 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "node": "20.8.0" }, "packageManager": "yarn@3.6.4", - "version": "1.80.0-rc.2", + "version": "1.80.0-rc.3", "private": true, "scripts": { "test": "TZ=UTC NODE_ENV=test NODE_OPTIONS='--max-old-space-size=4096' yarn karma start", From f12d1db7c269ea6fbe92f88ef0db7a3eac8794c1 Mon Sep 17 00:00:00 2001 From: clintonium-119 Date: Mon, 29 Jul 2024 13:34:02 -0400 Subject: [PATCH 09/11] v1.80.0-rc.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9b9699f07a..4083e3f0a3 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "node": "20.8.0" }, "packageManager": "yarn@3.6.4", - "version": "1.80.0-rc.3", + "version": "1.80.0-rc.4", "private": true, "scripts": { "test": "TZ=UTC NODE_ENV=test NODE_OPTIONS='--max-old-space-size=4096' yarn karma start", From f3374c050fa79e5a76130d75c4cde591393dd368 Mon Sep 17 00:00:00 2001 From: Clint Beacock Date: Mon, 29 Jul 2024 21:32:45 -0400 Subject: [PATCH 10/11] [RELEASE-1] Bump viz and platform-client --- package.json | 4 ++-- yarn.lock | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 4083e3f0a3..8ff9d5973c 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-rc.1", + "@tidepool/viz": "1.41.0", "async": "2.6.4", "autoprefixer": "10.4.16", "babel-core": "7.0.0-bridge.0", @@ -185,7 +185,7 @@ "terser-webpack-plugin": "5.3.9", "theme-ui": "0.16.1", "tideline": "1.28.1", - "tidepool-platform-client": "0.59.0-rc.1", + "tidepool-platform-client": "0.59.0", "tidepool-standard-action": "0.1.1", "ua-parser-js": "1.0.36", "url-loader": "4.1.1", diff --git a/yarn.lock b/yarn.lock index c124d4222d..cea36ba433 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5268,9 +5268,9 @@ __metadata: languageName: node linkType: hard -"@tidepool/viz@npm:1.41.0-rc.1": - version: 1.41.0-rc.1 - resolution: "@tidepool/viz@npm:1.41.0-rc.1" +"@tidepool/viz@npm:1.41.0": + version: 1.41.0 + resolution: "@tidepool/viz@npm:1.41.0" 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: 9fa0482dc33e5a6ee28067b0197d7371c5f165693ac10d8e2637f7536e14cbf2db2452d4f536b5075a163bd9f7fc8addcc6dce2a037f2c6a1e27aebf17726623 + checksum: 0941b1ad9a835a68b4183e2ab7bf82fa6337dcaab33acbfe2b95a4f428d4671d36248603c292f7c17428ce4a52fd333ef6dee76b08b82e1cfe733791e07af72d 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-rc.1 + "@tidepool/viz": 1.41.0 async: 2.6.4 autoprefixer: 10.4.16 babel-core: 7.0.0-bridge.0 @@ -7553,7 +7553,7 @@ __metadata: terser-webpack-plugin: 5.3.9 theme-ui: 0.16.1 tideline: 1.28.1 - tidepool-platform-client: 0.59.0-rc.1 + tidepool-platform-client: 0.59.0 tidepool-standard-action: 0.1.1 ua-parser-js: 1.0.36 url-loader: 4.1.1 @@ -23018,15 +23018,15 @@ __metadata: languageName: node linkType: hard -"tidepool-platform-client@npm:0.59.0-rc.1": - version: 0.59.0-rc.1 - resolution: "tidepool-platform-client@npm:0.59.0-rc.1" +"tidepool-platform-client@npm:0.59.0": + version: 0.59.0 + resolution: "tidepool-platform-client@npm:0.59.0" dependencies: async: 0.9.0 lodash: 4.17.21 superagent: 5.2.2 uuid: 3.1.0 - checksum: d503e8e819055a5b42f2c8a6477812f8afeb9b904b0b6814c0d86520a50e0b5d030f06a7968c03e75356139fe630c45dc7878f19e12360f3d3520d68ccc6adda + checksum: 9ea493f5e7f02657561bac509eee863869176744462ff478ab88df219031bf5847c70bd5773ec68502f4a3bf0f00c5053797f6a73849c598dd9f31dad0825fcd languageName: node linkType: hard From d4b46ee891dcaa9fb7a08fd7ad773b3760dcaa07 Mon Sep 17 00:00:00 2001 From: Clint Beacock Date: Mon, 29 Jul 2024 21:34:22 -0400 Subject: [PATCH 11/11] [RELEASE-1] v1.80.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8ff9d5973c..c5742ea232 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "node": "20.8.0" }, "packageManager": "yarn@3.6.4", - "version": "1.80.0-rc.4", + "version": "1.80.0", "private": true, "scripts": { "test": "TZ=UTC NODE_ENV=test NODE_OPTIONS='--max-old-space-size=4096' yarn karma start",