Просмотр исходного кода

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

[Settings] Enabled SSO Journey alerts

GitOrigin-RevId: 05e3964d79e39d91d02fc9282141dbd374dae5ad
Timothée Alby 4 лет назад
Родитель
Сommit
5d20df4e56

+ 7 - 3
services/web/frontend/js/features/settings/components/emails/sso-alert.tsx

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

+ 2 - 0
services/web/frontend/js/features/settings/components/root.tsx

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