From f7e14591d299c4b917907bce1d464da6f8b72b21 Mon Sep 17 00:00:00 2001 From: Clay Benson Date: Tue, 20 Aug 2024 13:13:44 -0400 Subject: [PATCH 1/3] [MINT-1905] Update link in suggested phase email (#1303) Update link in suggested phase email to point to status page instead of task list page --- pkg/email/templates/model_plan_suggested_phase_body.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/email/templates/model_plan_suggested_phase_body.html b/pkg/email/templates/model_plan_suggested_phase_body.html index 89d78b2286..e2b7f3066a 100644 --- a/pkg/email/templates/model_plan_suggested_phase_body.html +++ b/pkg/email/templates/model_plan_suggested_phase_body.html @@ -25,7 +25,7 @@ {{end}}

-Yes, update my model’s status +Yes, update my model’s status

If you’re not ready to update your model’s status, please adjust your model’s anticipated timeline. If you adjust your timeline, you may receive this notification again.

From fcc44b4ebc488a4a18807fdbd59f19046a5d1368 Mon Sep 17 00:00:00 2001 From: Patrick Segura <95709965+patrickseguraoddball@users.noreply.github.com> Date: Tue, 20 Aug 2024 12:30:13 -0500 Subject: [PATCH 2/3] [NOREF] Fix incorrect OKTA email field (#1304) * Fix incorrect okat email field * Kept accesstoken for mint-groups --- src/views/UserInfoWrapper/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/UserInfoWrapper/index.tsx b/src/views/UserInfoWrapper/index.tsx index 0b523fc13f..da1081bb39 100644 --- a/src/views/UserInfoWrapper/index.tsx +++ b/src/views/UserInfoWrapper/index.tsx @@ -60,12 +60,12 @@ const UserInfoWrapper = ({ children }: UserInfoWrapperProps) => { acceptedNDA: data?.ndaInfo }; - if (authState?.idToken?.claims.preferred_username) { + if (authState) { ReactGA.gtag('set', 'user_properties', { user_group: // @ts-ignore (authState?.accessToken?.claims['mint-groups'] || []).join(', '), - domain: authState?.accessToken?.claims.email?.replace(/.*@/, '') + domain: authState?.idToken?.claims.email?.replace(/.*@/, '') }); } From 32846e753a45f8d5eb3f2dd346be4d8fc2efa909 Mon Sep 17 00:00:00 2001 From: Clay Benson Date: Wed, 21 Aug 2024 08:32:29 -0400 Subject: [PATCH 3/3] [NOREF] Upgrade @apollo/client to latest version (#1305) * Upgrade @apollo/client to latest version * Remove @apollo/react-testing --- package.json | 3 +- .../UpdateStatusModal/index.test.tsx | 2 +- src/utils/testing/MockedProvider.tsx | 4 +- yarn.lock | 101 ++++-------------- 4 files changed, 22 insertions(+), 88 deletions(-) diff --git a/package.json b/package.json index 8b715176b1..245dd97b40 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": true, "dependencies": { - "@apollo/client": "^3.8.7", + "@apollo/client": "^3.11.4", "@babel/plugin-syntax-class-properties": "^7.12.13", "@cypress/code-coverage": "^3.10.0", "@graphql-codegen/typed-document-node": "^5.0.6", @@ -127,7 +127,6 @@ ] }, "devDependencies": { - "@apollo/react-testing": "^4.0.0", "@babel/core": "^7.23.9", "@babel/preset-env": "^7.23.9", "@cypress/webpack-preprocessor": "^6.0.1", diff --git a/src/components/UpdateStatusModal/index.test.tsx b/src/components/UpdateStatusModal/index.test.tsx index 2d03303257..e746157e0f 100644 --- a/src/components/UpdateStatusModal/index.test.tsx +++ b/src/components/UpdateStatusModal/index.test.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { MockedProvider } from '@apollo/react-testing'; +import { MockedProvider } from '@apollo/client/testing'; import { fireEvent, render, screen } from '@testing-library/react'; import { ModelPhase, diff --git a/src/utils/testing/MockedProvider.tsx b/src/utils/testing/MockedProvider.tsx index a7f0f248d2..36701a471b 100644 --- a/src/utils/testing/MockedProvider.tsx +++ b/src/utils/testing/MockedProvider.tsx @@ -11,9 +11,9 @@ import { onError } from '@apollo/client/link/error'; import { MockedProvider, MockedProviderProps, - MockedResponse + MockedResponse, + MockLink } from '@apollo/client/testing'; -import { MockLink } from '@apollo/react-testing'; interface Props extends MockedProviderProps { mocks?: ReadonlyArray; diff --git a/yarn.lock b/yarn.lock index 10d1798b64..2ec60a951c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -23,10 +23,10 @@ "@jridgewell/gen-mapping" "^0.3.0" "@jridgewell/trace-mapping" "^0.3.9" -"@apollo/client@^3.7.0": - version "3.9.2" - resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.9.2.tgz#96edf2c212f828bad1ef3d84234fa473c5a27ff8" - integrity sha512-Zw9WvXjqhpbgkvAvnj52vstOWwM0iedKWtn1hSq1cODQyoe1CF2uFwMYFI7l56BrAY9CzLi6MQA0AhxpgJgvxw== +"@apollo/client@^3.11.4": + version "3.11.4" + resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.11.4.tgz#8b0fed2d091d47597e8ddafca85776bf612ae3aa" + integrity sha512-bmgYKkULpym8wt8aXlAZ1heaYo0skLJ5ru0qJ+JCRoo03Pe+yIDbBCnqlDw6Mjj76hFkDw3HwFMgZC2Hxp30Mg== dependencies: "@graphql-typed-document-node/core" "^3.1.1" "@wry/caches" "^1.0.0" @@ -36,58 +36,33 @@ hoist-non-react-statics "^3.3.2" optimism "^0.18.0" prop-types "^15.7.2" - rehackt "0.0.3" + rehackt "^0.1.0" response-iterator "^0.2.6" symbol-observable "^4.0.0" ts-invariant "^0.10.3" tslib "^2.3.0" zen-observable-ts "^1.2.5" -"@apollo/client@^3.8.7": - version "3.8.7" - resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.8.7.tgz#090b1518f513503b9a6a690ee3eaec49529822e1" - integrity sha512-DnQtFkQrCyxHTSa9gR84YRLmU/al6HeXcLZazVe+VxKBmx/Hj4rV8xWtzfWYX5ijartsqDR7SJgV037MATEecA== +"@apollo/client@^3.7.0": + version "3.9.2" + resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.9.2.tgz#96edf2c212f828bad1ef3d84234fa473c5a27ff8" + integrity sha512-Zw9WvXjqhpbgkvAvnj52vstOWwM0iedKWtn1hSq1cODQyoe1CF2uFwMYFI7l56BrAY9CzLi6MQA0AhxpgJgvxw== dependencies: "@graphql-typed-document-node/core" "^3.1.1" - "@wry/context" "^0.7.3" + "@wry/caches" "^1.0.0" "@wry/equality" "^0.5.6" - "@wry/trie" "^0.4.3" - graphql-tag "^2.12.6" - hoist-non-react-statics "^3.3.2" - optimism "^0.17.5" - prop-types "^15.7.2" - response-iterator "^0.2.6" - symbol-observable "^4.0.0" - ts-invariant "^0.10.3" - tslib "^2.3.0" - zen-observable-ts "^1.2.5" - -"@apollo/client@latest": - version "3.7.1" - resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.7.1.tgz#86ce47c18a0714e229231148b0306562550c2248" - integrity sha512-xu5M/l7p9gT9Fx7nF3AQivp0XukjB7TM7tOd5wifIpI8RskYveL4I+rpTijzWrnqCPZabkbzJKH7WEAKdctt9w== - dependencies: - "@graphql-typed-document-node/core" "^3.1.1" - "@wry/context" "^0.7.0" - "@wry/equality" "^0.5.0" - "@wry/trie" "^0.3.0" + "@wry/trie" "^0.5.0" graphql-tag "^2.12.6" hoist-non-react-statics "^3.3.2" - optimism "^0.16.1" + optimism "^0.18.0" prop-types "^15.7.2" + rehackt "0.0.3" response-iterator "^0.2.6" symbol-observable "^4.0.0" ts-invariant "^0.10.3" tslib "^2.3.0" zen-observable-ts "^1.2.5" -"@apollo/react-testing@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@apollo/react-testing/-/react-testing-4.0.0.tgz#9fd1991584510c2ac051d986547ceccbc9c0a30a" - integrity sha512-P7Z/flUHpRRZYc3FkIqxZH9XD3FuP2Sgks1IXqGq2Zb7qI0aaTfVeRsLYmZNUcFOh2pTHxs0NXgPnH1VfYOpig== - dependencies: - "@apollo/client" latest - "@ardatan/relay-compiler@12.0.0": version "12.0.0" resolved "https://registry.yarnpkg.com/@ardatan/relay-compiler/-/relay-compiler-12.0.0.tgz#2e4cca43088e807adc63450e8cab037020e91106" @@ -7139,13 +7114,6 @@ dependencies: tslib "^2.3.0" -"@wry/context@^0.6.0": - version "0.6.0" - resolved "https://registry.yarnpkg.com/@wry/context/-/context-0.6.0.tgz#f903eceb89d238ef7e8168ed30f4511f92d83e06" - integrity sha512-sAgendOXR8dM7stJw3FusRxFHF/ZinU0lffsA2YTyyIOfic86JX02qlPqPVqJNZJPAxFt+2EE8bvq6ZlS0Kf+Q== - dependencies: - tslib "^2.1.0" - "@wry/context@^0.7.0": version "0.7.0" resolved "https://registry.yarnpkg.com/@wry/context/-/context-0.7.0.tgz#be88e22c0ddf62aeb0ae9f95c3d90932c619a5c8" @@ -7153,13 +7121,6 @@ dependencies: tslib "^2.3.0" -"@wry/context@^0.7.3": - version "0.7.4" - resolved "https://registry.yarnpkg.com/@wry/context/-/context-0.7.4.tgz#e32d750fa075955c4ab2cfb8c48095e1d42d5990" - integrity sha512-jmT7Sb4ZQWI5iyu3lobQxICu2nC/vbUhP0vIdd6tHC9PTfenmRmuIFqktc6GH9cgi+ZHnsLWPvfSvc4DrYmKiQ== - dependencies: - tslib "^2.3.0" - "@wry/equality@^0.1.2": version "0.1.11" resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.1.11.tgz#35cb156e4a96695aa81a9ecc4d03787bc17f1790" @@ -7167,13 +7128,6 @@ dependencies: tslib "^1.9.3" -"@wry/equality@^0.5.0": - version "0.5.1" - resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.5.1.tgz#b22e4e1674d7bf1439f8ccdccfd6a785f6de68b0" - integrity sha512-FZKbdpbcVcbDxQrKcaBClNsQaMg9nof1RKM7mReJe5DKUzM5u8S7T+PqwNqvib5O2j2xxF1R4p5O3+b6baTrbw== - dependencies: - tslib "^2.1.0" - "@wry/equality@^0.5.6": version "0.5.7" resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.5.7.tgz#72ec1a73760943d439d56b7b1e9985aec5d497bb" @@ -7181,13 +7135,6 @@ dependencies: tslib "^2.3.0" -"@wry/trie@^0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@wry/trie/-/trie-0.3.0.tgz#3245e74988c4e3033299e479a1bf004430752463" - integrity sha512-Yw1akIogPhAT6XPYsRHlZZIS0tIGmAl9EYXHi2scf7LPKKqdqmow/Hu4kEqP2cJR3EjaU/9L0ZlAjFf3hFxmug== - dependencies: - tslib "^2.1.0" - "@wry/trie@^0.4.3": version "0.4.3" resolved "https://registry.yarnpkg.com/@wry/trie/-/trie-0.4.3.tgz#077d52c22365871bf3ffcbab8e95cb8bc5689af4" @@ -13460,23 +13407,6 @@ open@^8.0.4, open@^8.4.0: is-docker "^2.1.1" is-wsl "^2.2.0" -optimism@^0.16.1: - version "0.16.1" - resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.16.1.tgz#7c8efc1f3179f18307b887e18c15c5b7133f6e7d" - integrity sha512-64i+Uw3otrndfq5kaoGNoY7pvOhSsjFEN4bdEFh80MWVk/dbgJfMv7VFDeCT8LxNAlEVhQmdVEbfE7X2nWNIIg== - dependencies: - "@wry/context" "^0.6.0" - "@wry/trie" "^0.3.0" - -optimism@^0.17.5: - version "0.17.5" - resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.17.5.tgz#a4c78b3ad12c58623abedbebb4f2f2c19b8e8816" - integrity sha512-TEcp8ZwK1RczmvMnvktxHSF2tKgMWjJ71xEFGX5ApLh67VsMSTy1ZUlipJw8W+KaqgOmQ+4pqwkeivY89j+4Vw== - dependencies: - "@wry/context" "^0.7.0" - "@wry/trie" "^0.4.3" - tslib "^2.3.0" - optimism@^0.18.0: version "0.18.0" resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.18.0.tgz#e7bb38b24715f3fdad8a9a7fc18e999144bbfa63" @@ -14968,6 +14898,11 @@ rehackt@0.0.3: resolved "https://registry.yarnpkg.com/rehackt/-/rehackt-0.0.3.tgz#1ea454620d4641db8342e2db44595cf0e7ac6aa0" integrity sha512-aBRHudKhOWwsTvCbSoinzq+Lej/7R8e8UoPvLZo5HirZIIBLGAgdG7SL9QpdcBoQ7+3QYPi3lRLknAzXBlhZ7g== +rehackt@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/rehackt/-/rehackt-0.1.0.tgz#a7c5e289c87345f70da8728a7eb878e5d03c696b" + integrity sha512-7kRDOuLHB87D/JESKxQoRwv4DzbIdwkAGQ7p6QKGdVlY1IZheUnVhlk/4UZlNUVxdAXpyxikE3URsG067ybVzw== + relay-runtime@12.0.0: version "12.0.0" resolved "https://registry.yarnpkg.com/relay-runtime/-/relay-runtime-12.0.0.tgz#1e039282bdb5e0c1b9a7dc7f6b9a09d4f4ff8237"