From 730a5a205cec256b834627b46b18198778de808a Mon Sep 17 00:00:00 2001
From: guillaume-peoch-sonarsource <guillaume.peoch@sonarsource.com>
Date: Thu, 28 Sep 2023 17:54:47 +0200
Subject: [PATCH] SONAR-20532 Move warning message in Github Role mapping

---
 .../authentication/GitHubMappingModal.tsx          | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/server/sonar-web/src/main/js/apps/settings/components/authentication/GitHubMappingModal.tsx b/server/sonar-web/src/main/js/apps/settings/components/authentication/GitHubMappingModal.tsx
index 92700f3ea03..e889bcda3a0 100644
--- a/server/sonar-web/src/main/js/apps/settings/components/authentication/GitHubMappingModal.tsx
+++ b/server/sonar-web/src/main/js/apps/settings/components/authentication/GitHubMappingModal.tsx
@@ -191,12 +191,7 @@ export default function GitHubMappingModal({ mapping, setMapping, onClose }: Rea
                 />
               ))}
             <tr>
-              <td colSpan={7} className="sw-pt-5 sw-border-t">
-                <Alert variant="info">
-                  {translate(
-                    'settings.authentication.github.configuration.roles_mapping.dialog.custom_roles_description',
-                  )}
-                </Alert>
+              <td colSpan={7} className="sw-pt-2 sw-border-t">
                 <form
                   className="sw-flex sw-h-9 sw-items-center"
                   onSubmit={validateAndAddCustomRole}
@@ -242,6 +237,13 @@ export default function GitHubMappingModal({ mapping, setMapping, onClose }: Rea
           </tbody>
         </table>
         <Spinner loading={isLoading} />
+        <div className="sw-bg-white sw-bottom-0 sw-sticky">
+          <Alert variant="info" className="sw-m-2">
+            {translate(
+              'settings.authentication.github.configuration.roles_mapping.dialog.custom_roles_description',
+            )}
+          </Alert>
+        </div>
       </div>
       <div className="modal-foot">
         <div className="sw-flex sw-items-center sw-justify-end sw-h-8">
-- 
2.39.5