SONAR-21480 GlobalMessage + spinner

5 files changed, 10 insertions, 8 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 be769f58991..6d2fca0333a 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
@@ -70,7 +70,7 @@ function PermissionRow(props: Readonly<PermissionCellProps>) {
   return (
     <TableRowInteractive>
       <ContentCell scope="row" className="sw-whitespace-nowrap">
-        <div className="sw-flex sw-max-w-[150px] sw-items-center">
+        <div className="sw-flex sw-max-w-[330px] sw-items-center">
           <b
             className={mapping.isBaseRole ? 'sw-capitalize' : 'sw-truncate'}
             title={mapping.githubRole}
diff --git a/server/sonar-web/src/main/js/apps/settings/components/authentication/GitLabConfigurationForm.tsx b/server/sonar-web/src/main/js/apps/settings/components/authentication/GitLabConfigurationForm.tsx
index 8851567b3dc..9c195bbeea8 100644
--- a/server/sonar-web/src/main/js/apps/settings/components/authentication/GitLabConfigurationForm.tsx
+++ b/server/sonar-web/src/main/js/apps/settings/components/authentication/GitLabConfigurationForm.tsx
@@ -202,10 +202,12 @@ export default function GitLabConfigurationForm(props: Readonly<Props>) {
       onClose={props.onClose}
       body={formBody}
       primaryButton={
-        <ButtonPrimary form={FORM_ID} type="submit" disabled={!canBeSaved}>
-          {translate('settings.almintegration.form.save')}
-          <Spinner className="sw-ml-2" loading={createLoading || updateLoading} />
-        </ButtonPrimary>
+        <>
+          <Spinner loading={createLoading || updateLoading} />
+          <ButtonPrimary form={FORM_ID} type="submit" disabled={!canBeSaved}>
+            {translate('settings.almintegration.form.save')}
+          </ButtonPrimary>
+        </>
       }
     />
   );
diff --git a/server/sonar-web/src/main/js/queries/identity-provider/github.ts b/server/sonar-web/src/main/js/queries/identity-provider/github.ts
index 7cd0fd2a6d5..1fba6a530f7 100644
--- a/server/sonar-web/src/main/js/queries/identity-provider/github.ts
+++ b/server/sonar-web/src/main/js/queries/identity-provider/github.ts
@@ -18,6 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { addGlobalSuccessMessage } from 'design-system';
 import { isEqual, keyBy, partition, pick, unionBy } from 'lodash';
 import { useContext } from 'react';
 import {
@@ -32,7 +33,6 @@ import {
   updateGithubRolesMapping,
 } from '../../api/github-provisioning';
 import { AvailableFeaturesContext } from '../../app/components/available-features/AvailableFeaturesContext';
-import { addGlobalSuccessMessage } from '../../helpers/globalMessages';
 import { translate } from '../../helpers/l10n';
 import { mapReactQueryResult } from '../../helpers/react-query';
 import { Feature } from '../../types/features';
diff --git a/server/sonar-web/src/main/js/queries/identity-provider/gitlab.ts b/server/sonar-web/src/main/js/queries/identity-provider/gitlab.ts
index e16637fe1e7..11692886506 100644
--- a/server/sonar-web/src/main/js/queries/identity-provider/gitlab.ts
+++ b/server/sonar-web/src/main/js/queries/identity-provider/gitlab.ts
@@ -18,6 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { addGlobalSuccessMessage } from 'design-system';
 import { getActivity } from '../../api/ce';
 import {
   createGitLabConfiguration,
@@ -26,7 +27,6 @@ import {
   syncNowGitLabProvisioning,
   updateGitLabConfiguration,
 } from '../../api/gitlab-provisioning';
-import { addGlobalSuccessMessage } from '../../helpers/globalMessages';
 import { translate } from '../../helpers/l10n';
 import { AlmSyncStatus, ProvisioningType } from '../../types/provisioning';
 import { TaskStatuses, TaskTypes } from '../../types/tasks';
diff --git a/server/sonar-web/src/main/js/queries/settings.ts b/server/sonar-web/src/main/js/queries/settings.ts
index 676fc207c9f..0ecaa2a37fe 100644
--- a/server/sonar-web/src/main/js/queries/settings.ts
+++ b/server/sonar-web/src/main/js/queries/settings.ts
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { addGlobalSuccessMessage } from 'design-system';
 import { getValue, getValues, resetSettingValue, setSettingValue } from '../api/settings';
-import { addGlobalSuccessMessage } from '../helpers/globalMessages';
 import { translate } from '../helpers/l10n';
 import { ExtendedSettingDefinition } from '../types/settings';