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: temporarily add old ng routes (#32770)

Browse Source
This commit is contained in:
Domas 2021-04-08 12:52:43 +03:00 committed by GitHub
parent bba4d9bd7f
commit 33a4cfde51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/alerting/AlertRuleList.tsx
View File

@ -121,7 +121,7 @@ export class AlertRuleListUnconnected extends PureComponent<Props> {
</div>
<div className="page-action-bar__spacer" />
{config.featureToggles.ngalert && (
<LinkButton variant="primary" href="alerting/new">
<LinkButton variant="primary" href="alerting/ng/new">
Add NG Alert
</LinkButton>
)}

2
public/app/features/alerting/NextGenAlertingPage.tsx
View File

@ -98,7 +98,7 @@ class NextGenAlertingPageUnconnected extends PureComponent<Props> {
};
onDiscard = () => {
locationService.replace(`${config.appSubUrl}/alerting/list`);
locationService.replace(`${config.appSubUrl}/alerting/ng/list`);
};
onTest = () => {

12
public/app/features/alerting/components/AlertDefinitionItem.tsx
View File

@ -4,6 +4,7 @@ import Highlighter from 'react-highlight-words';
import { FeatureState } from '@grafana/data';
import { Card, FeatureBadge, Icon, LinkButton } from '@grafana/ui';
import { AlertDefinition } from 'app/types';
import { config } from '@grafana/runtime';
interface Props {
alertDefinition: AlertDefinition;
@ -23,7 +24,16 @@ export const AlertDefinitionItem: FC<Props> = ({ alertDefinition, search }) => {
</Card.Meta>
<Card.Actions>
{[
<LinkButton key="edit" variant="secondary" href={`/alerting/${alertDefinition.uid}/edit`} icon="cog">
<LinkButton
key="edit"
variant="secondary"
href={
config.featureToggles.ngalert
? `/alerting/ng/${alertDefinition.uid}/edit`
: `/alerting/${alertDefinition.uid}/edit`
}
icon="cog"
>
Edit alert
</LinkButton>,
]}

2
public/app/features/alerting/state/actions.ts
View File

@ -123,7 +123,7 @@ export function createAlertDefinition(): ThunkResult<void> {
const alertDefinition = await buildAlertDefinition(getStore().alertDefinition);
await getBackendSrv().post(`/api/alert-definitions`, alertDefinition);
appEvents.emit(AppEvents.alertSuccess, ['Alert definition created']);
locationService.push('/alerting/list');
locationService.push('/alerting/ng/list');
};
}

26
public/app/routes/routes.tsx
View File

@ -347,7 +347,13 @@ export function getAppRoutes(): RouteDescriptor[] {
{
path: '/alerting/list',
component: SafeDynamicImport(
() => import(/* webpackChunkName: "AlertRuleList" */ 'app/features/alerting/AlertRuleListIndex')
() => import(/* webpackChunkName: "AlertRuleListIndex" */ 'app/features/alerting/AlertRuleListIndex')
),
},
{
path: '/alerting/ng/list',
component: SafeDynamicImport(
() => import(/* webpackChunkName: "AlertRuleList" */ 'app/features/alerting/AlertRuleList')
),
},
{
@ -383,20 +389,34 @@ export function getAppRoutes(): RouteDescriptor[] {
component: SafeDynamicImport(
() =>
import(
/* webpackChunkName: "NgAlertingPage"*/ 'app/features/alerting/unified/components/rule-editor/AlertRuleForm'
/* webpackChunkName: "AlertingRuleForm"*/ 'app/features/alerting/unified/components/rule-editor/AlertRuleForm'
)
),
},
{
path: '/alerting/ng/new',
pageClass: 'page-alerting',
component: SafeDynamicImport(
() => import(/* webpackChunkName: "NgAlertingPage"*/ 'app/features/alerting/NextGenAlertingPage')
),
},
{
path: '/alerting/:id/edit',
pageClass: 'page-alerting',
component: SafeDynamicImport(
() =>
import(
/* webpackChunkName: "NgAlertingPage"*/ 'app/features/alerting/unified/components/rule-editor/AlertRuleForm'
/* webpackChunkName: "AlertingRuleForm"*/ 'app/features/alerting/unified/components/rule-editor/AlertRuleForm'
)
),
},
{
path: '/alerting/ng/:id/edit',
pageClass: 'page-alerting',
component: SafeDynamicImport(
() => import(/* webpackChunkName: "NgAlertingPage"*/ 'app/features/alerting/NextGenAlertingPage')
),
},
{
path: '/playlists',
component: SafeDynamicImport(