From f7580e4c6e34a883d874e3f75b94d483eeb92eb2 Mon Sep 17 00:00:00 2001 From: etanb Date: Thu, 10 Oct 2024 09:26:56 -0700 Subject: [PATCH] swap out service link across site --- frontend-react/src/config/index.ts | 57 +++------ .../reportstream-api/ReportStreamApi.mdx | 2 +- .../managing-your-connection/index.mdx | 4 +- frontend-react/src/content/site.json | 108 +++++++++--------- frontend-react/src/content/support/index.mdx | 6 +- 5 files changed, 76 insertions(+), 101 deletions(-) diff --git a/frontend-react/src/config/index.ts b/frontend-react/src/config/index.ts index 9a49ef6286b..b2e2c35ca16 100644 --- a/frontend-react/src/config/index.ts +++ b/frontend-react/src/config/index.ts @@ -1,15 +1,5 @@ -import { - IConfig, - IConfiguration, - SeverityLevel, -} from "@microsoft/applicationinsights-web"; -import { - AccessToken, - AuthState, - IDToken, - OktaAuthOptions, - RefreshToken, -} from "@okta/okta-auth-js"; +import { IConfig, IConfiguration, SeverityLevel } from "@microsoft/applicationinsights-web"; +import { AccessToken, AuthState, IDToken, OktaAuthOptions, RefreshToken } from "@okta/okta-auth-js"; import { WidgetOptions } from "@okta/okta-signin-widget"; import type { Feature } from "@okta/okta-signin-widget"; import type { IIdleTimerProps } from "react-idle-timer"; @@ -23,9 +13,7 @@ const envVars = { MODE: import.meta.env.MODE, }; -const DEFAULT_FEATURE_FLAGS = import.meta.env.VITE_FEATURE_FLAGS - ? import.meta.env.VITE_FEATURE_FLAGS.split(",") - : []; +const DEFAULT_FEATURE_FLAGS = import.meta.env.VITE_FEATURE_FLAGS ? import.meta.env.VITE_FEATURE_FLAGS.split(",") : []; const OKTA_ISSUER = `${envVars.OKTA_URL}/oauth2/default`; @@ -41,9 +29,7 @@ const config = { IS_PREVIEW: envVars.MODE !== "production", API_ROOT: `${envVars.RS_API_URL}/api`, APPLICATION_INSIGHTS: { - connectionString: - import.meta.env.VITE_APPLICATIONINSIGHTS_CONNECTION_STRING ?? - "instrumentationKey=test", + connectionString: import.meta.env.VITE_APPLICATIONINSIGHTS_CONNECTION_STRING ?? "instrumentationKey=test", loggingLevelConsole: import.meta.env.NODE_ENV === "development" ? 2 : 0, disableFetchTracking: false, enableAutoRouteTracking: true, @@ -54,19 +40,12 @@ const config = { enableCorsCorrelation: true, enableRequestHeaderTracking: true, enableResponseHeaderTracking: true, - disableTelemetry: !import.meta.env - .VITE_APPLICATIONINSIGHTS_CONNECTION_STRING, + disableTelemetry: !import.meta.env.VITE_APPLICATIONINSIGHTS_CONNECTION_STRING, excludeRequestFromAutoTrackingPatterns: ["google-analytics.com"], } as const satisfies IConfiguration & IConfig, RSCONSOLE: { // Debug ignored by default - reportableLevels: [ - "assert", - "error", - "info", - "trace", - "warn", - ] as ConsoleLevel[], + reportableLevels: ["assert", "error", "info", "trace", "warn"] as ConsoleLevel[], severityLevels: { info: SeverityLevel.Information, warn: SeverityLevel.Warning, @@ -96,17 +75,16 @@ const config = { }, async transformAuthState(oktaAuth, authState) { let finalAuthState: AuthState = structuredClone(authState); - const tokens = [ - authState.accessToken, - authState.idToken, - authState.refreshToken, - ].filter(Boolean) as (AccessToken | IDToken | RefreshToken)[]; + const tokens = [authState.accessToken, authState.idToken, authState.refreshToken].filter(Boolean) as ( + | AccessToken + | IDToken + | RefreshToken + )[]; // Prevent pulling incorrect token from a different okta environment if ( tokens.find( (t) => - ("issuer" in t && t.issuer !== OKTA_ISSUER) || - ("claims" in t && t.claims.iss !== OKTA_ISSUER), + ("issuer" in t && t.issuer !== OKTA_ISSUER) || ("claims" in t && t.claims.iss !== OKTA_ISSUER), ) ) { oktaAuth.clearStorage(); @@ -140,7 +118,7 @@ const config = { } satisfies Partial>, useClassicEngine: false, helpLinks: { - help: "https://app.smartsheetgov.com/b/form/da894779659b45768079200609b3a599", + help: "https://app.smartsheetgov.com/b/form/95d2f16b772c42d8aaa0ef5db28a6838", }, i18n: { // Overriding English properties @@ -155,8 +133,7 @@ const config = { "error.username.required": "Please enter a username. Your username should be the email address you registered with. Check your activation email.", "password.reset": "Reset password", - "password.forgot.question.title": - "Answer forgotten password challenge", + "password.forgot.question.title": "Answer forgotten password challenge", "password.forgot.question.submit": "Reset password", "password.forgot.emailSent.title": "Email sent", "password.forgot.emailSent.desc": @@ -172,8 +149,7 @@ const config = { "Your account is locked because of too many failed attempts. Check your email for next steps to unlock.", "errors.E0000004": "Unable to sign in. Check your username and password. Your account will be locked after 5 failed attempts.", - "account.unlock.email.or.username.placeholder": - "Username or email", + "account.unlock.email.or.username.placeholder": "Username or email", "account.unlock.email.or.username.tooltip": "Username or email", }, }, @@ -185,8 +161,7 @@ const config = { openGraph: { image: { src: import.meta.env.VITE_OPENGRAPH_DEFAULT_IMAGE_SRC, - altText: import.meta.env - .VITE_OPENGRAPH_DEFAULT_IMAGE_ALTTEXT, + altText: import.meta.env.VITE_OPENGRAPH_DEFAULT_IMAGE_ALTTEXT, }, }, }, diff --git a/frontend-react/src/content/developer-resources/reportstream-api/ReportStreamApi.mdx b/frontend-react/src/content/developer-resources/reportstream-api/ReportStreamApi.mdx index 5b98851e37f..542649590a9 100644 --- a/frontend-react/src/content/developer-resources/reportstream-api/ReportStreamApi.mdx +++ b/frontend-react/src/content/developer-resources/reportstream-api/ReportStreamApi.mdx @@ -40,7 +40,7 @@ import site from "../../site.json"; ## Onboarding overview We’ll give you and your team resources and support as you begin connecting with ReportStream’s API. [Learn more](getting-started) about setting up your connection and formatting your data. - If you haven’t connected with us yet, [contact us](https://app.smartsheetgov.com/b/form/da894779659b45768079200609b3a599) to set up your kickoff call. + If you haven’t connected with us yet, contact us to set up your kickoff call. diff --git a/frontend-react/src/content/managing-your-connection/index.mdx b/frontend-react/src/content/managing-your-connection/index.mdx index 3b9ea7354f5..7a1b3e1e87d 100644 --- a/frontend-react/src/content/managing-your-connection/index.mdx +++ b/frontend-react/src/content/managing-your-connection/index.mdx @@ -35,7 +35,7 @@ import site from "../../content/site.json"; * [Manage your public key](/manage-public-key) * [View your submission history](/submissions) - [Login](/login) or [contact us](https://app.smartsheetgov.com/b/form/da894779659b45768079200609b3a599) to create an account. + [Login](/login) or contact us to create an account. @@ -46,7 +46,7 @@ import site from "../../content/site.json"; * [Refer healthcare organizations](/managing-your-connection/refer-healthcare-organizations) * [View your dashboard](/daily-data) - [Login](/login) or [contact us](https://app.smartsheetgov.com/b/form/da894779659b45768079200609b3a599) to create an account. + [Login](/login) or contact us to create an account. diff --git a/frontend-react/src/content/site.json b/frontend-react/src/content/site.json index 77485c73e4d..745dcc70b7a 100644 --- a/frontend-react/src/content/site.json +++ b/frontend-react/src/content/site.json @@ -1,57 +1,57 @@ { - "imgPath": "/assets/", - "pdfPath": "/assets/pdf/", - "documentationPath": "/documentation/", - "orgs": { - "CDC": { - "name": "Centers for Disease Control and Prevention", - "url": "https://cdc.gov", - "email": "no-reply@cdc.gov" - }, - "PRIME": { - "name": "Pandemic Ready Interoperability Modernization Effort", - "email": "usds@cdc.gov", - "url": "https://www.cdc.gov/surveillance/projects/pandemic-ready-it-systems.html" - }, - "RS": { - "name": "ReportStream", - "url": "https://reportstream.cdc.gov", - "email": "reportstream@cdc.gov" - }, - "SR": { - "name": "SimpleReport", - "url": "https://simplereport.gov", - "email": "support@simplereport.gov" - }, - "USDS": { - "name": "U.S. Digital Service", - "url": "https://usds.gov", - "email": "USDS@omb.eop.gov" - } - }, - "forms": { - "intakeElr": { - "name": "ELR intake form", - "url": "https://app.smartsheetgov.com/b/form/b0935d5d1e924c57b2d293b4ed0f2cd5" - }, - "connectWithRS": { - "name": "Connect with ReportStream", - "url": "https://app.smartsheetgov.com/b/form/48f580abb9b440549b1a9cf996ba6957" - }, - "contactUs": { - "name": "Contact us", - "url": "https://app.smartsheetgov.com/b/form/da894779659b45768079200609b3a599" - } - }, - "assets": { - "standardCsv": { - "path": "/assets/csv/ReportStream-StandardCSV-ExampleData-20220509.csv" - }, - "programmersGuidePdf": { - "path": "/assets/pdf/ReportStream-Programmers-Guide-v4.6.pdf" - }, - "exampleHl7": { - "path": "/assets/hl7/Example-hl7-file.hl7" - } + "imgPath": "/assets/", + "pdfPath": "/assets/pdf/", + "documentationPath": "/documentation/", + "orgs": { + "CDC": { + "name": "Centers for Disease Control and Prevention", + "url": "https://cdc.gov", + "email": "no-reply@cdc.gov" + }, + "PRIME": { + "name": "Pandemic Ready Interoperability Modernization Effort", + "email": "usds@cdc.gov", + "url": "https://www.cdc.gov/surveillance/projects/pandemic-ready-it-systems.html" + }, + "RS": { + "name": "ReportStream", + "url": "https://reportstream.cdc.gov", + "email": "reportstream@cdc.gov" + }, + "SR": { + "name": "SimpleReport", + "url": "https://simplereport.gov", + "email": "support@simplereport.gov" + }, + "USDS": { + "name": "U.S. Digital Service", + "url": "https://usds.gov", + "email": "USDS@omb.eop.gov" + } + }, + "forms": { + "intakeElr": { + "name": "ELR intake form", + "url": "https://app.smartsheetgov.com/b/form/b0935d5d1e924c57b2d293b4ed0f2cd5" + }, + "connectWithRS": { + "name": "Connect with ReportStream", + "url": "https://app.smartsheetgov.com/b/form/48f580abb9b440549b1a9cf996ba6957" + }, + "contactUs": { + "name": "Contact us", + "url": "https://app.smartsheetgov.com/b/form/95d2f16b772c42d8aaa0ef5db28a6838" + } + }, + "assets": { + "standardCsv": { + "path": "/assets/csv/ReportStream-StandardCSV-ExampleData-20220509.csv" + }, + "programmersGuidePdf": { + "path": "/assets/pdf/ReportStream-Programmers-Guide-v4.6.pdf" + }, + "exampleHl7": { + "path": "/assets/hl7/Example-hl7-file.hl7" } + } } diff --git a/frontend-react/src/content/support/index.mdx b/frontend-react/src/content/support/index.mdx index 6af0709fae8..2c26c9d1c5c 100644 --- a/frontend-react/src/content/support/index.mdx +++ b/frontend-react/src/content/support/index.mdx @@ -69,7 +69,7 @@ import site from "../../content/site.json"; ## Support request -

For issues with an existing connection, [submit a ticket](https://app.smartsheetgov.com/b/form/da894779659b45768079200609b3a599).
+

For issues with an existing connection, submit a ticket.
Our support team will respond as soon as possible to keep your data flowing.

 @@ -183,7 +183,7 @@ import site from "../../content/site.json"; title: "How do I register for a ReportStream account?", content: (
  1. Request an account.
    - Submit a service request with information about your organization and explaining that you would like a ReportStream account.
    2. + Submit a service request with information about your organization and explaining that you would like a ReportStream account.
  2. Accept the terms of service.
    A ReportStream team member will process your request and confirm that you accept our terms of service.
  3. Activate your account.
    @@ -369,7 +369,7 @@ import site from "../../content/site.json"; headingLevel: "h4", title: "How do I manage team member accounts?", content: (

    - ReportStream manually manages user accounts for your team. To add or remove team members, contact us. + ReportStream manually manages user accounts for your team. To add or remove team members, contact us.

    ) }, ]} />