Skip to content

Commit

Permalink
Merge pull request #16197 from CDCgov/experience/16135/update-service…
Browse files Browse the repository at this point in the history
…-link

Update service request form link across ReportStream website#16135
  • Loading branch information
etanb authored Oct 18, 2024
2 parents 632c6e0 + a8c22b0 commit ad7119e
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 101 deletions.
57 changes: 16 additions & 41 deletions frontend-react/src/config/index.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -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`;

Expand All @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -140,7 +118,7 @@ const config = {
} satisfies Partial<Record<Feature, boolean>>,
useClassicEngine: false,
helpLinks: {
help: "https://app.smartsheetgov.com/b/form/da894779659b45768079200609b3a599",
help: "https://app.smartsheetgov.com/b/form/95d2f16b772c42d8aaa0ef5db28a6838",
},
i18n: {
// Overriding English properties
Expand All @@ -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":
Expand All @@ -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",
},
},
Expand All @@ -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,
},
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import site from "../../site.json";
## <a href="#onboarding-overview" className="usa-link usa-link--unstyled">Onboarding overview</a>
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, <A href={site.forms.contactUs.url}>contact us</A> to set up your kickoff call.

<ProcessList>
<ProcessListItem>
Expand Down
4 changes: 2 additions & 2 deletions frontend-react/src/content/managing-your-connection/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import site from "../../content/site.json";
* [Manage your public key](/manage-public-key) <Icon name='Lock' className="text-ttop text-primary" />
* [View your submission history](/submissions) <Icon name='Lock' className="text-ttop text-primary" />

[Login](/login) or [contact us](https://app.smartsheetgov.com/b/form/da894779659b45768079200609b3a599) to create an account.
[Login](/login) or <A href={site.forms.contactUs.url}>contact us</A> to create an account.
</CardBody>
</Card>
<Card gridLayout={{col: "fill"}}>
Expand All @@ -46,7 +46,7 @@ import site from "../../content/site.json";
* [Refer healthcare organizations](/managing-your-connection/refer-healthcare-organizations)
* [View your dashboard](/daily-data) <Icon name='Lock' className="text-ttop text-primary" />

[Login](/login) or [contact us](https://app.smartsheetgov.com/b/form/da894779659b45768079200609b3a599) to create an account.
[Login](/login) or <A href={site.forms.contactUs.url}>contact us</A> to create an account.
</CardBody>
</Card>
</CardGroup>
Expand Down
108 changes: 54 additions & 54 deletions frontend-react/src/content/site.json
Original file line number Diff line number Diff line change
@@ -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": "[email protected]"
},
"PRIME": {
"name": "Pandemic Ready Interoperability Modernization Effort",
"email": "[email protected]",
"url": "https://www.cdc.gov/surveillance/projects/pandemic-ready-it-systems.html"
},
"RS": {
"name": "ReportStream",
"url": "https://reportstream.cdc.gov",
"email": "[email protected]"
},
"SR": {
"name": "SimpleReport",
"url": "https://simplereport.gov",
"email": "[email protected]"
},
"USDS": {
"name": "U.S. Digital Service",
"url": "https://usds.gov",
"email": "[email protected]"
}
},
"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": "[email protected]"
},
"PRIME": {
"name": "Pandemic Ready Interoperability Modernization Effort",
"email": "[email protected]",
"url": "https://www.cdc.gov/surveillance/projects/pandemic-ready-it-systems.html"
},
"RS": {
"name": "ReportStream",
"url": "https://reportstream.cdc.gov",
"email": "[email protected]"
},
"SR": {
"name": "SimpleReport",
"url": "https://simplereport.gov",
"email": "[email protected]"
},
"USDS": {
"name": "U.S. Digital Service",
"url": "https://usds.gov",
"email": "[email protected]"
}
},
"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"
}
}
}
6 changes: 3 additions & 3 deletions frontend-react/src/content/support/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ import site from "../../content/site.json";
<Grid col className="usa-prose rs-text-align-center">
## Support request

<p className="usa-intro">For issues with an existing connection, [submit a ticket](https://app.smartsheetgov.com/b/form/da894779659b45768079200609b3a599).<br/>
<p className="usa-intro">For issues with an existing connection, <A href={site.forms.contactUs.url}>submit a ticket</A>.<br/>
Our support team will respond as soon as possible to keep your data flowing.</p>
</Grid>
</GridContainer>
Expand Down Expand Up @@ -183,7 +183,7 @@ import site from "../../content/site.json";
title: "How do I register for a ReportStream account?",
content: (<ol>
<li><strong>Request an account.</strong> <br/>
Submit a <A href="https://app.smartsheetgov.com/b/form/da894779659b45768079200609b3a599">service request</A> with information about your organization and explaining that you would like a ReportStream account.</li>
Submit a <A href={site.forms.contactUs.url}>service request</A> with information about your organization and explaining that you would like a ReportStream account.</li>
<li><strong>Accept the terms of service.</strong> <br/>
A ReportStream team member will process your request and confirm that you accept our <A href="/terms-of-service">terms of service</A>.</li>
<li><strong>Activate your account</strong>. <br/>
Expand Down Expand Up @@ -369,7 +369,7 @@ import site from "../../content/site.json";
headingLevel: "h4",
title: "How do I manage team member accounts?",
content: (<p>
ReportStream manually manages user accounts for your team. To add or remove team members, <A href="https://app.smartsheetgov.com/b/form/da894779659b45768079200609b3a599">contact us</A>.
ReportStream manually manages user accounts for your team. To add or remove team members, <A href={site.forms.contactUs.url}>contact us</A>.
</p>)
},
]} />
Expand Down

0 comments on commit ad7119e

Please sign in to comment.