From 8dd7ef4630aedd7753a2c0cdcfa34361f76d5adb Mon Sep 17 00:00:00 2001 From: Fran McDade Date: Tue, 19 Sep 2023 02:58:06 +1000 Subject: [PATCH] feat: implement bottom half of Terra account nag indicating the NIH account (#3658) (#3664) * feat: implement bottom half of Terra account nag indicating the NIH account (#3658) * chore: updated clevercanary/data-explorer-ui to v0.45.0 (#3658) --------- Co-authored-by: Fran McDade --- explorer/package-lock.json | 14 +++++++------- explorer/package.json | 2 +- .../cc-dev/authentication/authentication.ts | 6 +++++- .../anvil-cmg/dev/authentication/authentication.ts | 6 +++++- .../prod/authentication/authentication.ts | 6 +++++- .../anvil/dev/authentication/authentication.ts | 4 ++++ 6 files changed, 27 insertions(+), 11 deletions(-) diff --git a/explorer/package-lock.json b/explorer/package-lock.json index 08ed6dfec..da26bac47 100644 --- a/explorer/package-lock.json +++ b/explorer/package-lock.json @@ -8,7 +8,7 @@ "name": "explorer", "version": "0.1.0", "dependencies": { - "@clevercanary/data-explorer-ui": "0.44.0", + "@clevercanary/data-explorer-ui": "0.45.0", "@emotion/react": "11.11.1", "@emotion/styled": "11.11.0", "@mdx-js/loader": "^2.3.0", @@ -2119,9 +2119,9 @@ "dev": true }, "node_modules/@clevercanary/data-explorer-ui": { - "version": "0.44.0", - "resolved": "https://registry.npmjs.org/@clevercanary/data-explorer-ui/-/data-explorer-ui-0.44.0.tgz", - "integrity": "sha512-JQjt/mAF0iVIlmQHTyuHWXPZskqvyR/LAMKaj478iXxkj1qtZLivY/mgvZkSCfqt4G5FaQ6kZuXzHkDpM4nZdQ==", + "version": "0.45.0", + "resolved": "https://registry.npmjs.org/@clevercanary/data-explorer-ui/-/data-explorer-ui-0.45.0.tgz", + "integrity": "sha512-NybhCsLFD7/CiqxmRoUVo0q+txlTu3hw80cEnMuAqH8WwUPVg8/qJTwXAi1ggOEodThzT/OD8c83kX491ZCswA==", "peerDependencies": { "@emotion/react": "11.11.1", "@emotion/styled": "11.11.0", @@ -25217,9 +25217,9 @@ "dev": true }, "@clevercanary/data-explorer-ui": { - "version": "0.44.0", - "resolved": "https://registry.npmjs.org/@clevercanary/data-explorer-ui/-/data-explorer-ui-0.44.0.tgz", - "integrity": "sha512-JQjt/mAF0iVIlmQHTyuHWXPZskqvyR/LAMKaj478iXxkj1qtZLivY/mgvZkSCfqt4G5FaQ6kZuXzHkDpM4nZdQ==", + "version": "0.45.0", + "resolved": "https://registry.npmjs.org/@clevercanary/data-explorer-ui/-/data-explorer-ui-0.45.0.tgz", + "integrity": "sha512-NybhCsLFD7/CiqxmRoUVo0q+txlTu3hw80cEnMuAqH8WwUPVg8/qJTwXAi1ggOEodThzT/OD8c83kX491ZCswA==", "requires": {} }, "@colors/colors": { diff --git a/explorer/package.json b/explorer/package.json index df41807b7..e92c801b2 100644 --- a/explorer/package.json +++ b/explorer/package.json @@ -33,7 +33,7 @@ "test:anvil-catalog": "playwright test -c playwright_anvil-catalog.config.ts" }, "dependencies": { - "@clevercanary/data-explorer-ui": "0.44.0", + "@clevercanary/data-explorer-ui": "0.45.0", "@emotion/react": "11.11.1", "@emotion/styled": "11.11.0", "@mdx-js/loader": "^2.3.0", diff --git a/explorer/site-config/anvil-cmg/cc-dev/authentication/authentication.ts b/explorer/site-config/anvil-cmg/cc-dev/authentication/authentication.ts index 1e5596996..42d8feda4 100644 --- a/explorer/site-config/anvil-cmg/cc-dev/authentication/authentication.ts +++ b/explorer/site-config/anvil-cmg/cc-dev/authentication/authentication.ts @@ -8,10 +8,14 @@ export const authenticationConfig: AuthenticationConfig = { googleProfileEndpoint: "https://www.googleapis.com/oauth2/v3/userinfo", scope: "https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile openid", + }, + termsOfService: MDX.RenderComponent({ Component: MDX.LoginTermsOfService }), + terraAuthConfig: { + terraNIHProfileEndpoint: + "https://firecloud-orchestration.dsde-dev.broadinstitute.org/api/nih/status", terraProfileEndpoint: "https://sam.dsde-dev.broadinstitute.org/register/user/v1", }, - termsOfService: MDX.RenderComponent({ Component: MDX.LoginTermsOfService }), text: MDX.RenderComponent({ Component: MDX.LoginText }), title: "Sign in to your account", warning: MDX.RenderComponent({ Component: MDX.LoginWarning }), diff --git a/explorer/site-config/anvil-cmg/dev/authentication/authentication.ts b/explorer/site-config/anvil-cmg/dev/authentication/authentication.ts index 2bf182ced..ad3826508 100644 --- a/explorer/site-config/anvil-cmg/dev/authentication/authentication.ts +++ b/explorer/site-config/anvil-cmg/dev/authentication/authentication.ts @@ -8,10 +8,14 @@ export const authenticationConfig: AuthenticationConfig = { googleProfileEndpoint: "https://www.googleapis.com/oauth2/v3/userinfo", scope: "https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile openid", + }, + termsOfService: MDX.RenderComponent({ Component: MDX.LoginTermsOfService }), + terraAuthConfig: { + terraNIHProfileEndpoint: + "https://firecloud-orchestration.dsde-dev.broadinstitute.org/api/nih/status", terraProfileEndpoint: "https://sam.dsde-prod.broadinstitute.org/register/user/v1", }, - termsOfService: MDX.RenderComponent({ Component: MDX.LoginTermsOfService }), text: MDX.RenderComponent({ Component: MDX.LoginText }), title: "Sign in to your account", warning: MDX.RenderComponent({ Component: MDX.LoginWarning }), diff --git a/explorer/site-config/anvil-cmg/prod/authentication/authentication.ts b/explorer/site-config/anvil-cmg/prod/authentication/authentication.ts index e7c957181..58a252346 100644 --- a/explorer/site-config/anvil-cmg/prod/authentication/authentication.ts +++ b/explorer/site-config/anvil-cmg/prod/authentication/authentication.ts @@ -8,10 +8,14 @@ export const authenticationConfig: AuthenticationConfig = { googleProfileEndpoint: "https://www.googleapis.com/oauth2/v3/userinfo", scope: "https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile openid", + }, + termsOfService: MDX.RenderComponent({ Component: MDX.LoginTermsOfService }), + terraAuthConfig: { + terraNIHProfileEndpoint: + "https://firecloud-orchestration.dsde-dev.broadinstitute.org/api/nih/status", terraProfileEndpoint: "https://sam.dsde-dev.broadinstitute.org/register/user/v1", }, - termsOfService: MDX.RenderComponent({ Component: MDX.LoginTermsOfService }), text: MDX.RenderComponent({ Component: MDX.LoginText }), title: "Sign in to your account", warning: MDX.RenderComponent({ Component: MDX.LoginWarning }), diff --git a/explorer/site-config/anvil/dev/authentication/authentication.ts b/explorer/site-config/anvil/dev/authentication/authentication.ts index 2cce15f75..f52c490cf 100644 --- a/explorer/site-config/anvil/dev/authentication/authentication.ts +++ b/explorer/site-config/anvil/dev/authentication/authentication.ts @@ -7,6 +7,10 @@ export const authenticationConfig: AuthenticationConfig = { googleProfileEndpoint: "https://www.googleapis.com/oauth2/v3/userinfo", scope: "https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile openid", + }, + terraAuthConfig: { + terraNIHProfileEndpoint: + "https://firecloud-orchestration.dsde-prod.broadinstitute.org/api/nih/status", terraProfileEndpoint: "https://sam.dsde-prod.broadinstitute.org/register/user/v1", },