Selection: remove m_ prefix from file names (DevExpress#30869)

Co-authored-by: Julia Volkova <iuliia.volkova@devexpress.com>

Author: juleari

packages/devextreme/js/__internal/grids/grid_core/selection/m_selection.ts

@@ -21,7 +21,7 @@ import type { ContextMenuController } from '@ts/grids/grid_core/context_menu/m_c
 import type { ModuleType } from '@ts/grids/grid_core/m_types';
 import type { StateStoringController } from '@ts/grids/grid_core/state_storing/m_state_storing_core';
 import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view';
-import Selection from '@ts/ui/selection/m_selection';
+import Selection from '@ts/ui/selection/selection';
 
 import type { DataController } from '../data_controller/m_data_controller';
 import modules from '../m_modules';

packages/devextreme/js/__internal/grids/new/grid_core/selection/controller.ts

@@ -8,7 +8,7 @@ import { computed, effect, signal } from '@ts/core/state_manager/index';
 import { DataController } from '@ts/grids/new/grid_core/data_controller/index';
 import { OptionsValidationController } from '@ts/grids/new/grid_core/options_validation/index';
 import { ShowCheckBoxesMode } from '@ts/grids/new/grid_core/selection/const';
-import Selection from '@ts/ui/selection/m_selection';
+import Selection from '@ts/ui/selection/selection';
 
 import type { CardInfo } from '../columns_controller/types';
 import type { DataObject, Key } from '../data_controller/types';

packages/devextreme/js/__internal/ui/collection/collection_widget.edit.ts

@@ -29,7 +29,7 @@ import type {
 import BaseCollectionWidget from '@ts/ui/collection/collection_widget.base';
 import PlainEditStrategy from '@ts/ui/collection/collection_widget.edit.strategy.plain';
 import type DataController from '@ts/ui/collection/m_data_controller';
-import Selection from '@ts/ui/selection/m_selection';
+import Selection from '@ts/ui/selection/selection';
 
 import type { CollectionItemIndex } from './collection_widget.edit.strategy';
 

…lection/m_selection.strategy.deferred.ts …selection/selection.strategy.deferred.tspackages/devextreme/js/__internal/ui/selection/m_selection.strategy.deferred.ts renamed to packages/devextreme/js/__internal/ui/selection/selection.strategy.deferred.ts packages/devextreme/js/__internal/ui/selection/m_selection.strategy.deferred.ts renamed to packages/devextreme/js/__internal/ui/selection/selection.strategy.deferred.ts

@@ -3,7 +3,7 @@ import type { DeferredObj } from '@js/core/utils/deferred';
 import { Deferred } from '@js/core/utils/deferred';
 import { isString } from '@js/core/utils/type';
 import errors from '@js/ui/widget/ui.errors';
-import SelectionStrategy from '@ts/ui/selection/m_selection.strategy';
+import SelectionStrategy from '@ts/ui/selection/selection.strategy';
 import type { KeyExpr, SelectionFilter, SelectionItem } from '@ts/ui/selection/types';
 
 export default class DeferredStrategy<
@@ -147,7 +147,6 @@ export default class DeferredStrategy<
     }
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _findSubFilter(
     selectionFilter: SelectionFilter | undefined,
     filter: SelectionFilter | undefined,
@@ -176,7 +175,6 @@ export default class DeferredStrategy<
     return false;
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _addFilterOperator(selectionFilter: SelectionFilter, filterOperator: 'and' | 'or'): SelectionFilter {
     let filter = selectionFilter;
     if (
@@ -194,7 +192,6 @@ export default class DeferredStrategy<
     return filter;
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _denormalizeFilter(filter: SelectionFilter): SelectionFilter {
     let resultFilter = filter;
     if (resultFilter && isString(resultFilter[0])) {
@@ -203,7 +200,6 @@ export default class DeferredStrategy<
     return resultFilter;
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _isOnlyNegativeFiltersLeft(filters: SelectionFilter): boolean {
     return filters.every((filterItem, i) => {
       if (i % 2 === 0) {
@@ -255,7 +251,6 @@ export default class DeferredStrategy<
     this._setOption('selectionFilter', !isDeselect && !selectionFilter.length ? null : selectionFilter);
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _normalizeFilter(filter: SelectionFilter): SelectionFilter {
     let resultFilter = filter;
     if (resultFilter && resultFilter.length === 1) {
@@ -264,7 +259,6 @@ export default class DeferredStrategy<
     return resultFilter;
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _removeFilterByIndex(filter: SelectionFilter, filterIndex: number, isSelectAll?: boolean): void {
     const operation = filter[1];
 
@@ -279,7 +273,6 @@ export default class DeferredStrategy<
     }
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _isSimpleKeyFilter(
     filter: SelectionFilter | undefined,
     key: string | Function | undefined,
@@ -357,6 +350,7 @@ export default class DeferredStrategy<
           isSelectAll,
         );
         if (innerFilterIndex >= 0) {
+          // eslint-disable-next-line max-depth
           if (!selectionFilter[i].length) {
             this._removeFilterByIndex(selectionFilter, i, isSelectAll);
           } else if (selectionFilter[i].length === 1) {
@@ -376,7 +370,7 @@ export default class DeferredStrategy<
 
     if (!selectionFilter) return true;
     if (!selectionFilter.length) return false;
-    if (!filter || !filter.length) return undefined;
+    if (!filter?.length) return undefined;
 
     selectionFilter = this._denormalizeFilter(selectionFilter);
 

…lection/m_selection.strategy.standard.ts …selection/selection.strategy.standard.tspackages/devextreme/js/__internal/ui/selection/m_selection.strategy.standard.ts renamed to packages/devextreme/js/__internal/ui/selection/selection.strategy.standard.ts packages/devextreme/js/__internal/ui/selection/m_selection.strategy.standard.ts renamed to packages/devextreme/js/__internal/ui/selection/selection.strategy.standard.ts

@@ -7,7 +7,7 @@ import { Deferred, when } from '@js/core/utils/deferred';
 import { SelectionFilterCreator } from '@js/core/utils/selection_filter';
 import { isDefined, isNumeric, isObject } from '@js/core/utils/type';
 import errors from '@js/ui/widget/ui.errors';
-import SelectionStrategy from '@ts/ui/selection/m_selection.strategy';
+import SelectionStrategy from '@ts/ui/selection/selection.strategy';
 import type {
   PendingOptions,
   RequestData,
@@ -241,33 +241,34 @@ export default class StandardStrategy<
       removedItems: [],
       keys: [],
     };
-    let lastRequestData: RequestData<TItem, TKey> = multiSelectEnabled
-      ? this._lastRequestData ?? emptyData
-      : emptyData;
 
-    if (multiSelectEnabled) {
-      if (this._shouldMergeWithLastRequest) {
-        if (isDeselectAll) {
+    if (!multiSelectEnabled) {
+      return emptyData;
+    }
+
+    let lastRequestData: RequestData<TItem, TKey> = this._lastRequestData ?? emptyData;
+
+    if (this._shouldMergeWithLastRequest) {
+      if (isDeselectAll) {
+        this._lastLoadDeferred?.reject();
+        lastRequestData = {} as RequestData<TItem, TKey>;
+      } else if (!isKeysEqual(keys, this.options.selectedItemKeys)) {
+        oldRequestItems.added = lastRequestData?.addedItems;
+        oldRequestItems.removed = lastRequestData?.removedItems;
+
+        if (!isDeselect) {
           this._lastLoadDeferred?.reject();
-          lastRequestData = {} as RequestData<TItem, TKey>;
-        } else if (!isKeysEqual(keys, this.options.selectedItemKeys)) {
-          oldRequestItems.added = lastRequestData?.addedItems;
-          oldRequestItems.removed = lastRequestData?.removedItems;
-
-          if (!isDeselect) {
-            this._lastLoadDeferred?.reject();
-          }
         }
       }
-
-      lastRequestData = this._concatRequestsItems(
-        keys,
-        oldRequestItems,
-        isDeselect,
-        this._shouldMergeWithLastRequest ? undefined : updatedKeys,
-      );
     }
 
+    lastRequestData = this._concatRequestsItems(
+      keys,
+      oldRequestItems,
+      isDeselect,
+      this._shouldMergeWithLastRequest ? undefined : updatedKeys,
+    );
+
     return lastRequestData;
   }
 
@@ -415,8 +416,7 @@ export default class StandardStrategy<
 
     return selectedItemKeys
       .findIndex(
-        (_, index) => (!ignoreIndicesMap || !ignoreIndicesMap[index])
-          && this.equalKeys(selectedItemKeys[index], key),
+        (_, index) => !ignoreIndicesMap?.[index] && this.equalKeys(selectedItemKeys[index], key),
       );
   }
 

…nal/ui/selection/m_selection.strategy.ts …ernal/ui/selection/selection.strategy.tspackages/devextreme/js/__internal/ui/selection/m_selection.strategy.ts renamed to packages/devextreme/js/__internal/ui/selection/selection.strategy.ts packages/devextreme/js/__internal/ui/selection/m_selection.strategy.ts renamed to packages/devextreme/js/__internal/ui/selection/selection.strategy.ts

@@ -26,8 +26,6 @@ export default class SelectionStrategy<
   _lastSelectAllPageDeferred = Deferred().reject();
 
   constructor(options: SelectionOptions<TItem, TKey>) {
-    // eslint-disable-next-line no-console
-    console.log('i tried so hard and got');
     this.options = options;
 
     this._setOption('disabledItemKeys', []);
@@ -41,7 +39,6 @@ export default class SelectionStrategy<
     this._setOption('addedItems', []);
   }
 
-  // eslint-disable-next-line class-methods-use-this
   validate(): void {}
 
   _setOption(name: string, value: unknown): void {
@@ -127,7 +124,6 @@ export default class SelectionStrategy<
     return equalByValue(key1, key2);
   }
 
-  // eslint-disable-next-line class-methods-use-this
   getSelectableItems(items: TItem[]): TItem[] {
     return items.filter((item) => !item?.disabled);
   }
@@ -289,7 +285,6 @@ export default class SelectionStrategy<
     return false;
   }
 
-  // eslint-disable-next-line class-methods-use-this
   selectedItemKeys(
     // eslint-disable-next-line  @typescript-eslint/no-unused-vars
     keys: TKey[],
@@ -308,23 +303,23 @@ export default class SelectionStrategy<
   }
 
   isItemKeySelected(itemKey: TKey | TItem): boolean;
-  // eslint-disable-next-line  @typescript-eslint/no-unused-vars, class-methods-use-this
+  // eslint-disable-next-line  @typescript-eslint/no-unused-vars
   isItemKeySelected(itemKey: TKey | TItem, options: { checkPending?: boolean } = {}): boolean {
     throw new Error('isItemKeySelected method should be overriden');
   }
 
   isItemDataSelected(itemKey: TKey | TItem): boolean;
-  // eslint-disable-next-line  @typescript-eslint/no-unused-vars, class-methods-use-this
+  // eslint-disable-next-line  @typescript-eslint/no-unused-vars
   isItemDataSelected(itemKey: TKey | TItem, options: { checkPending?: boolean } = {}): boolean {
     throw new Error('isItemKeySelected method should be overriden');
   }
 
-  // eslint-disable-next-line  @typescript-eslint/no-unused-vars, class-methods-use-this
+  // eslint-disable-next-line  @typescript-eslint/no-unused-vars
   addSelectedItem(itemKey: TKey, dataOrIsSelectAll?: TItem | boolean, skipFilter?: boolean): void {
     throw new Error('addSelectedItem method should be overriden');
   }
 
-  // eslint-disable-next-line  @typescript-eslint/no-unused-vars, class-methods-use-this
+  // eslint-disable-next-line  @typescript-eslint/no-unused-vars
   removeSelectedItem(itemKey: TKey): void {
     throw new Error('removeSelectedItem method should be overriden');
   }

…s/__internal/ui/selection/m_selection.ts …/js/__internal/ui/selection/selection.tspackages/devextreme/js/__internal/ui/selection/m_selection.ts renamed to packages/devextreme/js/__internal/ui/selection/selection.ts packages/devextreme/js/__internal/ui/selection/m_selection.ts renamed to packages/devextreme/js/__internal/ui/selection/selection.ts

@@ -2,8 +2,8 @@ import { noop } from '@js/core/utils/common';
 import { Deferred, type DeferredObj, when } from '@js/core/utils/deferred';
 import { extend } from '@js/core/utils/extend';
 import { isDefined, isPlainObject } from '@js/core/utils/type';
-import DeferredStrategy from '@ts/ui/selection/m_selection.strategy.deferred';
-import StandardStrategy from '@ts/ui/selection/m_selection.strategy.standard';
+import DeferredStrategy from '@ts/ui/selection/selection.strategy.deferred';
+import StandardStrategy from '@ts/ui/selection/selection.strategy.standard';
 import type {
   DefaultOptions,
   PendingOptions,
@@ -45,7 +45,6 @@ export default class Selection<
     }
   }
 
-  // eslint-disable-next-line class-methods-use-this
   _getDefaultOptions(): DefaultOptions<TItem, TKey, false> {
     const defaultOptions: DefaultOptions<TItem, TKey, false> = {
       allowNullValue: false,

packages/devextreme/js/__internal/ui/selection/types.ts

@@ -2,8 +2,8 @@ import type { LoadResult } from '@js/common/data';
 import type { FilterDescriptor, LoadOptions, SelectDescriptor } from '@js/common/data.types';
 import type { DeferredObj } from '@js/core/utils/deferred';
 import type { Cancelable } from '@js/events';
-import type DeferredStrategy from '@ts/ui/selection/m_selection.strategy.deferred';
-import type StandardStrategy from '@ts/ui/selection/m_selection.strategy.standard';
+import type DeferredStrategy from '@ts/ui/selection/selection.strategy.deferred';
+import type StandardStrategy from '@ts/ui/selection/selection.strategy.standard';
 
 export type SelectionFilter = FilterDescriptor[];
 

packages/devextreme/js/ui/file_manager/ui.file_manager.items_list.thumbnails.list_box.js

@@ -12,7 +12,7 @@ import { BindableTemplate } from '../../core/templates/bindable_template';
 
 import ScrollView from '../scroll_view';
 import CollectionWidget from '../collection/ui.collection_widget.edit';
-import Selection from '../../__internal/ui/selection/m_selection';
+import Selection from '../../__internal/ui/selection/selection';
 
 const FILE_MANAGER_THUMBNAILS_VIEW_PORT_CLASS = 'dx-filemanager-thumbnails-view-port';
 const FILE_MANAGER_THUMBNAILS_ITEM_LIST_CONTAINER_CLASS = 'dx-filemanager-thumbnails-container';

packages/devextreme/testing/tests/DevExpress.ui.widgets/selection.test.js

@@ -1,6 +1,6 @@
 import $ from 'jquery';
 import errors from 'ui/widget/ui.errors';
-import Selection from '__internal/ui/selection/m_selection';
+import Selection from '__internal/ui/selection/selection';
 import Guid from 'core/guid';
 import { DataSource } from 'common/data/data_source/data_source';
 import { CustomStore } from 'common/data/custom_store';