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

Alerting: Fix possible undefined value in the form not being protected (#88860)

Browse Source 
Fix possible undefined value in the form not being protected
This commit is contained in:
Sonia Aguilar 2024-06-07 12:29:09 +02:00 committed by GitHub
parent a1851b4c0a
commit 372c9d46d5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
public/app/features/alerting/unified/components/receivers/form/fields/TemplateSelector.tsx
View File

@ -163,14 +163,14 @@ function TemplateSelector({ onSelect, onClose, option, valueInForm }: TemplateSe
// if we are using only one template, we should settemplate to that template
useEffect(() => {
if (matchesOnlyOneTemplate(valueInForm)) {
const name = getTemplateName(valueInForm);
setTemplate({
name,
content: getContentFromOptions(name, options),
});
} else {
if (Boolean(valueInForm)) {
if (Boolean(valueInForm)) {
if (matchesOnlyOneTemplate(valueInForm)) {
const name = getTemplateName(valueInForm);
setTemplate({
name,
content: getContentFromOptions(name, options),
});
} else {
// if it's empty we default to select existing template
setTemplateOption('Custom');
}
@ -303,20 +303,16 @@ export function WrapWithTemplateSelection({
name,
children,
}: WrapWithTemplateSelectionProps) {
const { getValues } = useFormContext();
const value: string = getValues(name) ?? '';
const emptyValue = value === '' || value === undefined;
const onlyOneTemplate = value ? matchesOnlyOneTemplate(value) : false;
const styles = useStyles2(getStyles);
const { getValues } = useFormContext();
const value = getValues(name) ?? '';
// if the placeholder does not contain a template, we don't need to show the template picker
if (!option.placeholder.includes('{{ template ')) {
if (!option.placeholder.includes('{{ template ') || typeof value !== 'string') {
return <>{children}</>;
}
// Otherwise, we can use templates on this field
// if the value is empty, we only show the template picker
if (emptyValue) {
if (!value) {
return (
<div className={styles.inputContainer}>
<Stack direction="row" gap={1} alignItems="center">
@ -327,6 +323,7 @@ export function WrapWithTemplateSelection({
</div>
);
}
const onlyOneTemplate = value ? matchesOnlyOneTemplate(value) : false;
if (onlyOneTemplate) {
return (
<div className={styles.inputContainer}>