Skip to content

Commit

Permalink
#457 3rd party cookie alert txt change (#463)
Browse files Browse the repository at this point in the history
* #457 3rd party cookie alert txt change

* #441 adding user role permission link
  • Loading branch information
pushyamig authored Nov 4, 2024
1 parent 0479082 commit 88895f7
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useState } from 'react'
import { styled } from '@mui/material/styles'
import { Backdrop, Button, CircularProgress, Grid, Typography } from '@mui/material'
import { Backdrop, Button, CircularProgress, Grid, Typography, Link } from '@mui/material'

import APIErrorMessage from './APIErrorMessage.js'
import APIErrorsTable from './APIErrorsTable.js'
Expand Down Expand Up @@ -246,6 +246,7 @@ export default function MultipleUserEnrollmentWorkflow (props: MultipleUserEnrol
'If they do not have an account in Canvas, they will be sent an email ' +
'invitation to choose a login method and added to Canvas before they are enrolled in the section.'
)
const roleLink = 'https://teamdynamix.umich.edu/TDClient/30/Portal/KB/ArticleDet?ID=192'
const requirements = (
<>
<Typography>
Expand All @@ -259,7 +260,7 @@ export default function MultipleUserEnrollmentWorkflow (props: MultipleUserEnrol
</li>
<li>
<Typography>
&quot;{ROLE_HEADER.toLowerCase()}&quot; with one of the Canvas roles you are allowed to enroll users with (see documentation);
&quot;{ROLE_HEADER.toLowerCase()}&quot; with one of the Canvas roles you are allowed to enroll users with <Link href={roleLink} target='_blank' rel="noopener">(see documentation)</Link>;
</Typography>
</li>
<li>
Expand Down
12 changes: 7 additions & 5 deletions ccm_web/client/src/pages/LaunchError.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ interface LaunchErrorProps extends HelpContactProps {}

export default function LaunchError (props: LaunchErrorProps): JSX.Element {
const chromeLink = 'https://support.google.com/chrome/answer/95647?hl=en'
const macOSLink = 'https://support.apple.com/guide/safari/manage-cookies-and-website-data-sfri11471/12.0/mac/10.14'
const iOSLink = 'https://www.whatismybrowser.com/guides/how-to-enable-cookies/safari-iphone'
const safariMacOSLink = 'https://support.apple.com/guide/safari/manage-cookies-and-website-data-sfri11471/12.0/mac/10.14'
const safariiOSLink = 'https://www.whatismybrowser.com/guides/how-to-enable-cookies/safari-iphone'
const firefoxLink = 'https://support.mozilla.org/en-US/kb/enhanced-tracking-protection-firefox-desktop?redirectslug=enable-and-disable-cookies-website-preferences'
const edgeLink = 'https://www.whatismybrowser.com/guides/how-to-enable-cookies/edge'
const safariCrossSiteTrackingLink = 'https://support.apple.com/guide/safari/prevent-cross-site-tracking-sfri40732/mac'

return (
<Layout>
Expand All @@ -25,10 +26,11 @@ export default function LaunchError (props: LaunchErrorProps): JSX.Element {
</Typography>
<Typography>
To resolve this issue, please update your settings
for <Link href={chromeLink}>Chrome</Link>, <Link href={macOSLink}>Safari for MacOS</Link>
, <Link href={iOSLink}>Safari for iOS</Link>, <Link href={firefoxLink}>Firefox</Link>
, <Link href={edgeLink}>Microsoft Edge</Link>,
for <Link href={chromeLink} target='_blank' rel="noopener">Chrome</Link>, <Link href={safariMacOSLink} target='_blank' rel="noopener">Safari for MacOS</Link>
, <Link href={safariiOSLink} target='_blank' rel="noopener">Safari for iOS</Link>, <Link href={firefoxLink} target='_blank' rel="noopener">Firefox</Link>
, <Link href={edgeLink} target='_blank' rel="noopener">Microsoft Edge</Link>,
or another preferred browser to allow third-party cookies.
Safari should also <Link href={safariCrossSiteTrackingLink} target='_blank' rel="noopener">allow cross-site tracking.</Link>
</Typography>
<HelpContact {...props} />
</InlineErrorAlert>
Expand Down

0 comments on commit 88895f7

Please sign in to comment.