From 23db630e7164e6790e21451819241d6e808bc632 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 02:07:24 +0000
Subject: [PATCH] Adding MDS support in Notifications page in ISM (#1121)

Signed-off-by: Ramakrishna Chilaka <ramachil@amazon.com>
(cherry picked from commit 018b83181c21f6d0643de81625b7320aa762a064)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 public/pages/Main/Main.tsx                    |  2 ++
 .../Notifications/Notifications.tsx           | 20 ++++++-------------
 server/services/NotificationService.ts        |  1 -
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/public/pages/Main/Main.tsx b/public/pages/Main/Main.tsx
index fc0590be7..ba58307d6 100644
--- a/public/pages/Main/Main.tsx
+++ b/public/pages/Main/Main.tsx
@@ -189,6 +189,7 @@ const dataSourceEnabledPaths: string[] = [
   ROUTES.REPOSITORIES,
   ROUTES.CREATE_REPOSITORY,
   ROUTES.EDIT_REPOSITORY,
+  ROUTES.NOTIFICATIONS,
 ];
 
 const LocalCluster: DataSourceOption = {
@@ -521,6 +522,7 @@ export default class Main extends Component<MainProps, MainState> {
                                 ROUTES.REPOSITORIES,
                                 ROUTES.CREATE_REPOSITORY,
                                 ROUTES.EDIT_REPOSITORY,
+                                ROUTES.NOTIFICATIONS,
                               ]}
                               render={() => (
                                 <DataSourceMenu
diff --git a/public/pages/Notifications/containers/Notifications/Notifications.tsx b/public/pages/Notifications/containers/Notifications/Notifications.tsx
index 8020d01b9..953930013 100644
--- a/public/pages/Notifications/containers/Notifications/Notifications.tsx
+++ b/public/pages/Notifications/containers/Notifications/Notifications.tsx
@@ -5,18 +5,7 @@
 
 import React, { ReactChild, useContext, useEffect, useRef, useState } from "react";
 import { unstable_batchedUpdates } from "react-dom";
-import {
-  EuiButton,
-  EuiCallOut,
-  EuiCard,
-  EuiEmptyPrompt,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiPanel,
-  EuiSpacer,
-  EuiText,
-  EuiTitle,
-} from "@elastic/eui";
+import { EuiButton, EuiCallOut, EuiEmptyPrompt, EuiFlexGroup, EuiFlexItem, EuiPanel, EuiSpacer, EuiText, EuiTitle } from "@elastic/eui";
 import { get } from "lodash";
 import { CoreStart } from "opensearch-dashboards/public";
 import useField from "../../../../lib/field";
@@ -43,6 +32,7 @@ import {
 } from "../../constant";
 import { checkPermissionForSubmitLRONConfig } from "../../../../containers/NotificationConfig";
 import "./index.scss";
+import { DataSourceMenuContext } from "../../../../services/DataSourceMenuContext";
 
 export interface NotificationsProps {}
 
@@ -320,5 +310,7 @@ const Notifications = (props: NotificationsProps) => {
   );
 };
 
-// @ts-ignore
-export default Notifications;
+export default function (props: NotificationsProps) {
+  const dataSourceMenuProps = useContext(DataSourceMenuContext);
+  return <Notifications {...props} key={dataSourceMenuProps.dataSourceId} />;
+}
diff --git a/server/services/NotificationService.ts b/server/services/NotificationService.ts
index 7b6005dc2..14a7682d7 100644
--- a/server/services/NotificationService.ts
+++ b/server/services/NotificationService.ts
@@ -8,7 +8,6 @@ import {
   OpenSearchDashboardsRequest,
   OpenSearchDashboardsResponseFactory,
   IOpenSearchDashboardsResponse,
-  ILegacyCustomClusterClient,
   ResponseError,
 } from "opensearch-dashboards/server";
 import { ServerResponse } from "../models/types";