copilot review fix

Author: anna-shakhova

packages/devextreme/js/__internal/grids/grid_core/ai_assistant/__tests__/ai_assistant_view.test.ts

@@ -172,6 +172,25 @@ describe('AIAssistantView', () => {
     });
   });
 
+  describe('hide', () => {
+    it('should delegate to AIChat hide method', async () => {
+      const { aiAssistantView } = createAIAssistantView();
+
+      await aiAssistantView.hide();
+
+      const aiChatInstance = (AIChat as jest.Mock)
+        .mock.results[0].value as { hide: jest.Mock };
+
+      expect(aiChatInstance.hide).toHaveBeenCalledTimes(1);
+    });
+
+    it('should return resolved false promise when aiChatInstance is not created', () => {
+      const { aiAssistantView } = createAIAssistantView({ render: false });
+
+      return expect(aiAssistantView.hide()).resolves.toBe(false);
+    });
+  });
+
   describe('isShown', () => {
     it('should delegate to AIChat isShown method', () => {
       const { aiAssistantView } = createAIAssistantView();

packages/devextreme/js/__internal/grids/grid_core/ai_assistant/__tests__/ai_assistant_view_controller.test.ts

@@ -11,6 +11,7 @@ import { AIAssistantViewController } from '../ai_assistant_view_controller';
 
 interface MockAIAssistantView {
   toggle: jest.Mock<() => Promise<boolean>>;
+  hide: jest.Mock<() => Promise<boolean>>;
   isShown: jest.Mock<() => boolean>;
   onVisibilityChanged?: (visible: boolean) => void;
 }
@@ -23,6 +24,7 @@ interface MockHeaderPanel {
 
 const createMockAIAssistantView = (): MockAIAssistantView => ({
   toggle: jest.fn<() => Promise<boolean>>().mockResolvedValue(true),
+  hide: jest.fn<() => Promise<boolean>>().mockResolvedValue(true),
   isShown: jest.fn<() => boolean>().mockReturnValue(false),
 });
 
@@ -116,5 +118,41 @@ describe('AIAssistantViewController', () => {
 
       expect(args.handled).toBe(true);
     });
+
+    it('should hide popup when aiAssistant.enabled changes to false and popup is shown', () => {
+      const options: Record<string, unknown> = { 'aiAssistant.enabled': true };
+      const { controller, mockView } = createAIAssistantViewController(options);
+
+      mockView.isShown.mockReturnValue(true);
+      options['aiAssistant.enabled'] = false;
+
+      controller.optionChanged({
+        name: 'aiAssistant' as const,
+        fullName: 'aiAssistant.enabled' as const,
+        value: false,
+        previousValue: true,
+        handled: false,
+      });
+
+      expect(mockView.hide).toHaveBeenCalledTimes(1);
+    });
+
+    it('should not call hide when aiAssistant.enabled changes to false and popup is not shown', () => {
+      const options: Record<string, unknown> = { 'aiAssistant.enabled': true };
+      const { controller, mockView } = createAIAssistantViewController(options);
+
+      mockView.isShown.mockReturnValue(false);
+      options['aiAssistant.enabled'] = false;
+
+      controller.optionChanged({
+        name: 'aiAssistant' as const,
+        fullName: 'aiAssistant.enabled' as const,
+        value: false,
+        previousValue: true,
+        handled: false,
+      });
+
+      expect(mockView.hide).not.toHaveBeenCalled();
+    });
   });
 });

packages/devextreme/js/__internal/grids/grid_core/ai_assistant/ai_assistant_view.ts

@@ -33,6 +33,10 @@ export class AIAssistantView extends View {
     return this.aiChatInstance?.isShown() ?? false;
   }
 
+  public hide(): Promise<boolean> {
+    return this.aiChatInstance?.hide() ?? Promise.resolve(false);
+  }
+
   public toggle(): Promise<boolean> {
     return this.aiChatInstance?.toggle() ?? Promise.resolve(false);
   }

packages/devextreme/js/__internal/grids/grid_core/ai_assistant/ai_assistant_view_controller.ts

@@ -59,6 +59,11 @@ export class AIAssistantViewController extends ViewController {
       this.headerPanel?.applyToolbarItem(AI_ASSISTANT_BUTTON_NAME, aiAssistantToolbarItem);
     } else {
       this.headerPanel?.removeToolbarItem(AI_ASSISTANT_BUTTON_NAME);
+
+      if (this.aiAssistantView?.isShown()) {
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
+        this.aiAssistantView?.hide();
+      }
     }
   }
 
@@ -70,7 +75,7 @@ export class AIAssistantViewController extends ViewController {
 
       if (this.headerPanel) {
         const aiAssistantClass = this.addWidgetPrefix(AI_ASSISTANT_BUTTON_CLASS);
-        this.$aiAssistantButton.addClass(this.headerPanel._getToolbarButtonClass(aiAssistantClass));
+        this.$aiAssistantButton.addClass(this.headerPanel.getToolbarButtonClass(aiAssistantClass));
       }
     };
     const hintText = this.option('aiAssistant.title'); // TODO clarify option name

packages/devextreme/js/__internal/grids/grid_core/ai_chat/ai_chat.test.ts

@@ -17,6 +17,7 @@ import type { AIChatOptions } from './types';
 
 const mockPopupInstance = {
   toggle: jest.fn<() => Promise<boolean>>().mockResolvedValue(true),
+  hide: jest.fn<() => Promise<boolean>>().mockResolvedValue(true),
   option: jest.fn<(name: string) => unknown>().mockReturnValue(false),
 };
 
@@ -98,6 +99,17 @@ describe('AIChat', () => {
     });
   });
 
+  describe('hide', () => {
+    it('should call popup hide method', async () => {
+      const { aiChat } = createAIChat();
+
+      const result = await aiChat.hide();
+
+      expect(mockPopupInstance.hide).toHaveBeenCalledTimes(1);
+      expect(result).toBe(true);
+    });
+  });
+
   describe('isShown', () => {
     it('should return true when popup is visible', () => {
       const { aiChat } = createAIChat();
@@ -114,4 +126,47 @@ describe('AIChat', () => {
       expect(aiChat.isShown()).toBe(false);
     });
   });
+
+  describe('onVisibilityChanged', () => {
+    const getPopupConfig = (): any => {
+      const call = createComponentMock.mock.calls.find(
+        ([, Widget]) => Widget === Popup,
+      );
+
+      expect(call).toBeDefined();
+
+      return (call as any)[2];
+    };
+
+    it('should call onVisibilityChanged with true on showing', () => {
+      const onVisibilityChanged = jest.fn();
+      createAIChat({ onVisibilityChanged });
+
+      const popupConfig = getPopupConfig();
+      popupConfig.onShowing();
+
+      expect(onVisibilityChanged).toHaveBeenCalledTimes(1);
+      expect(onVisibilityChanged).toHaveBeenCalledWith(true);
+    });
+
+    it('should call onVisibilityChanged with false on hidden', () => {
+      const onVisibilityChanged = jest.fn();
+      createAIChat({ onVisibilityChanged });
+
+      const popupConfig = getPopupConfig();
+      popupConfig.onHidden();
+
+      expect(onVisibilityChanged).toHaveBeenCalledTimes(1);
+      expect(onVisibilityChanged).toHaveBeenCalledWith(false);
+    });
+
+    it('should not throw when onVisibilityChanged is not provided', () => {
+      createAIChat();
+
+      const popupConfig = getPopupConfig();
+
+      expect(() => { popupConfig.onShowing(); }).not.toThrow();
+      expect(() => { popupConfig.onHidden(); }).not.toThrow();
+    });
+  });
 });

packages/devextreme/js/__internal/grids/grid_core/ai_chat/ai_chat.ts

@@ -53,6 +53,10 @@ export class AIChat {
     return this.popupInstance.toggle();
   }
 
+  public hide(): Promise<boolean> {
+    return this.popupInstance.hide();
+  }
+
   public isShown(): boolean {
     return !!this.popupInstance.option('visible');
   }

packages/devextreme/js/__internal/grids/grid_core/ai_chat/const.ts

@@ -3,6 +3,7 @@ export const DEFAULT_POPUP_OPTIONS = {
   height: 'auto',
   visible: false,
   shading: false,
+  showCloseButton: true,
 };
 
 export const CLASSES = {

packages/devextreme/js/__internal/grids/grid_core/column_chooser/m_column_chooser.ts

@@ -539,7 +539,7 @@ const headerPanel = (Base: ModuleType<HeaderPanel>) => class ColumnChooserHeader
         that.component.getView('columnChooserView').showColumnChooser();
       };
       const onInitialized = function (e) {
-        $(e.element).addClass(that._getToolbarButtonClass(that.addWidgetPrefix(COLUMN_CHOOSER_BUTTON_CLASS)));
+        $(e.element).addClass(that.getToolbarButtonClass(that.addWidgetPrefix(COLUMN_CHOOSER_BUTTON_CLASS)));
       };
       const hintText = that.option('columnChooser.title');
       const toolbarItem = {

packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_row.ts

@@ -989,7 +989,7 @@ const headerPanel = (Base: ModuleType<HeaderPanel>) => class FilterRowHeaderPane
       const columns = that._columnsController.getColumns();
       const disabled = !columns.filter((column) => column.bufferedFilterValue !== undefined).length;
       const onInitialized = function (e) {
-        $(e.element).addClass(that._getToolbarButtonClass(APPLY_BUTTON_CLASS));
+        $(e.element).addClass(that.getToolbarButtonClass(APPLY_BUTTON_CLASS));
       };
       const onClickHandler = function () {
         that._applyFilterViewController.applyFilter();

packages/devextreme/js/__internal/grids/grid_core/header_panel/m_header_panel.ts

@@ -120,7 +120,7 @@ export class HeaderPanel extends ColumnsView {
     return $('<div>').addClass(this.addWidgetPrefix(TOOLBAR_BUTTON_CLASS));
   }
 
-  public _getToolbarButtonClass(specificClass?: string): string {
+  public getToolbarButtonClass(specificClass?: string): string {
     const secondClass = specificClass ? ` ${specificClass}` : '';
 
     return this.addWidgetPrefix(TOOLBAR_BUTTON_CLASS) + secondClass;