From 88895f7a5cd47d7b755fe80db32920b14884a988 Mon Sep 17 00:00:00 2001
From: Pushyami Gundala <pushyamig@users.noreply.github.com>
Date: Mon, 4 Nov 2024 09:08:00 -0500
Subject: [PATCH] #457 3rd party cookie alert txt change (#463)

* #457 3rd party cookie alert txt change

* #441 adding user role permission link
---
 .../components/MultipleUserEnrollmentWorkflow.tsx    |  5 +++--
 ccm_web/client/src/pages/LaunchError.tsx             | 12 +++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ccm_web/client/src/components/MultipleUserEnrollmentWorkflow.tsx b/ccm_web/client/src/components/MultipleUserEnrollmentWorkflow.tsx
index bda841f6..2a712269 100644
--- a/ccm_web/client/src/components/MultipleUserEnrollmentWorkflow.tsx
+++ b/ccm_web/client/src/components/MultipleUserEnrollmentWorkflow.tsx
@@ -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'
@@ -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>
@@ -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>
diff --git a/ccm_web/client/src/pages/LaunchError.tsx b/ccm_web/client/src/pages/LaunchError.tsx
index 1f485312..7acfb126 100644
--- a/ccm_web/client/src/pages/LaunchError.tsx
+++ b/ccm_web/client/src/pages/LaunchError.tsx
@@ -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>
@@ -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>