SONAR-20532 Provisioning Change - Discrepancy in button color

diff --git a/server/sonar-web/src/main/js/apps/settings/components/authentication/GithubAuthenticationTab.tsx b/server/sonar-web/src/main/js/apps/settings/components/authentication/GithubAuthenticationTab.tsx
index a7f7d6a993f1706065d73869403abd46d0b2649e..7843eec2a5f8f4a0857cdacbbb167cf24685a2e4 100644 (file)
--- a/server/sonar-web/src/main/js/apps/settings/components/authentication/GithubAuthenticationTab.tsx
+++ b/server/sonar-web/src/main/js/apps/settings/components/authentication/GithubAuthenticationTab.tsx
@@ -406,8 +406,9 @@ export default function GithubAuthenticationTab(props: GithubAuthenticationProps
                     newGithubProvisioningStatus ? 'auto' : 'jit',
                   )}
                   onClose={() => setShowConfirmProvisioningModal(false)}
-                  isDestructive={!newGithubProvisioningStatus}
-                  confirmButtonText={translate('yes')}
+                  confirmButtonText={translate(
+                    'settings.authentication.github.provisioning_change.confirm_changes',
+                  )}
                 >
                   {translate(
                     'settings.authentication.github.confirm',

diff --git a/server/sonar-web/src/main/js/apps/settings/components/authentication/__tests__/Authentication-it.tsx b/server/sonar-web/src/main/js/apps/settings/components/authentication/__tests__/Authentication-it.tsx
index d2a216a92d20a211b974134e978659489f041e71..450e66cddc25d235d8d099454496737cd64c0a65 100644 (file)
--- a/server/sonar-web/src/main/js/apps/settings/components/authentication/__tests__/Authentication-it.tsx
+++ b/server/sonar-web/src/main/js/apps/settings/components/authentication/__tests__/Authentication-it.tsx
@@ -92,7 +92,9 @@ const ui = {
     userLoginAttribute: byRole('textbox', { name: 'property.sonar.auth.saml.user.login.name' }),
     userNameAttribute: byRole('textbox', { name: 'property.sonar.auth.saml.user.name.name' }),
     saveConfigButton: byRole('button', { name: 'settings.almintegration.form.save' }),
-    confirmProvisioningButton: byRole('button', { name: 'yes' }),
+    confirmProvisioningButton: byRole('button', {
+      name: 'yes',
+    }),
     saveScim: byRole('button', { name: 'save' }),
     enableConfigButton: byRole('button', { name: 'settings.authentication.form.enable' }),
     disableConfigButton: byRole('button', { name: 'settings.authentication.form.disable' }),
@@ -142,7 +144,9 @@ const ui = {
     }),
     organizations: byRole('textbox', { name: 'property.sonar.auth.github.organizations.name' }),
     saveConfigButton: byRole('button', { name: 'settings.almintegration.form.save' }),
-    confirmProvisioningButton: byRole('button', { name: 'yes' }),
+    confirmProvisioningButton: byRole('button', {
+      name: 'settings.authentication.github.provisioning_change.confirm_changes',
+    }),
     saveGithubProvisioning: byRole('button', { name: 'save' }),
     groupAttribute: byRole('textbox', { name: 'property.sonar.auth.github.group.name.name' }),
     enableConfigButton: byRole('button', { name: 'settings.authentication.form.enable' }),

diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index edf1ffbd378903c55987ba165427ad95857f04ba..5ea2c62b47bc95129e054aac770b253b0cc7c680 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -1505,6 +1505,7 @@ settings.authentication.github.confirm_auto_provisioning.description2=This provi
 settings.authentication.github.confirm_auto_provisioning.question=Which provisioning method would you like to use?
 settings.authentication.github.confirm_auto_provisioning.continue=Automatic user, group, and permission provisioning
 settings.authentication.github.confirm_auto_provisioning.switch_jit=Just-in-Time user and group provisioning
+settings.authentication.github.provisioning_change.confirm_changes=Confirm Changes
 settings.authentication.github.configuration=GitHub Configuration
 settings.authentication.github.form.not_configured=GitHub App is not configured
 settings.authentication.github.form.legacy_configured=Compatibility with GitHub OAuth App is deprecated and will be removed in a future release. Your configuration will continue to work but with limited support. We recommend using GitHub Apps. Check out the {documentation} for more information.