Alerting: misc fixes (#33070)

This commit is contained in:
Domas
2021-04-19 12:53:02 +03:00
committed by GitHub
parent 41f6af96c4
commit 382cab6406
14 changed files with 137 additions and 56 deletions

View File

@@ -18,6 +18,7 @@ import { useDispatch } from 'react-redux';
import { useCleanup } from 'app/core/hooks/useCleanup';
import { rulerRuleToFormValues, defaultFormValues } from '../../utils/rule-form';
import { Link } from 'react-router-dom';
import { config } from '@grafana/runtime';
type Props = {
existing?: RuleWithLocation;
@@ -56,6 +57,7 @@ export const AlertRuleForm: FC<Props> = ({ existing }) => {
dispatch(
saveRuleFormAction({
values: {
...defaultValues,
...values,
annotations: values.annotations?.filter(({ key }) => !!key) ?? [],
labels: values.labels?.filter(({ key }) => !!key) ?? [],
@@ -70,7 +72,7 @@ export const AlertRuleForm: FC<Props> = ({ existing }) => {
<FormContext {...formAPI}>
<form onSubmit={handleSubmit((values) => submit(values, false))} className={styles.form}>
<PageToolbar title="Create alert rule" pageIcon="bell" className={styles.toolbar}>
<Link to="/alerting/list">
<Link to={`${config.appSubUrl ?? ''}/alerting/list`}>
<ToolbarButton variant="default" disabled={submitState.loading} type="button">
Cancel
</ToolbarButton>