Merge pull request #1406 from tidepool-org/release-1.80.0

Release 1.80.0 to develop
tidepool-org · Jul 30, 2024 · 81b1f4d · 81b1f4d
2 parents eeddb88 + d4b46ee
commit 81b1f4d
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 29 deletions.
diff --git a/app/pages/clinicworkspace/ClinicPatients.js b/app/pages/clinicworkspace/ClinicPatients.js
@@ -289,7 +289,8 @@ const PatientTags = ({
 
   return !!filteredPatientTags.length ? (
     <TagList
-      maxCharactersVisible={16}
+      maxTagsVisible={4}
+      maxCharactersVisible={12}
       popupId={`tags-overflow-${patient?.id}`}
       onClickEdit={handleEditPatient}
       tagProps={{ variant: 'compact' }}

diff --git 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 <Redirect to="/login" />;
   }
 
-  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;
   }
 

diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
     "node": "20.8.0"
   },
   "packageManager": "[email protected]",
-  "version": "1.80.0-web-2994-web-2993-last-reviewed.1",
+  "version": "1.80.0",
   "private": true,
   "scripts": {
     "test": "TZ=UTC NODE_ENV=test NODE_OPTIONS='--max-old-space-size=4096' yarn karma start",
@@ -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",
     "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",
     "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
@@ -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":
+  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: ce581bb918ad82c4f630c4989962874441e59b6827460b5da737cb6268bda2c45303c4113788e98282cb8e45642bea30560e7145f0f946a499a0adddf034a8c3
+  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.40.0-web-2994-web-2993-last-reviewed.2
+    "@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-web-2994-web-2993-last-reviewed.2
+    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-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":
+  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: 966e2f0692cec8ddf6f714b718c175b742f322e2a4e406f3a946c2a6e866136e4437d1f42bcc58c9f34118fed07c9e6bf72e219d5d48aa143739355b04c90cdf
+  checksum: 9ea493f5e7f02657561bac509eee863869176744462ff478ab88df219031bf5847c70bd5773ec68502f4a3bf0f00c5053797f6a73849c598dd9f31dad0825fcd
   languageName: node
   linkType: hard