IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Mihaly Gyongyosi 2025-02-14 18:05:36 +01:00
parent 7f20495289
commit 272a4534a8
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
public/app/features/auth-config/FieldRenderer.tsx
View File

@ -9,7 +9,10 @@ import { SSOProviderDTO, SSOSettingsField } from './types';
import { isSelectableValue } from './utils/guards';
interface FieldRendererProps
extends Pick<UseFormReturn<SSOProviderDTO>, 'register' | 'control' | 'watch' | 'setValue' | 'unregister'> {
extends Pick<
UseFormReturn<SSOProviderDTO>,
'register' | 'control' | 'watch' | 'setValue' | 'getValues' | 'unregister'
> {
field: SSOSettingsField;
errors: UseFormReturn['formState']['errors'];
secretConfigured: boolean;
@ -22,6 +25,7 @@ export const FieldRenderer = ({
errors,
watch,
setValue,
getValues,
control,
unregister,
secretConfigured,
@ -44,7 +48,13 @@ export const FieldRenderer = ({
useEffect(() => {
if (fieldData.defaultValue) {
setValue(name, fieldData.defaultValue.value);
const current = getValues(name);
const obj = fieldData.options?.find(
(option) =>
option.value ===
(Array.isArray(current) && current.length && 'value' in current[0] ? current[0].value : undefined)
);
setValue(name, obj?.value || fieldData.defaultValue.value);
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);

2
public/app/features/auth-config/ProviderConfigForm.tsx
View File

@ -41,6 +41,7 @@ export const ProviderConfigForm = ({ config, provider, isLoading }: ProviderConf
reset,
watch,
setValue,
getValues,
unregister,
formState: { errors, dirtyFields, isSubmitted },
} = useForm({ defaultValues: dataToDTO(config), mode: 'onSubmit', reValidateMode: 'onChange' });
@ -181,6 +182,7 @@ export const ProviderConfigForm = ({ config, provider, isLoading }: ProviderConf
control={control}
errors={errors}
setValue={setValue}
getValues={getValues}
register={register}
watch={watch}
unregister={unregister}