From b47a3e09326fce2ff1ab0f3bef83600c4f1a4e37 Mon Sep 17 00:00:00 2001
From: pal-sig <88981777+pal-sig@users.noreply.github.com>
Date: Mon, 22 Nov 2021 15:47:34 +0530
Subject: [PATCH] fix(BUG): alert mapping is updated (#402)

---
 .../src/container/TriggeredAlerts/TriggeredAlert.tsx     | 6 +++---
 frontend/src/container/TriggeredAlerts/index.tsx         | 9 ++++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/frontend/src/container/TriggeredAlerts/TriggeredAlert.tsx b/frontend/src/container/TriggeredAlerts/TriggeredAlert.tsx
index 3bba01dec6..1dff31decd 100644
--- a/frontend/src/container/TriggeredAlerts/TriggeredAlert.tsx
+++ b/frontend/src/container/TriggeredAlerts/TriggeredAlert.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { Group } from 'types/api/alerts/getGroups';
+import { Alerts } from 'types/api/alerts/getAll';
 
 import { Value } from './Filter';
 import Filter from './Filter';
@@ -8,7 +8,7 @@ import NoFilterTable from './NoFilterTable';
 import { NoTableContainer } from './styles';
 
 const TriggeredAlerts = ({ allAlerts }: TriggeredAlertsProps): JSX.Element => {
-	const allInitialAlerts = allAlerts?.alerts || [];
+	const allInitialAlerts = allAlerts || [];
 
 	const [selectedGroup, setSelectedGroup] = useState<Value[]>([]);
 	const [selectedFilter, setSelectedFilter] = useState<Value[]>([]);
@@ -57,7 +57,7 @@ const TriggeredAlerts = ({ allAlerts }: TriggeredAlertsProps): JSX.Element => {
 };
 
 interface TriggeredAlertsProps {
-	allAlerts: Group;
+	allAlerts: Alerts[];
 }
 
 export default TriggeredAlerts;
diff --git a/frontend/src/container/TriggeredAlerts/index.tsx b/frontend/src/container/TriggeredAlerts/index.tsx
index dedafe325c..192e860dbd 100644
--- a/frontend/src/container/TriggeredAlerts/index.tsx
+++ b/frontend/src/container/TriggeredAlerts/index.tsx
@@ -2,6 +2,7 @@ import getGroupApi from 'api/alerts/getGroup';
 import Spinner from 'components/Spinner';
 import { State } from 'hooks/useFetch';
 import React, { useCallback, useEffect, useState } from 'react';
+import { Alerts } from 'types/api/alerts/getAll';
 import { PayloadProps } from 'types/api/alerts/getGroups';
 
 import TriggerComponent from './TriggeredAlert';
@@ -64,7 +65,13 @@ const TriggeredAlerts = (): JSX.Element => {
 		return <Spinner height="75vh" tip="Loading Alerts..." />;
 	}
 
-	return <TriggerComponent allAlerts={groupState.payload[0]} />;
+	const initialAlerts: Alerts[] = [];
+
+	const allAlerts: Alerts[] = groupState.payload.reduce((acc, curr) => {
+		return [...acc, ...curr.alerts];
+	}, initialAlerts);
+
+	return <TriggerComponent allAlerts={allAlerts} />;
 };
 
 export default TriggeredAlerts;