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 removing nested policy (#85242)

Browse Source
This commit is contained in:
Gilles De Mey 2024-03-27 12:58:59 +01:00 committed by GitHub
parent cec25113f6
commit a574db6f64
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/features/alerting/unified/utils/routeTree.test.ts
View File

@ -65,14 +65,17 @@ describe('omitRouteFromRouteTree', () => {
receiver: 'root', receiver: 'root',
routes: [ routes: [
{ id: 'route-2', receiver: 'receiver-2' }, { id: 'route-2', receiver: 'receiver-2' },
{ id: 'route-3', receiver: 'receiver-3' }, { id: 'route-3', receiver: 'receiver-3', routes: [{ id: 'route-4', receiver: 'receiver-4' }] },
], ],
}; };
expect(omitRouteFromRouteTree({ id: 'route-2' }, tree)).toEqual({ expect(omitRouteFromRouteTree({ id: 'route-4' }, tree)).toEqual({
id: 'route-1', id: 'route-1',
receiver: 'root', receiver: 'root',
routes: [{ id: 'route-3', receiver: 'receiver-3', routes: undefined }], routes: [
{ id: 'route-2', receiver: 'receiver-2' },
{ id: 'route-3', receiver: 'receiver-3', routes: [] },
],
}); });
}); });

2
public/app/features/alerting/unified/utils/routeTree.ts
View File

@ -58,7 +58,7 @@ export const omitRouteFromRouteTree = (findRoute: RouteWithID, routeTree: RouteW
return acc; return acc;
} }
acc.push(route); acc.push(findAndOmit(route));
return acc; return acc;
}, []), }, []),
}; };