github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-01-27 09:42:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8025 from overleaf/msm-enable-sso-alerts

Browse source 
[Settings] Enabled SSO Journey alerts

GitOrigin-RevId: 05e3964d79e39d91d02fc9282141dbd374dae5ad
This commit is contained in:
Timothée Alby 2022-05-18 15:46:26 +02:00 committed by Copybot
parent 4209828a6a
commit 5d20df4e56
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
services/web/frontend/js/features/settings/components/emails/sso-alert.tsx
View file

@ -37,7 +37,7 @@ export function SSOAlert() {
if (samlError) {
return (
!errorClosed && (
<Alert bsStyle="danger" onDismiss={handleErrorClosed}>
<Alert bsStyle="danger" className="mb-0" onDismiss={handleErrorClosed}>
<p className="text-center">
<Icon
type="exclamation-triangle"
@ -62,7 +62,7 @@ export function SSOAlert() {
return (
<>
{!infoClosed && (
<Alert bsStyle="info" onDismiss={handleInfoClosed}>
<Alert bsStyle="info" className="mb-0" onDismiss={handleInfoClosed}>
<p className="text-center">
<Trans
i18nKey="institution_acct_successfully_linked_2"
@ -82,7 +82,11 @@ export function SSOAlert() {
</Alert>
)}
{!warningClosed && institutionEmailNonCanonical && (
<Alert bsStyle="warning" onDismiss={handleWarningClosed}>
<Alert
bsStyle="warning"
className="mb-0"
onDismiss={handleWarningClosed}
>
<p className="text-center">
<Icon
type="exclamation-triangle"

2
services/web/frontend/js/features/settings/components/root.tsx
View file

@ -15,6 +15,7 @@ import { SSOProvider } from '../context/sso-context'
import useWaitForI18n from '../../../shared/hooks/use-wait-for-i18n'
import useScrollToIdOnLoad from '../../../shared/hooks/use-scroll-to-id-on-load'
import { ExposedSettings } from '../../../../../types/exposed-settings'
import { SSOAlert } from './emails/sso-alert'
function SettingsPageRoot() {
const { isReady } = useWaitForI18n()
@ -47,6 +48,7 @@ function SettingsPageContent() {
</div>
<div>
<EmailsSection />
<SSOAlert />
<div className="row">
<div className="col-md-5">
<AccountInfoSection />