Backport/backport 186 to 2.x (#197)

* bumping up the opensearch dashboards versions Signed-off-by: Riya Saxena <[email protected]> * manual backport MDS support Signed-off-by: Riya Saxena <[email protected]> * fixed email tests due to a merge conflict in backport Signed-off-by: Riya Saxena <[email protected]> * fixed email tests due to a merge conflict in backport Signed-off-by: Riya Saxena <[email protected]> --------- Signed-off-by: Riya Saxena <[email protected]> Signed-off-by: Riya <[email protected]>
opensearch-project · Apr 27, 2024 · 0954519 · 0954519
1 parent dada2bf
commit 0954519
Show file tree

Hide file tree

Showing 32 changed files with 1,304 additions and 756 deletions.
diff --git a/common/MDSEnabledClientService.ts b/common/MDSEnabledClientService.ts
@@ -0,0 +1,15 @@
+
+export class MDSEnabledClientService {
+  static getClient(request, context, dataSourceEnabled) {
+    const { dataSourceId = "" } = (request.query || {}) as { dataSourceId?: string };
+    if (dataSourceEnabled && dataSourceId && dataSourceId.trim().length != 0) {
+      return context.dataSource.opensearch.legacy.getClient(dataSourceId.toString()).callAPI;
+    } else {
+      // fall back to default local cluster
+      return context.notificationsContext.notificationsClient.asScoped(
+        request,
+      ).callAsCurrentUser;
+    }
+  }
+}
+
diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json
@@ -8,7 +8,9 @@
   ],
   "optionalPlugins": [
     "share",
-    "managementOverview"
+    "managementOverview",
+    "dataSource",
+    "dataSourceManagement"
   ],
   "server": true,
   "ui": true

diff --git a/package.json b/package.json
@@ -34,4 +34,4 @@
     "tough-cookie": "^4.1.3",
     "@cypress/request": "^3.0.0"
   }
-}
+}
diff --git a/public/application.tsx b/public/application.tsx
@@ -11,21 +11,28 @@ import { CoreServicesContext } from './components/coreServices';
 import Main from './pages/Main';
 import { NotificationService } from './services';
 import { ServicesContext } from './services/services';
+import { DataSourceManagementPluginSetup } from '../../../src/plugins/data_source_management/public';
+import { AppPluginStartDependencies } from "./types";
 
-export const renderApp = (coreStart: CoreStart, params: AppMountParameters) => {
-  const http = coreStart.http;
-  const notificationService = new NotificationService(http);
-  const services = { notificationService };
+export const renderApp = (
+  coreStart: CoreStart,
+  params: AppMountParameters,
+  dataSourceManagement: DataSourceManagementPluginSetup,
+  pluginStartDependencies: AppPluginStartDependencies,
+) => {
 
   ReactDOM.render(
     <Router>
       <Route
         render={(props) => (
-          <ServicesContext.Provider value={services}>
             <CoreServicesContext.Provider value={coreStart}>
-              <Main {...props} />
+              <Main {...props}
+                setActionMenu={params.setHeaderActionMenu}
+                multiDataSourceEnabled={!!pluginStartDependencies.dataSource}
+                dataSourceManagement={dataSourceManagement}
+                http={coreStart.http} // Pass http as a prop
+              />
             </CoreServicesContext.Provider>
-          </ServicesContext.Provider>
         )}
       />
     </Router>,

diff --git a/public/components/MDSEnabledComponent/MDSEnabledComponent.tsx b/public/components/MDSEnabledComponent/MDSEnabledComponent.tsx
@@ -0,0 +1,34 @@
+import React, { useContext, useEffect } from "react";
+import { DataSourceMenuContext, DataSourceMenuProperties } from "../../services/DataSourceMenuContext";
+import { useHistory } from "react-router";
+import queryString from "query-string";
+import { MainContext } from '../../pages/Main/Main';
+
+export default class MDSEnabledComponent<
+  Props extends DataSourceMenuProperties,
+  State extends DataSourceMenuProperties
+> extends React.Component<Props, State> {
+  constructor(props: Props) {
+    super(props);
+    this.state = {
+      dataSourceId: props.dataSourceId,
+      multiDataSourceEnabled: props.multiDataSourceEnabled,
+    } as State;
+  }
+}
+
+export function isDataSourceChanged(prevProps, currentProps) {
+  if (
+    prevProps.notificationService?.multiDataSourceEnabled &&
+    currentProps.notificationService?.multiDataSourceEnabled
+  ) {
+    const prevDataSourceId = prevProps.notificationService.dataSourceId;
+    const currDataSourceId = currentProps.notificationService.dataSourceId;
+    if (!_.isEqual(prevDataSourceId, currDataSourceId)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+
diff --git a/public/pages/Channels/Channels.tsx b/public/pages/Channels/Channels.tsx
@@ -17,7 +17,7 @@ import {
 import { Criteria } from '@elastic/eui/src/components/basic_table/basic_table';
 import { Pagination } from '@elastic/eui/src/components/basic_table/pagination_bar';
 import _ from 'lodash';
-import React, { Component } from 'react';
+import React, { Component, useContext } from 'react';
 import { RouteComponentProps } from 'react-router-dom';
 import { ChannelItemType, TableState } from '../../../models/interfaces';
 import {
@@ -38,23 +38,24 @@ import { DEFAULT_PAGE_SIZE_OPTIONS } from '../Notifications/utils/constants';
 import { ChannelActions } from './components/ChannelActions';
 import { ChannelControls } from './components/ChannelControls';
 import { ChannelFiltersType } from './types';
+import { DataSourceMenuProperties } from '../../services/DataSourceMenuContext';
+import MDSEnabledComponent, { isDataSourceChanged } from '../../components/MDSEnabledComponent/MDSEnabledComponent';
 
-interface ChannelsProps extends RouteComponentProps {
+interface ChannelsProps extends RouteComponentProps, DataSourceMenuProperties {
   notificationService: NotificationService;
 }
 
-interface ChannelsState extends TableState<ChannelItemType> {
+interface ChannelsState extends TableState<ChannelItemType>, DataSourceMenuProperties {
   filters: ChannelFiltersType;
 }
 
-export class Channels extends Component<ChannelsProps, ChannelsState> {
+export class Channels extends MDSEnabledComponent<ChannelsProps, ChannelsState> {
   static contextType = CoreServicesContext;
   columns: EuiTableFieldDataColumnType<ChannelItemType>[];
 
   constructor(props: ChannelsProps) {
     super(props);
-
-    this.state = {
+    const state: ChannelsState = {
       total: 0,
       from: 0,
       size: 10,
@@ -67,6 +68,8 @@ export class Channels extends Component<ChannelsProps, ChannelsState> {
       loading: true,
     };
 
+    this.state = state;
+
     this.columns = [
       {
         field: 'name',
@@ -118,14 +121,18 @@ export class Channels extends Component<ChannelsProps, ChannelsState> {
   }
 
   async componentDidUpdate(prevProps: ChannelsProps, prevState: ChannelsState) {
-    const prevQuery = Channels.getQueryObjectFromState(prevState);
-    const currQuery = Channels.getQueryObjectFromState(this.state);
+    const prevQuery = this.getQueryObjectFromState(prevState);
+    const currQuery = this.getQueryObjectFromState(this.state);
+
     if (!_.isEqual(prevQuery, currQuery)) {
       await this.refresh();
     }
+    if (isDataSourceChanged(this.props, prevProps)) {
+      await this.refresh();
+    }
   }
 
-  static getQueryObjectFromState(state: ChannelsState) {
+  getQueryObjectFromState(state: ChannelsState) {
     const config_type = _.isEmpty(state.filters.type)
       ? Object.keys(CHANNEL_TYPE) // by default get all channels but not email senders/groups
       : state.filters.type;
@@ -145,7 +152,7 @@ export class Channels extends Component<ChannelsProps, ChannelsState> {
   async refresh() {
     this.setState({ loading: true });
     try {
-      const queryObject = Channels.getQueryObjectFromState(this.state);
+      const queryObject = this.getQueryObjectFromState(this.state);
       const channels = await this.props.notificationService.getChannels(
         queryObject
       );

diff --git a/public/pages/Channels/__tests__/DetailsListModal.test.tsx b/public/pages/Channels/__tests__/DetailsListModal.test.tsx
@@ -7,7 +7,6 @@ import { render } from '@testing-library/react';
 import { configure, mount } from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
 import React from 'react';
-import { notificationServiceMock } from '../../../../test/mocks/serviceMock';
 import { DetailsListModal } from '../components/modals/DetailsListModal';
 
 describe('<DetailsListModal /> spec', () => {
@@ -31,7 +30,6 @@ describe('<DetailsListModal /> spec', () => {
         title="Email addresses"
         items={items}
         onClose={onClose}
-        services={notificationServiceMock}
       />
     );
     expect(wrap).toMatchSnapshot();

diff --git a/public/pages/Channels/__tests__/DetailsTableModal.test.tsx b/public/pages/Channels/__tests__/DetailsTableModal.test.tsx
@@ -6,7 +6,6 @@
 import { configure, mount } from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
 import React from 'react';
-import { notificationServiceMock } from '../../../../test/mocks/serviceMock';
 import { DetailsTableModal } from '../components/modals/DetailsTableModal';
 
 describe('<DetailsTableModal /> spec', () => {
@@ -24,7 +23,6 @@ describe('<DetailsTableModal /> spec', () => {
         isParameters={true}
         items={items}
         onClose={onClose}
-        services={notificationServiceMock}
       />
     );
     expect(wrap).toMatchSnapshot();
@@ -42,7 +40,6 @@ describe('<DetailsTableModal /> spec', () => {
         isParameters={false}
         items={items}
         onClose={onClose}
-        services={notificationServiceMock}
       />
     );
     expect(wrap).toMatchSnapshot();

diff --git a/public/pages/Channels/__tests__/__snapshots__/DetailsListModal.test.tsx.snap b/public/pages/Channels/__tests__/__snapshots__/DetailsListModal.test.tsx.snap
@@ -16,30 +16,6 @@ exports[`<DetailsListModal /> spec renders the component 1`] = `
     ]
   }
   onClose={[MockFunction]}
-  services={
-    Object {
-      "notificationService": NotificationService {
-        "createConfig": [Function],
-        "deleteConfigs": [Function],
-        "getChannel": [Function],
-        "getChannels": [Function],
-        "getConfig": [Function],
-        "getConfigs": [Function],
-        "getEmailConfigDetails": [Function],
-        "getNotification": [Function],
-        "getRecipientGroup": [Function],
-        "getRecipientGroups": [Function],
-        "getSESSender": [Function],
-        "getSESSenders": [Function],
-        "getSender": [Function],
-        "getSenders": [Function],
-        "getServerFeatures": [Function],
-        "httpClient": [MockFunction],
-        "sendTestMessage": [Function],
-        "updateConfig": [Function],
-      },
-    }
-  }
   title="Email addresses"
 >
   <EuiOverlayMask>

diff --git a/public/pages/Channels/__tests__/__snapshots__/DetailsTableModal.test.tsx.snap b/public/pages/Channels/__tests__/__snapshots__/DetailsTableModal.test.tsx.snap
@@ -17,30 +17,6 @@ exports[`<DetailsTableModal /> spec renders headers 1`] = `
     ]
   }
   onClose={[MockFunction]}
-  services={
-    Object {
-      "notificationService": NotificationService {
-        "createConfig": [Function],
-        "deleteConfigs": [Function],
-        "getChannel": [Function],
-        "getChannels": [Function],
-        "getConfig": [Function],
-        "getConfigs": [Function],
-        "getEmailConfigDetails": [Function],
-        "getNotification": [Function],
-        "getRecipientGroup": [Function],
-        "getRecipientGroups": [Function],
-        "getSESSender": [Function],
-        "getSESSenders": [Function],
-        "getSender": [Function],
-        "getSenders": [Function],
-        "getServerFeatures": [Function],
-        "httpClient": [MockFunction],
-        "sendTestMessage": [Function],
-        "updateConfig": [Function],
-      },
-    }
-  }
 >
   <EuiOverlayMask>
     <Portal
@@ -1886,30 +1862,6 @@ exports[`<DetailsTableModal /> spec renders parameters 1`] = `
     ]
   }
   onClose={[MockFunction]}
-  services={
-    Object {
-      "notificationService": NotificationService {
-        "createConfig": [Function],
-        "deleteConfigs": [Function],
-        "getChannel": [Function],
-        "getChannels": [Function],
-        "getConfig": [Function],
-        "getConfigs": [Function],
-        "getEmailConfigDetails": [Function],
-        "getNotification": [Function],
-        "getRecipientGroup": [Function],
-        "getRecipientGroups": [Function],
-        "getSESSender": [Function],
-        "getSESSenders": [Function],
-        "getSender": [Function],
-        "getSenders": [Function],
-        "getServerFeatures": [Function],
-        "httpClient": [MockFunction],
-        "sendTestMessage": [Function],
-        "updateConfig": [Function],
-      },
-    }
-  }
 >
   <EuiOverlayMask>
     <Portal

diff --git a/public/pages/CreateChannel/CreateChannel.tsx b/public/pages/CreateChannel/CreateChannel.tsx
@@ -530,3 +530,4 @@ export function CreateChannel(props: CreateChannelsProps) {
     </>
   );
 }
+
diff --git a/public/pages/Emails/EmailGroups.tsx b/public/pages/Emails/EmailGroups.tsx
@@ -9,8 +9,12 @@ import { RouteComponentProps } from 'react-router-dom';
 import { CoreServicesContext } from '../../components/coreServices';
 import { BREADCRUMBS } from '../../utils/constants';
 import { RecipientGroupsTable } from './components/tables/RecipientGroupsTable';
+import { MainContext } from '../Main/Main';
+import { NotificationService } from '../../services';
 
-interface EmailGroupsProps extends RouteComponentProps {}
+interface EmailGroupsProps extends RouteComponentProps {
+  notificationService: NotificationService;
+}
 
 export function EmailGroups(props: EmailGroupsProps) {
   const coreContext = useContext(CoreServicesContext)!;
@@ -29,7 +33,7 @@ export function EmailGroups(props: EmailGroupsProps) {
       </EuiTitle>
 
       <EuiSpacer />
-      <RecipientGroupsTable coreContext={coreContext} />
+      <RecipientGroupsTable coreContext={coreContext} notificationService={props.notificationService} />
     </>
   );
 }
diff --git a/public/pages/Emails/EmailSenders.tsx b/public/pages/Emails/EmailSenders.tsx
@@ -11,13 +11,17 @@ import { BREADCRUMBS } from '../../utils/constants';
 import { MainContext } from '../Main/Main';
 import { SendersTable } from './components/tables/SendersTable';
 import { SESSendersTable } from './components/tables/SESSendersTable';
+import { NotificationService } from '../../services';
 
-interface EmailSendersProps extends RouteComponentProps {}
+interface EmailSendersProps extends RouteComponentProps {
+  notificationService: NotificationService;
+}
 
 export function EmailSenders(props: EmailSendersProps) {
   const coreContext = useContext(CoreServicesContext)!;
   const mainStateContext = useContext(MainContext)!;
 
+
   useEffect(() => {
     coreContext.chrome.setBreadcrumbs([
       BREADCRUMBS.NOTIFICATIONS,
@@ -31,19 +35,18 @@ export function EmailSenders(props: EmailSendersProps) {
       <EuiTitle size="l">
         <h1>Email senders</h1>
       </EuiTitle>
-
       {mainStateContext.availableConfigTypes.includes('smtp_account') && (
         <>
           <EuiSpacer />
-          <SendersTable coreContext={coreContext} />
+          <SendersTable coreContext={coreContext} notificationService={props.notificationService} />
         </>
       )}
 
       {/* UI currently does not fully handle this condition, adding it just to avoid flashing */}
       {mainStateContext.availableConfigTypes.includes('ses_account') && (
         <>
           <EuiSpacer />
-          <SESSendersTable coreContext={coreContext} />
+          <SESSendersTable coreContext={coreContext} notificationService={props.notificationService} />
         </>
       )}
     </>
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,4 +34,4 @@ @@
         "tough-cookie": "^4.1.3",
         "@cypress/request": "^3.0.0"
       }
-    }
+    }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -530,3 +530,4 @@ export function CreateChannel(props: CreateChannelsProps) {
		</>
		);
		}