diff --git a/public/app/features/auth-config/ProviderConfigForm.tsx b/public/app/features/auth-config/ProviderConfigForm.tsx index 90b5d8bb061..1545e87f30a 100644 --- a/public/app/features/auth-config/ProviderConfigForm.tsx +++ b/public/app/features/auth-config/ProviderConfigForm.tsx @@ -1,4 +1,4 @@ -import { useState } from 'react'; +import { useMemo, useState } from 'react'; import { useForm } from 'react-hook-form'; import { AppEvents } from '@grafana/data'; @@ -22,7 +22,7 @@ import { FormPrompt } from '../../core/components/FormPrompt/FormPrompt'; import { Page } from '../../core/components/Page/Page'; import { FieldRenderer } from './FieldRenderer'; -import { sectionFields } from './fields'; +import { getSectionFields } from './fields'; import { SSOProvider, SSOProviderDTO } from './types'; import { dataToDTO, dtoToData } from './utils/data'; @@ -49,7 +49,7 @@ export const ProviderConfigForm = ({ config, provider, isLoading }: ProviderConf const [isSaving, setIsSaving] = useState(false); const [submitError, setSubmitError] = useState(false); const dataSubmitted = isSubmitted && !submitError; - const sections = sectionFields[provider]; + const sections = useMemo(() => getSectionFields()[provider], [provider]); const [resetConfig, setResetConfig] = useState(false); const additionalActionsMenu = ( @@ -211,7 +211,13 @@ export const ProviderConfigForm = ({ config, provider, isLoading }: ProviderConf onClick={() => onSaveAttempt(true)} variant={isEnabled ? 'secondary' : undefined} > - {isSaving ? (isEnabled ? 'Disabling...' : 'Saving...') : isEnabled ? 'Disable' : 'Save and enable'} + {isSaving + ? isEnabled + ? t('auth-config.provider-config-form.disabling', 'Disabling...') + : t('auth-config.provider-config-form.saving', 'Saving...') + : isEnabled + ? t('auth-config.provider-config-form.disable', 'Disable') + : t('auth-config.provider-config-form.save-and-enable', 'Save and enable')}