feat: update backend to support MDS (#190) (#199)

* init MDS Signed-off-by: tygao <tygao@amazon.com> * update backend to support mds Signed-off-by: tygao <tygao@amazon.com> * remove DSM in required plugins Signed-off-by: tygao <tygao@amazon.com> * doc: update changelog Signed-off-by: tygao <tygao@amazon.com> * test: update tests Signed-off-by: tygao <tygao@amazon.com> * update mock context Signed-off-by: tygao <tygao@amazon.com> * update core context mock Signed-off-by: tygao <tygao@amazon.com> * test: add tests for chat route Signed-off-by: tygao <tygao@amazon.com> * use await and update tests Signed-off-by: tygao <tygao@amazon.com> * Fix unit tests after getDataSourceQuery change Signed-off-by: Lin Wang <wonglam@amazon.com> * remove useless DSM calling in flyout Signed-off-by: tygao <tygao@amazon.com> --------- Signed-off-by: tygao <tygao@amazon.com> Signed-off-by: Lin Wang <wonglam@amazon.com> Co-authored-by: Lin Wang <wonglam@amazon.com> (cherry picked from commit 0d6ce86) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> # Conflicts: # CHANGELOG.md Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: tygao <tygao@amazon.com>
opensearch-project · Jun 3, 2024 · b6b9a27 · b6b9a27
1 parent fb07dd8
commit b6b9a27
Show file tree

Hide file tree

Showing 31 changed files with 529 additions and 489 deletions.
diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json
@@ -16,6 +16,6 @@
     "dataSourceManagement"
   ],
   "configPath": [
-    "assistant"
+    "assistant" 
   ]
 }
diff --git a/public/components/__tests__/chat_window_header_title.test.tsx b/public/components/__tests__/chat_window_header_title.test.tsx
@@ -17,6 +17,7 @@ import * as coreContextExports from '../../contexts/core_context';
 import { IMessage } from '../../../common/types/chat_saved_object_attributes';
 
 import { ChatWindowHeaderTitle } from '../chat_window_header_title';
+import { DataSourceServiceMock } from '../../services/data_source_service.mock';
 
 const setup = ({
   messages = [],
@@ -37,6 +38,7 @@ const setup = ({
         }),
         reload: jest.fn(),
       },
+      dataSource: new DataSourceServiceMock(),
     },
   };
   useCoreMock.services.http.put.mockImplementation(() => Promise.resolve());

diff --git a/public/components/__tests__/edit_conversation_name_modal.test.tsx b/public/components/__tests__/edit_conversation_name_modal.test.tsx
@@ -15,10 +15,11 @@ import {
   EditConversationNameModalProps,
 } from '../edit_conversation_name_modal';
 import { HttpHandler } from '../../../../../src/core/public';
+import { DataSourceServiceMock } from '../../services/data_source_service.mock';
 
 const setup = ({ onClose, defaultTitle, conversationId }: EditConversationNameModalProps) => {
   const useCoreMock = {
-    services: coreMock.createStart(),
+    services: { ...coreMock.createStart(), dataSource: new DataSourceServiceMock() },
   };
   jest.spyOn(coreContextExports, 'useCore').mockReturnValue(useCoreMock);
 
@@ -156,7 +157,10 @@ describe('<EditConversationNameModal />', () => {
     expect(useCoreMock.services.http.put).not.toHaveBeenCalled();
 
     fireEvent.click(renderResult.getByTestId('confirmModalConfirmButton'));
-    expect(useCoreMock.services.http.put).toHaveBeenCalled();
+
+    await waitFor(() => {
+      expect(useCoreMock.services.http.put).toHaveBeenCalled();
+    });
 
     fireEvent.click(renderResult.getByTestId('confirmModalCancelButton'));
 

diff --git a/public/components/feedback_modal.tsx b/public/components/feedback_modal.tsx
diff --git a/public/contexts/__mocks__/core_context.tsx b/public/contexts/__mocks__/core_context.tsx
@@ -5,6 +5,7 @@
 
 import { BehaviorSubject } from 'rxjs';
 import { coreMock } from '../../../../../src/core/public/mocks';
+import { DataSourceServiceMock } from '../../services/data_source_service.mock';
 
 export const useCore = jest.fn(() => {
   const useCoreMock = {
@@ -24,7 +25,7 @@ export const useCore = jest.fn(() => {
         load: jest.fn(),
       },
       conversationLoad: {},
-      dataSource: {},
+      dataSource: new DataSourceServiceMock(),
     },
   };
   useCoreMock.services.http.delete.mockReturnValue(Promise.resolve());

diff --git a/public/contexts/core_context.tsx b/public/contexts/core_context.tsx
@@ -15,6 +15,7 @@ export interface AssistantServices extends Required<OpenSearchDashboardsServices
   startDeps: AssistantPluginStartDependencies;
   conversationLoad: ConversationLoadService;
   conversations: ConversationsService;
+  // This service is maintained in chatbot instead of dataSource exported from core plugin.
   dataSource: DataSourceService;
 }