@theseam/ui-common 0.2.15 → 0.2.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -5,28 +5,22 @@ import { map } from 'rxjs/operators';
5
5
  import { notNullOrUndefined, observeControlValue } from '@theseam/ui-common/utils';
6
6
  import { DatatableComponent, THESEAM_DATATABLE } from '../datatable/datatable.component';
7
7
  import { HideColumnColumnsAlteration } from '../models/columns-alterations/hide-column.columns-alteration';
8
- import { getColumnProp } from '../utils/get-column-prop';
9
- import { ColumnsAlterationsManagerService } from '../services/columns-alterations-manager.service';
10
8
  import { isInternalColumn } from '../models/internal-column-props';
9
+ import { ColumnsAlterationsManagerService } from '../services/columns-alterations-manager.service';
10
+ import { getColumnProp } from '../utils/get-column-prop';
11
11
  export class DatatableColumnPreferencesComponent {
12
12
  constructor(_datatable, _columnsAlterationsManager) {
13
13
  var _a;
14
14
  this._datatable = _datatable;
15
15
  this._columnsAlterationsManager = _columnsAlterationsManager;
16
16
  this._filterControl = new FormControl();
17
- this._alphabeticalColumnCompareFn = (a, b) => {
18
- const aProp = getColumnProp(a);
19
- const bProp = getColumnProp(b);
20
- return aProp === bProp ? 0 : aProp > bProp ? 1 : -1;
21
- };
22
17
  this._columns$ = combineLatest([
23
18
  (_a = this._datatable.columns$) !== null && _a !== void 0 ? _a : of([]),
24
19
  observeControlValue(this._filterControl)
25
20
  ]).pipe(map(([columns, filter]) => {
26
21
  const _filter = (filter || '').trim().toLowerCase();
27
22
  return columns
28
- .filter(c => this._canToggleColumn(c, _filter))
29
- .sort(this._alphabeticalColumnCompareFn);
23
+ .filter(c => this._canToggleColumn(c, _filter));
30
24
  }));
31
25
  }
32
26
  _canToggleColumn(column, filter, omitInternalColumns = true) {
@@ -66,4 +60,4 @@ DatatableColumnPreferencesComponent.ctorParameters = () => [
66
60
  { type: DatatableComponent, decorators: [{ type: Inject, args: [THESEAM_DATATABLE,] }] },
67
61
  { type: ColumnsAlterationsManagerService }
68
62
  ];
69
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YXRhYmxlLWNvbHVtbi1wcmVmZXJlbmNlcy5jb21wb25lbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy91aS1jb21tb24vZGF0YXRhYmxlL2RhdGF0YWJsZS1jb2x1bW4tcHJlZmVyZW5jZXMvZGF0YXRhYmxlLWNvbHVtbi1wcmVmZXJlbmNlcy5jb21wb25lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLHVCQUF1QixFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQVMsTUFBTSxlQUFlLENBQUE7QUFDakYsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGdCQUFnQixDQUFBO0FBQzVDLE9BQU8sRUFBbUIsYUFBYSxFQUFjLEVBQUUsRUFBRSxNQUFNLE1BQU0sQ0FBQTtBQUNyRSxPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sZ0JBQWdCLENBQUE7QUFJcEMsT0FBTyxFQUFFLGtCQUFrQixFQUFFLG1CQUFtQixFQUFFLE1BQU0sMEJBQTBCLENBQUE7QUFFbEYsT0FBTyxFQUFFLGtCQUFrQixFQUFFLGlCQUFpQixFQUFFLE1BQU0sa0NBQWtDLENBQUE7QUFFeEYsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sOERBQThELENBQUE7QUFDMUcsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLDBCQUEwQixDQUFBO0FBQ3hELE9BQU8sRUFBRSxnQ0FBZ0MsRUFBRSxNQUFNLGlEQUFpRCxDQUFBO0FBQ2xHLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFBO0FBUWxFLE1BQU0sT0FBTyxtQ0FBbUM7SUFLOUMsWUFDcUMsVUFBOEIsRUFDaEQsMEJBQTREOztRQUQxQyxlQUFVLEdBQVYsVUFBVSxDQUFvQjtRQUNoRCwrQkFBMEIsR0FBMUIsMEJBQTBCLENBQWtDO1FBSi9FLG1CQUFjLEdBQUcsSUFBSSxXQUFXLEVBQUUsQ0FBQTtRQWlDMUIsaUNBQTRCLEdBQUcsQ0FBQyxDQUF5QixFQUFFLENBQXlCLEVBQUUsRUFBRTtZQUM5RixNQUFNLEtBQUssR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLENBQUE7WUFDOUIsTUFBTSxLQUFLLEdBQUcsYUFBYSxDQUFDLENBQUMsQ0FBQyxDQUFBO1lBQzlCLE9BQU8sS0FBSyxLQUFLLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBVSxLQUFNLEdBQVksS0FBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQ3pFLENBQUMsQ0FBQTtRQS9CQyxJQUFJLENBQUMsU0FBUyxHQUFHLGFBQWEsQ0FBQztZQUM3QixNQUFBLElBQUksQ0FBQyxVQUFVLENBQUMsUUFBUSxtQ0FBSSxFQUFFLENBQUMsRUFBRSxDQUFDO1lBQ2xDLG1CQUFtQixDQUFTLElBQUksQ0FBQyxjQUFjLENBQUM7U0FDakQsQ0FBQyxDQUFDLElBQUksQ0FDTCxHQUFHLENBQUMsQ0FBQyxDQUFFLE9BQU8sRUFBRSxNQUFNLENBQUUsRUFBRSxFQUFFO1lBQzFCLE1BQU0sT0FBTyxHQUFHLENBQUMsTUFBTSxJQUFJLEVBQUUsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFBO1lBQ25ELE9BQU8sT0FBTztpQkFDWCxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUFDO2lCQUM5QyxJQUFJLENBQUMsSUFBSSxDQUFDLDRCQUE0QixDQUFDLENBQUE7UUFDNUMsQ0FBQyxDQUFDLENBQ0gsQ0FBQTtJQUNILENBQUM7SUFFTyxnQkFBZ0IsQ0FBQyxNQUE4QixFQUFFLE1BQWMsRUFBRSxzQkFBK0IsSUFBSTtRQUMxRyxJQUFJLG1CQUFtQixJQUFJLGdCQUFnQixDQUFDLE1BQU0sQ0FBQyxFQUFFO1lBQ25ELE9BQU8sS0FBSyxDQUFBO1NBQ2I7UUFFRCxPQUFPLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLENBQUE7SUFDbEQsQ0FBQztJQUVPLG9CQUFvQixDQUFDLE1BQThCLEVBQUUsTUFBYztRQUN6RSxJQUFJLE1BQU0sQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFO1lBQUUsT0FBTyxJQUFJLENBQUE7U0FBRTtRQUV4QyxPQUFPLEdBQUcsQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxDQUFDLEVBQUUsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUE7SUFDaEYsQ0FBQztJQVFELFNBQVMsQ0FBQyxLQUFVLEVBQUUsR0FBMkI7UUFDL0MsTUFBTSxVQUFVLEdBQUcsYUFBYSxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQ3JDLE1BQU0sTUFBTSxHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQTtRQUU3QixJQUFJLENBQUMsa0JBQWtCLENBQUMsVUFBVSxDQUFDLEVBQUU7WUFDbkMsTUFBTSxLQUFLLENBQUMsNEJBQTRCLENBQUMsQ0FBQTtTQUMxQztRQUVELE1BQU0sVUFBVSxHQUFHLElBQUksMkJBQTJCLENBQ2hEO1lBQ0UsVUFBVTtZQUNWLE1BQU07U0FDUCxFQUNELE1BQU0sQ0FDUCxDQUFBO1FBRUQsSUFBSSxDQUFDLDBCQUEwQixDQUFDLEdBQUcsQ0FBQyxDQUFFLFVBQVUsQ0FBRSxDQUFDLENBQUE7SUFDckQsQ0FBQzs7O1lBakVGLFNBQVMsU0FBQztnQkFDVCxRQUFRLEVBQUUsbUNBQW1DO2dCQUM3Qyw4NEJBQTREO2dCQUU1RCxlQUFlLEVBQUUsdUJBQXVCLENBQUMsTUFBTTs7YUFDaEQ7OztZQVpRLGtCQUFrQix1QkFtQnRCLE1BQU0sU0FBQyxpQkFBaUI7WUFmcEIsZ0NBQWdDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ2hhbmdlRGV0ZWN0aW9uU3RyYXRlZ3ksIENvbXBvbmVudCwgSW5qZWN0LCBJbnB1dCB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnXG5pbXBvcnQgeyBGb3JtQ29udHJvbCB9IGZyb20gJ0Bhbmd1bGFyL2Zvcm1zJ1xuaW1wb3J0IHsgQmVoYXZpb3JTdWJqZWN0LCBjb21iaW5lTGF0ZXN0LCBPYnNlcnZhYmxlLCBvZiB9IGZyb20gJ3J4anMnXG5pbXBvcnQgeyBtYXAgfSBmcm9tICdyeGpzL29wZXJhdG9ycydcbmltcG9ydCB7IEJvb2xlYW5JbnB1dCB9IGZyb20gJ0Bhbmd1bGFyL2Nkay9jb2VyY2lvbidcblxuaW1wb3J0IHsgSW5wdXRCb29sZWFuIH0gZnJvbSAnQHRoZXNlYW0vdWktY29tbW9uL2NvcmUnXG5pbXBvcnQgeyBub3ROdWxsT3JVbmRlZmluZWQsIG9ic2VydmVDb250cm9sVmFsdWUgfSBmcm9tICdAdGhlc2VhbS91aS1jb21tb24vdXRpbHMnXG5cbmltcG9ydCB7IERhdGF0YWJsZUNvbXBvbmVudCwgVEhFU0VBTV9EQVRBVEFCTEUgfSBmcm9tICcuLi9kYXRhdGFibGUvZGF0YXRhYmxlLmNvbXBvbmVudCdcbmltcG9ydCB7IFRoZVNlYW1EYXRhdGFibGVDb2x1bW4gfSBmcm9tICcuLi9tb2RlbHMvdGFibGUtY29sdW1uJ1xuaW1wb3J0IHsgSGlkZUNvbHVtbkNvbHVtbnNBbHRlcmF0aW9uIH0gZnJvbSAnLi4vbW9kZWxzL2NvbHVtbnMtYWx0ZXJhdGlvbnMvaGlkZS1jb2x1bW4uY29sdW1ucy1hbHRlcmF0aW9uJ1xuaW1wb3J0IHsgZ2V0Q29sdW1uUHJvcCB9IGZyb20gJy4uL3V0aWxzL2dldC1jb2x1bW4tcHJvcCdcbmltcG9ydCB7IENvbHVtbnNBbHRlcmF0aW9uc01hbmFnZXJTZXJ2aWNlIH0gZnJvbSAnLi4vc2VydmljZXMvY29sdW1ucy1hbHRlcmF0aW9ucy1tYW5hZ2VyLnNlcnZpY2UnXG5pbXBvcnQgeyBpc0ludGVybmFsQ29sdW1uIH0gZnJvbSAnLi4vbW9kZWxzL2ludGVybmFsLWNvbHVtbi1wcm9wcydcblxuQENvbXBvbmVudCh7XG4gIHNlbGVjdG9yOiAnc2VhbS1kYXRhdGFibGUtY29sdW1uLXByZWZlcmVuY2VzJyxcbiAgdGVtcGxhdGVVcmw6ICcuL2RhdGF0YWJsZS1jb2x1bW4tcHJlZmVyZW5jZXMuY29tcG9uZW50Lmh0bWwnLFxuICBzdHlsZVVybHM6IFsnLi9kYXRhdGFibGUtY29sdW1uLXByZWZlcmVuY2VzLmNvbXBvbmVudC5zY3NzJ10sXG4gIGNoYW5nZURldGVjdGlvbjogQ2hhbmdlRGV0ZWN0aW9uU3RyYXRlZ3kuT25QdXNoXG59KVxuZXhwb3J0IGNsYXNzIERhdGF0YWJsZUNvbHVtblByZWZlcmVuY2VzQ29tcG9uZW50IHtcbiAgX2NvbHVtbnMkOiBPYnNlcnZhYmxlPFRoZVNlYW1EYXRhdGFibGVDb2x1bW5bXT5cblxuICBfZmlsdGVyQ29udHJvbCA9IG5ldyBGb3JtQ29udHJvbCgpXG5cbiAgY29uc3RydWN0b3IoXG4gICAgQEluamVjdChUSEVTRUFNX0RBVEFUQUJMRSkgcHJpdmF0ZSBfZGF0YXRhYmxlOiBEYXRhdGFibGVDb21wb25lbnQsXG4gICAgcHJpdmF0ZSByZWFkb25seSBfY29sdW1uc0FsdGVyYXRpb25zTWFuYWdlcjogQ29sdW1uc0FsdGVyYXRpb25zTWFuYWdlclNlcnZpY2UsXG4gICkge1xuICAgIHRoaXMuX2NvbHVtbnMkID0gY29tYmluZUxhdGVzdChbXG4gICAgICB0aGlzLl9kYXRhdGFibGUuY29sdW1ucyQgPz8gb2YoW10pLFxuICAgICAgb2JzZXJ2ZUNvbnRyb2xWYWx1ZTxzdHJpbmc+KHRoaXMuX2ZpbHRlckNvbnRyb2wpXG4gICAgXSkucGlwZShcbiAgICAgIG1hcCgoWyBjb2x1bW5zLCBmaWx0ZXIgXSkgPT4ge1xuICAgICAgICBjb25zdCBfZmlsdGVyID0gKGZpbHRlciB8fCAnJykudHJpbSgpLnRvTG93ZXJDYXNlKClcbiAgICAgICAgcmV0dXJuIGNvbHVtbnNcbiAgICAgICAgICAuZmlsdGVyKGMgPT4gdGhpcy5fY2FuVG9nZ2xlQ29sdW1uKGMsIF9maWx0ZXIpKVxuICAgICAgICAgIC5zb3J0KHRoaXMuX2FscGhhYmV0aWNhbENvbHVtbkNvbXBhcmVGbilcbiAgICAgIH0pLFxuICAgIClcbiAgfVxuXG4gIHByaXZhdGUgX2NhblRvZ2dsZUNvbHVtbihjb2x1bW46IFRoZVNlYW1EYXRhdGFibGVDb2x1bW4sIGZpbHRlcjogc3RyaW5nLCBvbWl0SW50ZXJuYWxDb2x1bW5zOiBib29sZWFuID0gdHJ1ZSk6IGJvb2xlYW4ge1xuICAgIGlmIChvbWl0SW50ZXJuYWxDb2x1bW5zICYmIGlzSW50ZXJuYWxDb2x1bW4oY29sdW1uKSkge1xuICAgICAgcmV0dXJuIGZhbHNlXG4gICAgfVxuXG4gICAgcmV0dXJuIHRoaXMuX2NvbHVtbk1hdGNoZXNGaWx0ZXIoY29sdW1uLCBmaWx0ZXIpXG4gIH1cblxuICBwcml2YXRlIF9jb2x1bW5NYXRjaGVzRmlsdGVyKGNvbHVtbjogVGhlU2VhbURhdGF0YWJsZUNvbHVtbiwgZmlsdGVyOiBzdHJpbmcpOiBib29sZWFuIHtcbiAgICBpZiAoZmlsdGVyLmxlbmd0aCA9PT0gMCkgeyByZXR1cm4gdHJ1ZSB9XG5cbiAgICByZXR1cm4gYCR7KGdldENvbHVtblByb3AoY29sdW1uKSB8fCAnJyl9YC50b0xvd2VyQ2FzZSgpLmluZGV4T2YoZmlsdGVyKSAhPT0gLTFcbiAgfVxuXG4gIHByaXZhdGUgX2FscGhhYmV0aWNhbENvbHVtbkNvbXBhcmVGbiA9IChhOiBUaGVTZWFtRGF0YXRhYmxlQ29sdW1uLCBiOiBUaGVTZWFtRGF0YXRhYmxlQ29sdW1uKSA9PiB7XG4gICAgY29uc3QgYVByb3AgPSBnZXRDb2x1bW5Qcm9wKGEpXG4gICAgY29uc3QgYlByb3AgPSBnZXRDb2x1bW5Qcm9wKGIpXG4gICAgcmV0dXJuIGFQcm9wID09PSBiUHJvcCA/IDAgOiAoPHN0cmluZz5hUHJvcCkgPiAoPHN0cmluZz5iUHJvcCkgPyAxIDogLTFcbiAgfVxuXG4gIF9vbkNoYW5nZShldmVudDogYW55LCBjb2w6IFRoZVNlYW1EYXRhdGFibGVDb2x1bW4pIHtcbiAgICBjb25zdCBjb2x1bW5Qcm9wID0gZ2V0Q29sdW1uUHJvcChjb2wpXG4gICAgY29uc3QgaGlkZGVuID0gIWV2ZW50LmNoZWNrZWRcblxuICAgIGlmICghbm90TnVsbE9yVW5kZWZpbmVkKGNvbHVtblByb3ApKSB7XG4gICAgICB0aHJvdyBFcnJvcihgVW5hYmxlIHRvIGdldCBjb2x1bW4gcHJvcC5gKVxuICAgIH1cblxuICAgIGNvbnN0IGFsdGVyYXRpb24gPSBuZXcgSGlkZUNvbHVtbkNvbHVtbnNBbHRlcmF0aW9uKFxuICAgICAge1xuICAgICAgICBjb2x1bW5Qcm9wLFxuICAgICAgICBoaWRkZW5cbiAgICAgIH0sXG4gICAgICBoaWRkZW5cbiAgICApXG5cbiAgICB0aGlzLl9jb2x1bW5zQWx0ZXJhdGlvbnNNYW5hZ2VyLmFkZChbIGFsdGVyYXRpb24gXSlcbiAgfVxuXG59XG4iXX0=
63
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YXRhYmxlLWNvbHVtbi1wcmVmZXJlbmNlcy5jb21wb25lbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy91aS1jb21tb24vZGF0YXRhYmxlL2RhdGF0YWJsZS1jb2x1bW4tcHJlZmVyZW5jZXMvZGF0YXRhYmxlLWNvbHVtbi1wcmVmZXJlbmNlcy5jb21wb25lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLHVCQUF1QixFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUUsTUFBTSxlQUFlLENBQUE7QUFDMUUsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGdCQUFnQixDQUFBO0FBQzVDLE9BQU8sRUFBRSxhQUFhLEVBQWMsRUFBRSxFQUFFLE1BQU0sTUFBTSxDQUFBO0FBQ3BELE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQTtBQUVwQyxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQTtBQUVsRixPQUFPLEVBQUUsa0JBQWtCLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQTtBQUN4RixPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSw4REFBOEQsQ0FBQTtBQUMxRyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQTtBQUVsRSxPQUFPLEVBQUUsZ0NBQWdDLEVBQUUsTUFBTSxpREFBaUQsQ0FBQTtBQUNsRyxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sMEJBQTBCLENBQUE7QUFReEQsTUFBTSxPQUFPLG1DQUFtQztJQUs5QyxZQUNxQyxVQUE4QixFQUNoRCwwQkFBNEQ7O1FBRDFDLGVBQVUsR0FBVixVQUFVLENBQW9CO1FBQ2hELCtCQUEwQixHQUExQiwwQkFBMEIsQ0FBa0M7UUFKL0UsbUJBQWMsR0FBRyxJQUFJLFdBQVcsRUFBRSxDQUFBO1FBTWhDLElBQUksQ0FBQyxTQUFTLEdBQUcsYUFBYSxDQUFDO1lBQzdCLE1BQUEsSUFBSSxDQUFDLFVBQVUsQ0FBQyxRQUFRLG1DQUFJLEVBQUUsQ0FBQyxFQUFFLENBQUM7WUFDbEMsbUJBQW1CLENBQVMsSUFBSSxDQUFDLGNBQWMsQ0FBQztTQUNqRCxDQUFDLENBQUMsSUFBSSxDQUNMLEdBQUcsQ0FBQyxDQUFDLENBQUUsT0FBTyxFQUFFLE1BQU0sQ0FBRSxFQUFFLEVBQUU7WUFDMUIsTUFBTSxPQUFPLEdBQUcsQ0FBQyxNQUFNLElBQUksRUFBRSxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUMsV0FBVyxFQUFFLENBQUE7WUFDbkQsT0FBTyxPQUFPO2lCQUNYLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLEVBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQTtRQUNuRCxDQUFDLENBQUMsQ0FDSCxDQUFBO0lBQ0gsQ0FBQztJQUVPLGdCQUFnQixDQUFDLE1BQThCLEVBQUUsTUFBYyxFQUFFLHNCQUErQixJQUFJO1FBQzFHLElBQUksbUJBQW1CLElBQUksZ0JBQWdCLENBQUMsTUFBTSxDQUFDLEVBQUU7WUFDbkQsT0FBTyxLQUFLLENBQUE7U0FDYjtRQUVELE9BQU8sSUFBSSxDQUFDLG9CQUFvQixDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUMsQ0FBQTtJQUNsRCxDQUFDO0lBRU8sb0JBQW9CLENBQUMsTUFBOEIsRUFBRSxNQUFjO1FBQ3pFLElBQUksTUFBTSxDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUU7WUFBRSxPQUFPLElBQUksQ0FBQTtTQUFFO1FBRXhDLE9BQU8sR0FBRyxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUMsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQTtJQUNoRixDQUFDO0lBRUQsU0FBUyxDQUFDLEtBQVUsRUFBRSxHQUEyQjtRQUMvQyxNQUFNLFVBQVUsR0FBRyxhQUFhLENBQUMsR0FBRyxDQUFDLENBQUE7UUFDckMsTUFBTSxNQUFNLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFBO1FBRTdCLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxVQUFVLENBQUMsRUFBRTtZQUNuQyxNQUFNLEtBQUssQ0FBQyw0QkFBNEIsQ0FBQyxDQUFBO1NBQzFDO1FBRUQsTUFBTSxVQUFVLEdBQUcsSUFBSSwyQkFBMkIsQ0FDaEQ7WUFDRSxVQUFVO1lBQ1YsTUFBTTtTQUNQLEVBQ0QsTUFBTSxDQUNQLENBQUE7UUFFRCxJQUFJLENBQUMsMEJBQTBCLENBQUMsR0FBRyxDQUFDLENBQUUsVUFBVSxDQUFFLENBQUMsQ0FBQTtJQUNyRCxDQUFDOzs7WUExREYsU0FBUyxTQUFDO2dCQUNULFFBQVEsRUFBRSxtQ0FBbUM7Z0JBQzdDLDg0QkFBNEQ7Z0JBRTVELGVBQWUsRUFBRSx1QkFBdUIsQ0FBQyxNQUFNOzthQUNoRDs7O1lBWlEsa0JBQWtCLHVCQW1CdEIsTUFBTSxTQUFDLGlCQUFpQjtZQWZwQixnQ0FBZ0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDaGFuZ2VEZXRlY3Rpb25TdHJhdGVneSwgQ29tcG9uZW50LCBJbmplY3QgfSBmcm9tICdAYW5ndWxhci9jb3JlJ1xuaW1wb3J0IHsgRm9ybUNvbnRyb2wgfSBmcm9tICdAYW5ndWxhci9mb3JtcydcbmltcG9ydCB7IGNvbWJpbmVMYXRlc3QsIE9ic2VydmFibGUsIG9mIH0gZnJvbSAncnhqcydcbmltcG9ydCB7IG1hcCB9IGZyb20gJ3J4anMvb3BlcmF0b3JzJ1xuXG5pbXBvcnQgeyBub3ROdWxsT3JVbmRlZmluZWQsIG9ic2VydmVDb250cm9sVmFsdWUgfSBmcm9tICdAdGhlc2VhbS91aS1jb21tb24vdXRpbHMnXG5cbmltcG9ydCB7IERhdGF0YWJsZUNvbXBvbmVudCwgVEhFU0VBTV9EQVRBVEFCTEUgfSBmcm9tICcuLi9kYXRhdGFibGUvZGF0YXRhYmxlLmNvbXBvbmVudCdcbmltcG9ydCB7IEhpZGVDb2x1bW5Db2x1bW5zQWx0ZXJhdGlvbiB9IGZyb20gJy4uL21vZGVscy9jb2x1bW5zLWFsdGVyYXRpb25zL2hpZGUtY29sdW1uLmNvbHVtbnMtYWx0ZXJhdGlvbidcbmltcG9ydCB7IGlzSW50ZXJuYWxDb2x1bW4gfSBmcm9tICcuLi9tb2RlbHMvaW50ZXJuYWwtY29sdW1uLXByb3BzJ1xuaW1wb3J0IHsgVGhlU2VhbURhdGF0YWJsZUNvbHVtbiB9IGZyb20gJy4uL21vZGVscy90YWJsZS1jb2x1bW4nXG5pbXBvcnQgeyBDb2x1bW5zQWx0ZXJhdGlvbnNNYW5hZ2VyU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL2NvbHVtbnMtYWx0ZXJhdGlvbnMtbWFuYWdlci5zZXJ2aWNlJ1xuaW1wb3J0IHsgZ2V0Q29sdW1uUHJvcCB9IGZyb20gJy4uL3V0aWxzL2dldC1jb2x1bW4tcHJvcCdcblxuQENvbXBvbmVudCh7XG4gIHNlbGVjdG9yOiAnc2VhbS1kYXRhdGFibGUtY29sdW1uLXByZWZlcmVuY2VzJyxcbiAgdGVtcGxhdGVVcmw6ICcuL2RhdGF0YWJsZS1jb2x1bW4tcHJlZmVyZW5jZXMuY29tcG9uZW50Lmh0bWwnLFxuICBzdHlsZVVybHM6IFsnLi9kYXRhdGFibGUtY29sdW1uLXByZWZlcmVuY2VzLmNvbXBvbmVudC5zY3NzJ10sXG4gIGNoYW5nZURldGVjdGlvbjogQ2hhbmdlRGV0ZWN0aW9uU3RyYXRlZ3kuT25QdXNoXG59KVxuZXhwb3J0IGNsYXNzIERhdGF0YWJsZUNvbHVtblByZWZlcmVuY2VzQ29tcG9uZW50IHtcbiAgX2NvbHVtbnMkOiBPYnNlcnZhYmxlPFRoZVNlYW1EYXRhdGFibGVDb2x1bW5bXT5cblxuICBfZmlsdGVyQ29udHJvbCA9IG5ldyBGb3JtQ29udHJvbCgpXG5cbiAgY29uc3RydWN0b3IoXG4gICAgQEluamVjdChUSEVTRUFNX0RBVEFUQUJMRSkgcHJpdmF0ZSBfZGF0YXRhYmxlOiBEYXRhdGFibGVDb21wb25lbnQsXG4gICAgcHJpdmF0ZSByZWFkb25seSBfY29sdW1uc0FsdGVyYXRpb25zTWFuYWdlcjogQ29sdW1uc0FsdGVyYXRpb25zTWFuYWdlclNlcnZpY2UsXG4gICkge1xuICAgIHRoaXMuX2NvbHVtbnMkID0gY29tYmluZUxhdGVzdChbXG4gICAgICB0aGlzLl9kYXRhdGFibGUuY29sdW1ucyQgPz8gb2YoW10pLFxuICAgICAgb2JzZXJ2ZUNvbnRyb2xWYWx1ZTxzdHJpbmc+KHRoaXMuX2ZpbHRlckNvbnRyb2wpXG4gICAgXSkucGlwZShcbiAgICAgIG1hcCgoWyBjb2x1bW5zLCBmaWx0ZXIgXSkgPT4ge1xuICAgICAgICBjb25zdCBfZmlsdGVyID0gKGZpbHRlciB8fCAnJykudHJpbSgpLnRvTG93ZXJDYXNlKClcbiAgICAgICAgcmV0dXJuIGNvbHVtbnNcbiAgICAgICAgICAuZmlsdGVyKGMgPT4gdGhpcy5fY2FuVG9nZ2xlQ29sdW1uKGMsIF9maWx0ZXIpKVxuICAgICAgfSksXG4gICAgKVxuICB9XG5cbiAgcHJpdmF0ZSBfY2FuVG9nZ2xlQ29sdW1uKGNvbHVtbjogVGhlU2VhbURhdGF0YWJsZUNvbHVtbiwgZmlsdGVyOiBzdHJpbmcsIG9taXRJbnRlcm5hbENvbHVtbnM6IGJvb2xlYW4gPSB0cnVlKTogYm9vbGVhbiB7XG4gICAgaWYgKG9taXRJbnRlcm5hbENvbHVtbnMgJiYgaXNJbnRlcm5hbENvbHVtbihjb2x1bW4pKSB7XG4gICAgICByZXR1cm4gZmFsc2VcbiAgICB9XG5cbiAgICByZXR1cm4gdGhpcy5fY29sdW1uTWF0Y2hlc0ZpbHRlcihjb2x1bW4sIGZpbHRlcilcbiAgfVxuXG4gIHByaXZhdGUgX2NvbHVtbk1hdGNoZXNGaWx0ZXIoY29sdW1uOiBUaGVTZWFtRGF0YXRhYmxlQ29sdW1uLCBmaWx0ZXI6IHN0cmluZyk6IGJvb2xlYW4ge1xuICAgIGlmIChmaWx0ZXIubGVuZ3RoID09PSAwKSB7IHJldHVybiB0cnVlIH1cblxuICAgIHJldHVybiBgJHsoZ2V0Q29sdW1uUHJvcChjb2x1bW4pIHx8ICcnKX1gLnRvTG93ZXJDYXNlKCkuaW5kZXhPZihmaWx0ZXIpICE9PSAtMVxuICB9XG5cbiAgX29uQ2hhbmdlKGV2ZW50OiBhbnksIGNvbDogVGhlU2VhbURhdGF0YWJsZUNvbHVtbikge1xuICAgIGNvbnN0IGNvbHVtblByb3AgPSBnZXRDb2x1bW5Qcm9wKGNvbClcbiAgICBjb25zdCBoaWRkZW4gPSAhZXZlbnQuY2hlY2tlZFxuXG4gICAgaWYgKCFub3ROdWxsT3JVbmRlZmluZWQoY29sdW1uUHJvcCkpIHtcbiAgICAgIHRocm93IEVycm9yKGBVbmFibGUgdG8gZ2V0IGNvbHVtbiBwcm9wLmApXG4gICAgfVxuXG4gICAgY29uc3QgYWx0ZXJhdGlvbiA9IG5ldyBIaWRlQ29sdW1uQ29sdW1uc0FsdGVyYXRpb24oXG4gICAgICB7XG4gICAgICAgIGNvbHVtblByb3AsXG4gICAgICAgIGhpZGRlblxuICAgICAgfSxcbiAgICAgIGhpZGRlblxuICAgIClcblxuICAgIHRoaXMuX2NvbHVtbnNBbHRlcmF0aW9uc01hbmFnZXIuYWRkKFsgYWx0ZXJhdGlvbiBdKVxuICB9XG5cbn1cbiJdfQ==
@@ -1915,19 +1915,13 @@ class DatatableColumnPreferencesComponent {
1915
1915
  this._datatable = _datatable;
1916
1916
  this._columnsAlterationsManager = _columnsAlterationsManager;
1917
1917
  this._filterControl = new FormControl();
1918
- this._alphabeticalColumnCompareFn = (a, b) => {
1919
- const aProp = getColumnProp(a);
1920
- const bProp = getColumnProp(b);
1921
- return aProp === bProp ? 0 : aProp > bProp ? 1 : -1;
1922
- };
1923
1918
  this._columns$ = combineLatest([
1924
1919
  (_a = this._datatable.columns$) !== null && _a !== void 0 ? _a : of([]),
1925
1920
  observeControlValue(this._filterControl)
1926
1921
  ]).pipe(map(([columns, filter]) => {
1927
1922
  const _filter = (filter || '').trim().toLowerCase();
1928
1923
  return columns
1929
- .filter(c => this._canToggleColumn(c, _filter))
1930
- .sort(this._alphabeticalColumnCompareFn);
1924
+ .filter(c => this._canToggleColumn(c, _filter));
1931
1925
  }));
1932
1926
  }
1933
1927
  _canToggleColumn(column, filter, omitInternalColumns = true) {