Merge remote-tracking branch 'my/26_1_WIP_check_ng22' into 26_1_WIP_check_ng22

Author: GoodDayForSurf

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

@@ -436,6 +436,38 @@ describe('filterValueCommand', () => {
       expect(result.status).toBe('failure');
     });
 
+    it('returns failure when a field has no corresponding column', async () => {
+      const instance = await createGrid();
+      const spy = jest.spyOn(instance, 'option');
+      const callbacks = createCallbacks();
+
+      const result = await filterValueCommand.execute(instance, callbacks)({
+        expression: singleBasic('nonexistent', '=', 'Alpha'),
+      });
+
+      expect(spy).not.toHaveBeenCalled();
+      expect(result.status).toBe('failure');
+    });
+
+    it('succeeds when a field maps to a hidden but existing column', async () => {
+      const instance = await createGrid({
+        columns: [
+          { dataField: 'id', dataType: 'number' },
+          { dataField: 'name', dataType: 'string' },
+          { dataField: 'age', dataType: 'number', visible: false },
+        ],
+      });
+      const spy = jest.spyOn(instance, 'option');
+      const callbacks = createCallbacks();
+
+      const result = await filterValueCommand.execute(instance, callbacks)({
+        expression: singleBasic('age', '>', 10),
+      });
+
+      expect(spy).toHaveBeenCalledWith('filterValue', ['age', '>', 10]);
+      expect(result.status).toBe('success');
+    });
+
     it('tolerates unreachable extra nodes', async () => {
       const instance = await createGrid();
       const spy = jest.spyOn(instance, 'option');

packages/devextreme/js/__internal/grids/grid_core/ai_assistant/commands/filtering.ts

@@ -94,8 +94,15 @@ function convertFilterExprToArray(
       const { expr } = node;
       switch (expr.type) {
         case 'basic': {
-          const dataType = component.columnOption(expr.field, 'dataType');
-          const resolved = resolveFilterValue(dataType, expr.value);
+          const column = component.columnOption(expr.field);
+
+          if (!isDefined(column)) {
+            // Filter sync requires an existing column for every field in a basic expression
+            throw new Error(`Unknown column: ${expr.field}`);
+          }
+
+          const resolved = resolveFilterValue(column.dataType, expr.value);
+
           return [expr.field, expr.operator, resolved];
         }
         case 'combined':
@@ -131,7 +138,7 @@ const getFilterSuccessMessage = async (
 
 export const filterValueCommand = defineGridCommand({
   name: 'filterValue',
-  description: 'Apply a filter expression to the grid. Replaces any existing filter; pass null for expression to clear. The expression is a flat node list: {"rootId":id,"nodes":[...]}. Each node is {"id":<unique string like "n1">,"expr":<expression>}, where "expr" is one of: basic {"type":"basic","field":dataField,"operator":op,"value":val}, combined {"type":"combined","combiner":"and"|"or","leftId":nodeId,"rightId":nodeId}, negated {"type":"negated","expressionId":nodeId}. "rootId" MUST be the "id" of the outermost node (the top of the expression tree) and must match one of the node ids exactly — never invent a value like "root". Every "leftId"/"rightId"/"expressionId" must also match a node "id". Ids must be unique and must not form cycles. The "field" is the column dataField (not the caption). Supported operators: "=", "<>", "<", "<=", ">", ">=", "contains", "notcontains", "startswith", "endswith". DATE VALUES: When a value is a date or datetime, always use "YYYY-MM-DDTHH:mm:ss" format without timezone suffix, e.g. "2024-05-10T00:00:00" for midnight or "2024-05-10T14:30:00" for a specific time. Always include the "T" and time part. Do NOT use date-only format like "2024-05-10" without time. Do NOT append "Z" or any timezone offset unless the user explicitly requests it. Do NOT use natural language for dates. To express "not and" / "not or", add a negated node whose expressionId points at a combined node. Example for name = "Alpha" AND age > 10 (rootId is "n3", the combined node): {"rootId":"n3","nodes":[{"id":"n1","expr":{"type":"basic","field":"name","operator":"=","value":"Alpha"}},{"id":"n2","expr":{"type":"basic","field":"age","operator":">","value":10}},{"id":"n3","expr":{"type":"combined","combiner":"and","leftId":"n1","rightId":"n2"}}]}.',
+  description: 'Apply a filter expression to the grid. Replaces any existing filter; pass null for expression to clear. The expression is a flat node list: {"rootId":id,"nodes":[...]}. Each node is {"id":<unique string like "n1">,"expr":<expression>}, where "expr" is one of: basic {"type":"basic","field":dataField,"operator":op,"value":val}, combined {"type":"combined","combiner":"and"|"or","leftId":nodeId,"rightId":nodeId}, negated {"type":"negated","expressionId":nodeId}. "rootId" MUST be the "id" of the outermost node (the top of the expression tree) and must match one of the node ids exactly — never invent a value like "root". Every "leftId"/"rightId"/"expressionId" must also match a node "id". Ids must be unique and must not form cycles. The "field" of every basic expression MUST be the dataField of a column that exists in the grid (not the caption); the column may be hidden, but it must exist. Never filter on a field that has no corresponding column. Supported operators: "=", "<>", "<", "<=", ">", ">=", "contains", "notcontains", "startswith", "endswith". DATE VALUES: When a value is a date or datetime, always use "YYYY-MM-DDTHH:mm:ss" format without timezone suffix, e.g. "2024-05-10T00:00:00" for midnight or "2024-05-10T14:30:00" for a specific time. Always include the "T" and time part. Do NOT use date-only format like "2024-05-10" without time. Do NOT append "Z" or any timezone offset unless the user explicitly requests it. Do NOT use natural language for dates. To express "not and" / "not or", add a negated node whose expressionId points at a combined node. Example for name = "Alpha" AND age > 10 (rootId is "n3", the combined node): {"rootId":"n3","nodes":[{"id":"n1","expr":{"type":"basic","field":"name","operator":"=","value":"Alpha"}},{"id":"n2","expr":{"type":"basic","field":"age","operator":">","value":10}},{"id":"n3","expr":{"type":"combined","combiner":"and","leftId":"n1","rightId":"n2"}}]}.',
   schema: filterValueCommandSchema,
   execute: (component, { success, failure }) => async (args): Promise<CommandResult> => {
     let defaultMessage = args.expression === null

packages/devextreme/js/__internal/scheduler/appointment_popup/form.ts

@@ -24,7 +24,7 @@ import type { Properties as SwitchProperties } from '@js/ui/switch';
 import type { Properties as TextAreaProperties } from '@js/ui/text_area';
 import { current, isFluent } from '@js/ui/themes';
 import { dateSerialization } from '@ts/core/utils/m_date_serialization';
-import DropDownEditor from '@ts/ui/drop_down_editor/m_drop_down_editor';
+import DropDownEditor from '@ts/ui/drop_down_editor/drop_down_editor';
 import type Popup from '@ts/ui/popup/m_popup';
 
 import timeZoneUtils from '../m_utils_time_zone';

packages/devextreme/js/__internal/ui/color_box/color_box.ts

@@ -5,7 +5,7 @@ import type { DeferredObj } from '@js/core/utils/deferred';
 import type { Properties } from '@js/ui/color_box';
 import type { OptionChanged } from '@ts/core/widget/types';
 import Color from '@ts/m_color';
-import DropDownEditor from '@ts/ui/drop_down_editor/m_drop_down_editor';
+import DropDownEditor from '@ts/ui/drop_down_editor/drop_down_editor';
 import type { ValueChangedEvent } from '@ts/ui/editor/editor';
 
 import type { PopupProperties } from '../popup/m_popup';

packages/devextreme/js/__internal/ui/date_box/date_box.base.ts

@@ -21,7 +21,7 @@ import type {
 } from '@js/ui/date_box';
 import type { ToolbarItem } from '@js/ui/popup';
 import type { OptionChanged } from '@ts/core/widget/types';
-import DropDownEditor from '@ts/ui/drop_down_editor/m_drop_down_editor';
+import DropDownEditor from '@ts/ui/drop_down_editor/drop_down_editor';
 import type { ValueChangedEvent } from '@ts/ui/editor/editor';
 
 import type { PopupProperties } from '../popup/m_popup';

packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.list.ts

@@ -11,7 +11,7 @@ import type { DxEvent } from '@js/events';
 import type { Format } from '@js/localization';
 import type { ItemClickEvent } from '@js/ui/list';
 import { getGlobalFormatByDataType } from '@ts/core/m_global_format_config';
-import { getSizeValue } from '@ts/ui/drop_down_editor/m_utils';
+import { getSizeValue } from '@ts/ui/drop_down_editor/utils';
 import List from '@ts/ui/list/list.edit.search';
 
 import type { PopupProperties } from '../popup/m_popup';

packages/devextreme/js/__internal/ui/date_range_box/m_date_range_box.ts

@@ -17,7 +17,7 @@ import { each } from '@js/core/utils/iterator';
 import type { Properties } from '@js/ui/date_range_box';
 import Editor from '@js/ui/editor/editor';
 import { current, isFluent, isMaterial } from '@js/ui/themes';
-import DropDownButton from '@ts/ui/drop_down_editor/m_drop_down_button';
+import DropDownButton from '@ts/ui/drop_down_editor/drop_down_button';
 import ClearButton from '@ts/ui/text_box/text_editor.clear';
 import TextEditorButtonCollection from '@ts/ui/text_box/texteditor_button_collection/index';
 

…i/drop_down_editor/m_drop_down_button.ts …/ui/drop_down_editor/drop_down_button.tspackages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_button.ts renamed to packages/devextreme/js/__internal/ui/drop_down_editor/drop_down_button.ts packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_button.ts renamed to packages/devextreme/js/__internal/ui/drop_down_editor/drop_down_button.ts

@@ -9,8 +9,8 @@ import Button from '@js/ui/button';
 
 import type TextEditorBase from '../text_box/text_editor.base';
 import TextEditorButton from '../text_box/texteditor_button_collection/button';
-import type DropDownEditor from './m_drop_down_editor';
-import type { DropDownEditorProperties } from './m_drop_down_editor';
+import type DropDownEditor from './drop_down_editor';
+import type { DropDownEditorProperties } from './drop_down_editor';
 
 const DROP_DOWN_EDITOR_BUTTON_CLASS = 'dx-dropdowneditor-button';
 const DROP_DOWN_EDITOR_BUTTON_VISIBLE = 'dx-dropdowneditor-button-visible';
@@ -125,7 +125,6 @@ export default class DropDownButton extends TextEditorButton {
   }
 
   // TODO: get rid of it
-  // eslint-disable-next-line class-methods-use-this
   _legacyRender(
     $editor?: dxElementWrapper,
     $element?: dxElementWrapper,

…i/drop_down_editor/m_drop_down_editor.ts …/ui/drop_down_editor/drop_down_editor.tspackages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_editor.ts renamed to packages/devextreme/js/__internal/ui/drop_down_editor/drop_down_editor.ts packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_editor.ts renamed to packages/devextreme/js/__internal/ui/drop_down_editor/drop_down_editor.ts

@@ -41,8 +41,8 @@ import TextBox from '@ts/ui/text_box/text_box';
 
 import type Popover from '../popover/m_popover';
 import type { TextEditorButtonInfo } from '../text_box/texteditor_button_collection/index';
-import DropDownButton from './m_drop_down_button';
-import { getElementWidth } from './m_utils';
+import DropDownButton from './drop_down_button';
+import { getElementWidth } from './utils';
 
 export const DROP_DOWN_EDITOR_CLASS = 'dx-dropdowneditor';
 const DROP_DOWN_EDITOR_INPUT_WRAPPER = 'dx-dropdowneditor-input-wrapper';
@@ -261,12 +261,10 @@ class DropDownEditor<
     };
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _useTemplates(): boolean {
     return true;
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _getDefaultPopupPosition(isRtlEnabled?: boolean): PositionConfig {
     const position = getDefaultAlignment(isRtlEnabled);
 
@@ -377,17 +375,14 @@ class DropDownEditor<
       .eq(0);
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _getAriaHasPopup(): string {
     return 'true';
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _getAriaAutocomplete(): string {
     return 'none';
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _getAriaRole(): string {
     return 'combobox';
   }
@@ -818,7 +813,6 @@ class DropDownEditor<
     this.setAria('label', OVERLAY_CONTENT_LABEL, $overlayContent);
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _renderPopupContent(): void {}
 
   _renderPopup(): void {
@@ -882,7 +876,6 @@ class DropDownEditor<
     this.setAria('id', this._popupContentId, $popupContent);
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _contentReadyHandler(): void {}
 
   _popupConfig(): PopupProperties {
@@ -925,7 +918,6 @@ class DropDownEditor<
     return config;
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _popupInitializedHandler(): void {}
 
   _getPopupInitializedHandler(): (e: PopupInitializedEvent) => void {
@@ -983,7 +975,6 @@ class DropDownEditor<
     }
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _popupShowingHandler(): void {}
 
   _popupHidingHandler(): void {
@@ -1171,7 +1162,6 @@ class DropDownEditor<
     return super._getSubmitElement();
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _shouldLogFieldTemplateDeprecationWarning(): boolean {
     return false;
   }

…/ui/drop_down_editor/m_drop_down_list.ts …al/ui/drop_down_editor/drop_down_list.tspackages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_list.ts renamed to packages/devextreme/js/__internal/ui/drop_down_editor/drop_down_list.ts packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_list.ts renamed to packages/devextreme/js/__internal/ui/drop_down_editor/drop_down_list.ts

@@ -31,7 +31,7 @@ import errors from '@js/ui/widget/ui.errors';
 import type { OptionChanged } from '@ts/core/widget/types';
 import { getDataSourceOptions } from '@ts/data/data_converter/grouped';
 import type DataController from '@ts/ui/collection/m_data_controller';
-import DropDownEditor from '@ts/ui/drop_down_editor/m_drop_down_editor';
+import DropDownEditor from '@ts/ui/drop_down_editor/drop_down_editor';
 import type { ListBaseProperties } from '@ts/ui/list/list.base';
 import List from '@ts/ui/list/list.edit.search';
 
@@ -252,7 +252,6 @@ class DropDownList<
     }
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _fitIntoRange(value: number, start: number, end: number): number {
     if (value > end) {
       return start;
@@ -312,7 +311,6 @@ class DropDownList<
     }
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _popupWrapperClass(): string {
     return DROPDOWNLIST_POPUP_WRAPPER_CLASS;
   }
@@ -576,7 +574,6 @@ class DropDownList<
     this.setAria('owns', this._popup && this._popupContentId);
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _getAriaHasPopup(): string {
     return 'listbox';
   }
@@ -593,7 +590,6 @@ class DropDownList<
     return Boolean(dataSource) !== this._needPassDataSourceToList();
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _isDesktopDevice(): boolean {
     return devices.real().deviceType === 'desktop';
   }
@@ -646,7 +642,6 @@ class DropDownList<
     return options;
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _canListHaveFocus(): boolean {
     return false;
   }
@@ -655,7 +650,6 @@ class DropDownList<
     return this._needPassDataSourceToList() ? this._dataSource : null;
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _dataSourceOptions(): Partial<DataSourceOptions<Item>> {
     return {
       paginate: false,
@@ -675,7 +669,6 @@ class DropDownList<
     return dataSource;
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _dataSourceFromUrlLoadMode(): string {
     return 'raw';
   }
@@ -712,7 +705,7 @@ class DropDownList<
     this._itemClickAction(e);
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   _listItemClickHandler(e?: ItemClickEvent<Item>): void { }
 
   _setListDataSource(): void {