fix ut tests and yarn lock

Signed-off-by: Anan Zhuang <[email protected]>

Author: ananzh

src/core/public/chat/chat_service.test.ts

@@ -119,22 +119,25 @@ describe('ChatService', () => {
       expect(emittedState.isWindowOpen).toBe(true);
     });
 
-    it('should trigger window callbacks', () => {
+    it('should trigger window callbacks', async () => {
+      const setupContract = service.setup();
       const startContract = service.start();
 
+      setupContract.setImplementation(mockImplementation);
+
       const openCallback = jest.fn();
       const closeCallback = jest.fn();
 
       startContract.onWindowOpen(openCallback);
       startContract.onWindowClose(closeCallback);
 
-      // Open window
-      startContract.setWindowState({ isWindowOpen: true });
+      // Open window via openWindow method (which triggers callbacks)
+      await startContract.openWindow();
       expect(openCallback).toHaveBeenCalledTimes(1);
       expect(closeCallback).not.toHaveBeenCalled();
 
-      // Close window
-      startContract.setWindowState({ isWindowOpen: false });
+      // Close window via closeWindow method (which triggers callbacks)
+      await startContract.closeWindow();
       expect(closeCallback).toHaveBeenCalledTimes(1);
     });
 
@@ -160,22 +163,28 @@ describe('ChatService', () => {
 
       setupContract.setImplementation(mockImplementation);
 
-      // Test message sending
+      // Test message sending - this should delegate to implementation
       const result = await startContract.sendMessage('test', []);
       expect(mockImplementation.sendMessage).toHaveBeenCalledWith('test', []);
       expect(result).toEqual({
         observable: null,
         userMessage: { id: '1', role: 'user', content: 'test' },
       });
 
-      // Test window operations
+      // Test window operations - these trigger callbacks but don't call implementation methods directly
+      // The implementation methods are called by the plugin in response to the callbacks
+      const openCallback = jest.fn();
+      const closeCallback = jest.fn();
+
+      startContract.onWindowOpen(openCallback);
+      startContract.onWindowClose(closeCallback);
+
       await startContract.openWindow();
-      expect(mockImplementation.openWindow).toHaveBeenCalled();
-      expect(startContract.isWindowOpen()).toBe(true); // Core state updated
+      expect(openCallback).toHaveBeenCalled();
+      // Window state is not automatically updated by openWindow - it's managed separately
 
       await startContract.closeWindow();
-      expect(mockImplementation.closeWindow).toHaveBeenCalled();
-      expect(startContract.isWindowOpen()).toBe(false); // Core state updated
+      expect(closeCallback).toHaveBeenCalled();
     });
   });
 

src/plugins/chat/opensearch_dashboards.json

@@ -10,6 +10,6 @@
     "contextProvider",
     "charts"
   ],
-  "optionalPlugins": ["dataSourceManagement"],
+  "optionalPlugins": [],
   "requiredBundles": ["dataSourceManagement"]
 }

src/plugins/chat/public/plugin.test.ts

@@ -57,6 +57,9 @@ describe('ChatPlugin', () => {
           getSidecarConfig$: jest.fn().mockReturnValue(of({ paddingSize: 400 })),
         },
       },
+      uiSettings: {},
+      chat: {},
+      workspaces: {},
     };
 
     // Mock dependencies
@@ -90,8 +93,12 @@ describe('ChatPlugin', () => {
     it('should initialize chat service when enabled', () => {
       plugin.start(mockCoreStart, mockDeps);
 
-      // ChatService is called with uiSettings and core chat service
-      expect(ChatService).toHaveBeenCalledWith(mockCoreStart.uiSettings, mockCoreStart.chat);
+      // ChatService is called with uiSettings, core chat service, and workspaces
+      expect(ChatService).toHaveBeenCalledWith(
+        mockCoreStart.uiSettings,
+        mockCoreStart.chat,
+        mockCoreStart.workspaces
+      );
     });
 
     it('should register chat button in header nav controls', () => {
@@ -117,16 +124,24 @@ describe('ChatPlugin', () => {
 
       const startContract = testPlugin.start(mockCoreStart, mockDeps);
 
-      // ChatService should still be created with uiSettings and core chat service
-      expect(ChatService).toHaveBeenCalledWith(mockCoreStart.uiSettings, mockCoreStart.chat);
+      // ChatService should still be created with uiSettings, core chat service, and workspaces
+      expect(ChatService).toHaveBeenCalledWith(
+        mockCoreStart.uiSettings,
+        mockCoreStart.chat,
+        mockCoreStart.workspaces
+      );
       expect(startContract.chatService).toBeInstanceOf(ChatService);
       expect(mockCoreStart.chrome.navControls.registerPrimaryHeaderRight).toHaveBeenCalled();
     });
 
     it('should always initialize chat service (core service handles enablement)', () => {
       const startContract = plugin.start(mockCoreStart, mockDeps);
 
-      expect(ChatService).toHaveBeenCalledWith(mockCoreStart.uiSettings, mockCoreStart.chat);
+      expect(ChatService).toHaveBeenCalledWith(
+        mockCoreStart.uiSettings,
+        mockCoreStart.chat,
+        mockCoreStart.workspaces
+      );
       expect(startContract.chatService).toBeInstanceOf(ChatService);
       expect(mockCoreStart.chrome.navControls.registerPrimaryHeaderRight).toHaveBeenCalled();
     });
@@ -185,7 +200,11 @@ describe('ChatPlugin', () => {
         expect(() => testPlugin.start(mockCoreStart, mockDeps)).not.toThrow();
 
         // ChatService is always initialized - core service handles enablement logic
-        expect(ChatService).toHaveBeenCalledWith(mockCoreStart.uiSettings, mockCoreStart.chat);
+        expect(ChatService).toHaveBeenCalledWith(
+          mockCoreStart.uiSettings,
+          mockCoreStart.chat,
+          mockCoreStart.workspaces
+        );
       });
     });
   });

src/plugins/chat/public/plugin.ts

@@ -103,7 +103,7 @@ export class ChatPlugin implements Plugin<ChatPluginSetup, ChatPluginStart> {
     );
 
     // Always initialize chat service - core service handles enablement
-    this.chatService = new ChatService(core.uiSettings, core.chat);
+    this.chatService = new ChatService(core.uiSettings, core.chat, core.workspaces);
 
     if (!isEnabled) {
       return {

src/plugins/chat/public/services/chat_service.ts

@@ -14,8 +14,9 @@ import {
   UiSettingScope,
   ChatServiceStart,
   ChatWindowState,
+  WorkspacesStart,
 } from '../../../../core/public';
-import { getDefaultDataSourceId, getWorkspaces } from '../../../data_source_management/public';
+import { getDefaultDataSourceId } from '../../../data_source_management/public';
 
 export interface ChatState {
   messages: Message[];
@@ -39,8 +40,9 @@ export class ChatService {
   public events$: any;
   private activeRequests: Set<string> = new Set();
   private requestCounter: number = 0;
-  private uiSettings?: IUiSettingsClient;
+  private uiSettings: IUiSettingsClient;
   private coreChatService?: ChatServiceStart;
+  private workspaces?: WorkspacesStart;
 
   // Chat state persistence
   private readonly STORAGE_KEY = 'chat.currentState';
@@ -49,11 +51,16 @@ export class ChatService {
   // ChatWindow ref for delegating sendMessage calls to proper timeline management
   private chatWindowRef: React.RefObject<ChatWindowInstance> | null = null;
 
-  constructor(uiSettings?: IUiSettingsClient, coreChatService?: ChatServiceStart) {
+  constructor(
+    uiSettings: IUiSettingsClient,
+    coreChatService?: ChatServiceStart,
+    workspaces?: WorkspacesStart
+  ) {
     // No need to pass URL anymore - agent will use the proxy endpoint
     this.agent = new AgUiAgent();
     this.uiSettings = uiSettings;
     this.coreChatService = coreChatService;
+    this.workspaces = workspaces;
 
     // Try to restore existing state first
     const currentChatState = this.loadCurrentChatState();
@@ -268,7 +275,7 @@ export class ChatService {
       }
 
       // Get workspace context
-      const workspaces = getWorkspaces();
+      const workspaces = this.workspaces;
       if (!workspaces) {
         // eslint-disable-next-line no-console
         console.warn('Workspaces service not available, using global scope');

src/plugins/chat/public/types.ts

@@ -6,7 +6,6 @@
 import { NavigationPublicPluginStart } from '../../navigation/public';
 import { ContextProviderStart } from '../../context_provider/public';
 import { ChartsPluginStart } from '../../charts/public';
-import { DataSourceManagementPluginSetup } from '../../data_source_management/public';
 import { ChatService } from './services/chat_service';
 import { SuggestedActionsServiceSetupContract } from './services/suggested_action';
 
@@ -22,5 +21,4 @@ export interface AppPluginStartDependencies {
   navigation: NavigationPublicPluginStart;
   contextProvider: ContextProviderStart;
   charts: ChartsPluginStart;
-  dataSourceManagement?: DataSourceManagementPluginSetup;
 }

src/plugins/dashboard/public/application/components/dashboard_top_nav/__snapshots__/dashboard_top_nav.test.tsx.snap

@@ -26,6 +26,6 @@ export {
   createDataSourceMenu,
 } from './components/data_source_menu';
 export { DataSourceSelectionService } from './service/data_source_selection_service';
-export { getDefaultDataSourceId, getDefaultDataSourceId$, getWorkspaces } from './components/utils';
+export { getDefaultDataSourceId, getDefaultDataSourceId$ } from './components/utils';
 export { DATACONNECTIONS_BASE, DatasourceTypeToDisplayName } from './constants';
 export { DEFAULT_DATA_SOURCE_UI_SETTINGS_ID } from '../common';