SONAR-21244 Hide the Provisioning block if the GitLab config is not set

diff --git a/server/sonar-web/src/main/js/apps/settings/components/authentication/GitLabAuthenticationTab.tsx b/server/sonar-web/src/main/js/apps/settings/components/authentication/GitLabAuthenticationTab.tsx
index 64a049132b66e5c53b54d3b2942eb57ded489495..1a970bcdf8bbb40b4a3c64fbdf0c00a7a51b8f9d 100644 (file)
--- a/server/sonar-web/src/main/js/apps/settings/components/authentication/GitLabAuthenticationTab.tsx
+++ b/server/sonar-web/src/main/js/apps/settings/components/authentication/GitLabAuthenticationTab.tsx
@@ -278,195 +278,199 @@ export default function GitLabAuthenticationTab() {
             </div>
           </div>
         )}
-        <div className="spacer-bottom big-padded bordered">
-          <form onSubmit={handleSubmit}>
-            <fieldset className="display-flex-column big-spacer-bottom">
-              <label className="h5">{translate('settings.authentication.form.provisioning')}</label>
+        {configuration && (
+          <div className="spacer-bottom big-padded bordered">
+            <form onSubmit={handleSubmit}>
+              <fieldset className="display-flex-column big-spacer-bottom">
+                <label className="h5">
+                  {translate('settings.authentication.form.provisioning')}
+                </label>
 
-              {configuration?.enabled ? (
-                <div className="display-flex-column spacer-top">
-                  <RadioCard
-                    className="sw-min-h-0"
-                    label={translate('settings.authentication.gitlab.provisioning_at_login')}
-                    title={translate('settings.authentication.gitlab.provisioning_at_login')}
-                    selected={provisioningType === ProvisioningType.jit}
-                    onClick={setJIT}
-                  >
-                    <p className="spacer-bottom">
-                      <FormattedMessage id="settings.authentication.gitlab.provisioning_at_login.description" />
-                    </p>
-                    <p className="spacer-bottom">
-                      <DocLink
-                        to={`/instance-administration/authentication/${
-                          DOCUMENTATION_LINK_SUFFIXES[AlmKeys.GitLab]
-                        }/#choosing-the-provisioning-method`}
-                      >
-                        {translate(
-                          `settings.authentication.gitlab.description.${ProvisioningType.jit}.learn_more`,
+                {configuration.enabled ? (
+                  <div className="display-flex-column spacer-top">
+                    <RadioCard
+                      className="sw-min-h-0"
+                      label={translate('settings.authentication.gitlab.provisioning_at_login')}
+                      title={translate('settings.authentication.gitlab.provisioning_at_login')}
+                      selected={provisioningType === ProvisioningType.jit}
+                      onClick={setJIT}
+                    >
+                      <p className="spacer-bottom">
+                        <FormattedMessage id="settings.authentication.gitlab.provisioning_at_login.description" />
+                      </p>
+                      <p className="spacer-bottom">
+                        <DocLink
+                          to={`/instance-administration/authentication/${
+                            DOCUMENTATION_LINK_SUFFIXES[AlmKeys.GitLab]
+                          }/#choosing-the-provisioning-method`}
+                        >
+                          {translate(
+                            `settings.authentication.gitlab.description.${ProvisioningType.jit}.learn_more`,
+                          )}
+                        </DocLink>
+                      </p>
+                      {provisioningType === ProvisioningType.jit &&
+                        allowUsersToSignUpDefinition !== undefined && (
+                          <AuthenticationFormField
+                            settingValue={allowUsersToSignUp}
+                            definition={allowUsersToSignUpDefinition}
+                            mandatory
+                            onFieldChange={(_, value) =>
+                              setChangesWithCheck({
+                                ...changes,
+                                allowUsersToSignUp: value as boolean,
+                              })
+                            }
+                            isNotSet={configuration.provisioningType !== ProvisioningType.auto}
+                          />
                         )}
-                      </DocLink>
-                    </p>
-                    {provisioningType === ProvisioningType.jit &&
-                      allowUsersToSignUpDefinition !== undefined && (
-                        <AuthenticationFormField
-                          settingValue={allowUsersToSignUp}
-                          definition={allowUsersToSignUpDefinition}
-                          mandatory
-                          onFieldChange={(_, value) =>
-                            setChangesWithCheck({
-                              ...changes,
-                              allowUsersToSignUp: value as boolean,
-                            })
-                          }
-                          isNotSet={configuration.provisioningType !== ProvisioningType.auto}
-                        />
+                    </RadioCard>
+                    <RadioCard
+                      className="spacer-top sw-min-h-0"
+                      label={translate(
+                        'settings.authentication.gitlab.form.provisioning_with_gitlab',
                       )}
-                  </RadioCard>
-                  <RadioCard
-                    className="spacer-top sw-min-h-0"
-                    label={translate(
-                      'settings.authentication.gitlab.form.provisioning_with_gitlab',
-                    )}
-                    title={translate(
-                      'settings.authentication.gitlab.form.provisioning_with_gitlab',
-                    )}
-                    selected={provisioningType === ProvisioningType.auto}
-                    onClick={setAuto}
-                    disabled={!hasGitlabProvisioningFeature || hasDifferentProvider}
-                  >
-                    {hasGitlabProvisioningFeature ? (
-                      <>
-                        {hasDifferentProvider && (
-                          <p className="spacer-bottom text-bold ">
-                            {translate('settings.authentication.form.other_provisioning_enabled')}
-                          </p>
-                        )}
-                        <p className="spacer-bottom">
-                          {translate(
-                            'settings.authentication.gitlab.form.provisioning_with_gitlab.description',
+                      title={translate(
+                        'settings.authentication.gitlab.form.provisioning_with_gitlab',
+                      )}
+                      selected={provisioningType === ProvisioningType.auto}
+                      onClick={setAuto}
+                      disabled={!hasGitlabProvisioningFeature || hasDifferentProvider}
+                    >
+                      {hasGitlabProvisioningFeature ? (
+                        <>
+                          {hasDifferentProvider && (
+                            <p className="spacer-bottom text-bold ">
+                              {translate('settings.authentication.form.other_provisioning_enabled')}
+                            </p>
                           )}
-                        </p>
-                        <p className="spacer-bottom">
-                          <DocLink
-                            to={`/instance-administration/authentication/${
-                              DOCUMENTATION_LINK_SUFFIXES[AlmKeys.GitLab]
-                            }/#choosing-the-provisioning-method`}
-                          >
+                          <p className="spacer-bottom">
                             {translate(
-                              `settings.authentication.gitlab.description.${ProvisioningType.auto}.learn_more`,
+                              'settings.authentication.gitlab.form.provisioning_with_gitlab.description',
                             )}
-                          </DocLink>
-                        </p>
+                          </p>
+                          <p className="spacer-bottom">
+                            <DocLink
+                              to={`/instance-administration/authentication/${
+                                DOCUMENTATION_LINK_SUFFIXES[AlmKeys.GitLab]
+                              }/#choosing-the-provisioning-method`}
+                            >
+                              {translate(
+                                `settings.authentication.gitlab.description.${ProvisioningType.auto}.learn_more`,
+                              )}
+                            </DocLink>
+                          </p>
 
-                        {configuration?.provisioningType === ProvisioningType.auto && (
-                          <GitLabSynchronisationWarning />
-                        )}
+                          {configuration.provisioningType === ProvisioningType.auto && (
+                            <GitLabSynchronisationWarning />
+                          )}
 
-                        {provisioningType === ProvisioningType.auto && (
-                          <>
-                            <div className="sw-flex sw-flex-1 spacer-bottom">
-                              <Button
-                                className="spacer-top width-30"
-                                onClick={synchronizeNow}
-                                disabled={!canSyncNow}
-                              >
-                                {translate('settings.authentication.github.synchronize_now')}
-                              </Button>
-                            </div>
-                            <hr />
-                            <AuthenticationFormField
-                              settingValue={provisioningToken}
-                              key={tokenKey}
-                              definition={provisioningTokenDefinition}
-                              mandatory
-                              onFieldChange={(_, value) =>
-                                setChangesWithCheck({
-                                  ...changes,
-                                  provisioningToken: value as string,
-                                })
-                              }
-                              isNotSet={
-                                configuration.provisioningType !== ProvisioningType.auto &&
-                                configuration.provisioningGroups?.length === 0
-                              }
-                            />
-                            <AuthenticationFormField
-                              settingValue={groups}
-                              definition={provisioningGroupDefinition}
-                              mandatory
-                              onFieldChange={(_, values) =>
-                                setChangesWithCheck({
-                                  ...changes,
-                                  provisioningGroups: values as string[],
-                                })
-                              }
-                              isNotSet={configuration.provisioningType !== ProvisioningType.auto}
-                            />
-                          </>
-                        )}
-                      </>
-                    ) : (
-                      <p>
-                        <FormattedMessage
-                          id="settings.authentication.gitlab.form.provisioning.disabled"
-                          defaultMessage={translate(
-                            'settings.authentication.gitlab.form.provisioning.disabled',
+                          {provisioningType === ProvisioningType.auto && (
+                            <>
+                              <div className="sw-flex sw-flex-1 spacer-bottom">
+                                <Button
+                                  className="spacer-top width-30"
+                                  onClick={synchronizeNow}
+                                  disabled={!canSyncNow}
+                                >
+                                  {translate('settings.authentication.github.synchronize_now')}
+                                </Button>
+                              </div>
+                              <hr />
+                              <AuthenticationFormField
+                                settingValue={provisioningToken}
+                                key={tokenKey}
+                                definition={provisioningTokenDefinition}
+                                mandatory
+                                onFieldChange={(_, value) =>
+                                  setChangesWithCheck({
+                                    ...changes,
+                                    provisioningToken: value as string,
+                                  })
+                                }
+                                isNotSet={
+                                  configuration.provisioningType !== ProvisioningType.auto &&
+                                  configuration.provisioningGroups?.length === 0
+                                }
+                              />
+                              <AuthenticationFormField
+                                settingValue={groups}
+                                definition={provisioningGroupDefinition}
+                                mandatory
+                                onFieldChange={(_, values) =>
+                                  setChangesWithCheck({
+                                    ...changes,
+                                    provisioningGroups: values as string[],
+                                  })
+                                }
+                                isNotSet={configuration.provisioningType !== ProvisioningType.auto}
+                              />
+                            </>
                           )}
-                          values={{
-                            documentation: (
-                              <DocLink to="/instance-administration/authentication/gitlab">
-                                {translate('documentation')}
-                              </DocLink>
-                            ),
-                          }}
-                        />
-                      </p>
-                    )}
-                  </RadioCard>
+                        </>
+                      ) : (
+                        <p>
+                          <FormattedMessage
+                            id="settings.authentication.gitlab.form.provisioning.disabled"
+                            defaultMessage={translate(
+                              'settings.authentication.gitlab.form.provisioning.disabled',
+                            )}
+                            values={{
+                              documentation: (
+                                <DocLink to="/instance-administration/authentication/gitlab">
+                                  {translate('documentation')}
+                                </DocLink>
+                              ),
+                            }}
+                          />
+                        </p>
+                      )}
+                    </RadioCard>
+                  </div>
+                ) : (
+                  <Alert className="big-spacer-top" variant="info">
+                    {translate('settings.authentication.gitlab.enable_first')}
+                  </Alert>
+                )}
+              </fieldset>
+              {configuration.enabled && (
+                <div className="sw-flex sw-gap-2 sw-h-8 sw-items-center">
+                  <SubmitButton disabled={!canSave()}>{translate('save')}</SubmitButton>
+                  <ResetButtonLink
+                    onClick={() => {
+                      setChanges(undefined);
+                      setTokenKey(tokenKey + 1);
+                    }}
+                    disabled={false}
+                  >
+                    {translate('cancel')}
+                  </ResetButtonLink>
+                  <Alert variant="warning" className="sw-mb-0">
+                    {canSave() &&
+                      translate('settings.authentication.gitlab.configuration.unsaved_changes')}
+                  </Alert>
+                  <Spinner loading={isUpdating} />
                 </div>
-              ) : (
-                <Alert className="big-spacer-top" variant="info">
-                  {translate('settings.authentication.github.enable_first')}
-                </Alert>
               )}
-            </fieldset>
-            {configuration?.enabled && (
-              <div className="sw-flex sw-gap-2 sw-h-8 sw-items-center">
-                <SubmitButton disabled={!canSave()}>{translate('save')}</SubmitButton>
-                <ResetButtonLink
-                  onClick={() => {
-                    setChanges(undefined);
-                    setTokenKey(tokenKey + 1);
-                  }}
-                  disabled={false}
+              {showConfirmProvisioningModal && provisioningType && (
+                <ConfirmModal
+                  onConfirm={updateProvisioning}
+                  header={translate('settings.authentication.gitlab.confirm', provisioningType)}
+                  onClose={() => setShowConfirmProvisioningModal(false)}
+                  confirmButtonText={translate(
+                    'settings.authentication.gitlab.provisioning_change.confirm_changes',
+                  )}
                 >
-                  {translate('cancel')}
-                </ResetButtonLink>
-                <Alert variant="warning" className="sw-mb-0">
-                  {canSave() &&
-                    translate('settings.authentication.gitlab.configuration.unsaved_changes')}
-                </Alert>
-                <Spinner loading={isUpdating} />
-              </div>
-            )}
-            {showConfirmProvisioningModal && provisioningType && (
-              <ConfirmModal
-                onConfirm={updateProvisioning}
-                header={translate('settings.authentication.gitlab.confirm', provisioningType)}
-                onClose={() => setShowConfirmProvisioningModal(false)}
-                confirmButtonText={translate(
-                  'settings.authentication.gitlab.provisioning_change.confirm_changes',
-                )}
-              >
-                {translate(
-                  'settings.authentication.gitlab.confirm',
-                  provisioningType,
-                  'description',
-                )}
-              </ConfirmModal>
-            )}
-          </form>
-        </div>
+                  {translate(
+                    'settings.authentication.gitlab.confirm',
+                    provisioningType,
+                    'description',
+                  )}
+                </ConfirmModal>
+              )}
+            </form>
+          </div>
+        )}
       </div>
       {openForm && (
         <GitLabConfigurationForm data={configuration ?? null} onClose={() => setOpenForm(false)} />

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 755c961394820a231cacc0888bbf6471094aed37..f162c8c0c84ae3fc8c6490e60060e0c12100c580 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -1596,6 +1596,7 @@ settings.authentication.gitlab.form.allowUsersToSignUp.name=Allow users to sign
 settings.authentication.gitlab.form.allowUsersToSignUp.description=Allow new users to authenticate. When set to disabled, only existing users will be able to authenticate to the server.
 settings.authentication.gitlab.form.provisioningToken.name=Provisioning token
 settings.authentication.gitlab.form.provisioningToken.description=Token used for user provisioning. You can either use a group or a personal access token, as long as it has visibility on the groups that need to be imported.
+settings.authentication.gitlab.enable_first=Enable your GitLab configuration for more provisioning options.
 settings.authentication.gitlab.provisioning_at_login=Just-in-Time user provisioning (default)
 settings.authentication.gitlab.provisioning_at_login.description=Users are synchronized only when users log in to SonarQube.
 settings.authentication.gitlab.description.JIT.learn_more=Learn more about Just-in-Time provisioning with GitLab