Skip to content

Commit 073e58d

Browse files
committed
refactor(ng9): lint; rename base directives
1 parent b949782 commit 073e58d

File tree

12 files changed

+25
-38
lines changed

12 files changed

+25
-38
lines changed

projects/igniteui-angular/src/lib/grids/column-chooser-base.ts

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import { IgxStringFilteringOperand } from '../data-operations/filtering-conditio
33
import { FilteringExpressionsTree, IFilteringExpressionsTree } from '../data-operations/filtering-expressions-tree';
44
import { FilteringLogic, IFilteringExpression } from '../data-operations/filtering-expression.interface';
55
import { FilteringStrategy } from '../data-operations/filtering-strategy';
6-
import { ColumnChooserItemBase } from './column-chooser-item-base';
6+
import { ColumnChooserItemBaseDirective } from './column-chooser-item-base';
77
import { ColumnDisplayOrder } from './common/enums';
88

99
class CustomFilteringStrategy extends FilteringStrategy {
1010
public filter(data: any[], expressionsTree: IFilteringExpressionsTree): any[] {
11-
const res: ColumnChooserItemBase[] = [];
12-
data.forEach((item: ColumnChooserItemBase) => {
11+
const res: ColumnChooserItemBaseDirective[] = [];
12+
data.forEach((item: ColumnChooserItemBaseDirective) => {
1313
if (this.matchRecord(item, expressionsTree.filteringOperands[0] as IFilteringExpression)) {
1414
res.push(item);
1515
} else if (item.column.columnGroup) {
@@ -27,13 +27,12 @@ class CustomFilteringStrategy extends FilteringStrategy {
2727

2828
/** @hidden */
2929
@Directive()
30-
export abstract class ColumnChooserBase implements OnDestroy {
30+
export abstract class ColumnChooserBaseDirective implements OnDestroy {
3131
/**
3232
* Gets the grid columns that are going to be manipulated.
3333
* ```typescript
3434
* let gridColumns = this.columnHidingUI.columns;
3535
* ```
36-
* @memberof ColumnChooserBase
3736
*/
3837

3938
@Input()
@@ -45,7 +44,6 @@ export abstract class ColumnChooserBase implements OnDestroy {
4544
* ```html
4645
* <igx-column-hiding [columns]="grid.columns"></igx-column-hiding>
4746
* ```
48-
* @memberof ColumnChooserBase
4947
*/
5048
set columns(value) {
5149
if (value) {
@@ -61,7 +59,6 @@ export abstract class ColumnChooserBase implements OnDestroy {
6159
* ```typescript
6260
* let title = this.columnHidingUI.title;
6361
* ```
64-
* @memberof ColumnChooserBase
6562
*/
6663
@Input()
6764
get title() {
@@ -71,7 +68,6 @@ export abstract class ColumnChooserBase implements OnDestroy {
7168
* ```html
7269
* <igx-column-hiding [title]="'IgxColumnHidingComponent Title'"></igx-column-hiding>
7370
* ```
74-
* @memberof ColumnChooserBase
7571
*/
7672
set title(value) {
7773
this._title = (value) ? value : '';
@@ -81,7 +77,6 @@ export abstract class ColumnChooserBase implements OnDestroy {
8177
* ```typescript
8278
* let filterColumnsPrompt = this.columnHidingUI.filterColumnsPrompt;
8379
* ```
84-
* @memberof ColumnChooserBase
8580
*/
8681
@Input()
8782
get filterColumnsPrompt() {
@@ -92,7 +87,6 @@ export abstract class ColumnChooserBase implements OnDestroy {
9287
* ```html
9388
* <igx-column-hiding [filterColumnsPrompt]="'Type here to search'"></igx-column-hiding>
9489
* ```
95-
* @memberof ColumnChooserBase
9690
*/
9791
set filterColumnsPrompt(value) {
9892
this._filterColumnsPrompt = (value) ? value : '';
@@ -107,7 +101,6 @@ export abstract class ColumnChooserBase implements OnDestroy {
107101
* ```typescript
108102
* let columnItems = this.columnHidingUI.columnItems;
109103
* ```
110-
* @memberof ColumnChooserBase
111104
*/
112105
@Input()
113106
get columnItems() {
@@ -118,7 +111,6 @@ export abstract class ColumnChooserBase implements OnDestroy {
118111
* ```typescript
119112
* let filterCriteria = this.columnHidingUI.filterCriteria;
120113
* ```
121-
* @memberof ColumnChooserBase
122114
*/
123115
@Input()
124116
get filterCriteria() {
@@ -130,7 +122,6 @@ export abstract class ColumnChooserBase implements OnDestroy {
130122
* ```html
131123
* <igx-column-hiding [filterCriteria]="'ID'"></igx-column-hiding>
132124
* ```
133-
* @memberof ColumnChooserBase
134125
*/
135126
set filterCriteria(value) {
136127
if (!value || value.length === 0) {
@@ -151,7 +142,6 @@ export abstract class ColumnChooserBase implements OnDestroy {
151142
* ```typescript
152143
* let columnDisplayOrder = this.columnHidingUI.columnDisplayOrder;
153144
* ```
154-
* @memberof ColumnChooserBase
155145
*/
156146
@Input()
157147
get columnDisplayOrder() {
@@ -162,7 +152,6 @@ export abstract class ColumnChooserBase implements OnDestroy {
162152
* ```typescript
163153
* this.columnHidingUI.columnDisplayOrder = ColumnDisplayOrder.Alphabetical;
164154
* ```
165-
* @memberof ColumnChooserBase
166155
*/
167156
set columnDisplayOrder(value: ColumnDisplayOrder) {
168157
if (value !== undefined) {
@@ -186,7 +175,6 @@ export abstract class ColumnChooserBase implements OnDestroy {
186175
* ```html
187176
* <igx-column-hiding [columnsAreaMaxHeight]="200px"></igx-column-hiding>
188177
* ```
189-
* @memberof ColumnChooserBase
190178
*/
191179
@Input()
192180
public columnsAreaMaxHeight = '100%';
@@ -199,7 +187,6 @@ export abstract class ColumnChooserBase implements OnDestroy {
199187
* ```typescript
200188
* this.columnHidingUI.cssClass = 'column-chooser';
201189
* ```
202-
* @memberof ColumnChooserBase
203190
*/
204191
@HostBinding('attr.class')
205192
public cssClass = 'igx-column-hiding';

projects/igniteui-angular/src/lib/grids/column-chooser-item-base.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export interface IValueChangedEventArgs extends IBaseEventArgs {
1010
*@hidden
1111
*/
1212
@Directive()
13-
export abstract class ItemPropertyValueChanged {
13+
export abstract class ItemPropertyValueChangedDirective {
1414
private _object: any;
1515
private _propName: string;
1616

@@ -51,7 +51,7 @@ export abstract class ItemPropertyValueChanged {
5151

5252
/** @hidden */
5353
@Directive()
54-
export class ColumnChooserItemBase extends ItemPropertyValueChanged {
54+
export class ColumnChooserItemBaseDirective extends ItemPropertyValueChangedDirective {
5555
@Input()
5656
get column() {
5757
return this.object;

projects/igniteui-angular/src/lib/grids/common/events.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { IBaseEventArgs, CancelableEventArgs } from '../../core/utils';
2-
import { IgxBaseExporter, IgxExporterOptionsBase } from '../../services';
2+
import { IgxBaseExporterDirective, IgxExporterOptionsBase } from '../../services';
33
import { GridKeydownTargetType } from './enums';
44
import { IgxDragDirective } from '../../directives/drag-drop/drag-drop.directive';
55
import { IGridDataBindable } from './grid.interface';
@@ -70,7 +70,7 @@ export interface ISearchInfo {
7070

7171
export interface IGridToolbarExportEventArgs extends IBaseEventArgs {
7272
grid: IgxGridBaseDirective;
73-
exporter: IgxBaseExporter;
73+
exporter: IgxBaseExporterDirective;
7474
options: IgxExporterOptionsBase;
7575
cancel: boolean;
7676
}

projects/igniteui-angular/src/lib/grids/hiding/column-hiding-item.directive.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
import { Directive } from '@angular/core';
3-
import { ColumnChooserItemBase } from '../column-chooser-item-base';
3+
import { ColumnChooserItemBaseDirective } from '../column-chooser-item-base';
44
import { IBaseEventArgs } from '../../core/utils';
55

66
export interface IColumnVisibilityChangedEventArgs extends IBaseEventArgs {
@@ -12,7 +12,7 @@ export interface IColumnVisibilityChangedEventArgs extends IBaseEventArgs {
1212
@Directive({
1313
selector: '[igxColumnHidingItem]'
1414
})
15-
export class IgxColumnHidingItemDirective extends ColumnChooserItemBase {
15+
export class IgxColumnHidingItemDirective extends ColumnChooserItemBaseDirective {
1616

1717
constructor() {
1818
super('hidden');

projects/igniteui-angular/src/lib/grids/hiding/column-hiding.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
OnDestroy
88
} from '@angular/core';
99
import { IColumnVisibilityChangedEventArgs, IgxColumnHidingItemDirective } from './column-hiding-item.directive';
10-
import { ColumnChooserBase } from '../column-chooser-base';
10+
import { ColumnChooserBaseDirective } from '../column-chooser-base';
1111
import { takeUntil } from 'rxjs/operators';
1212
import { Subject } from 'rxjs';
1313

@@ -16,7 +16,7 @@ import { Subject } from 'rxjs';
1616
selector: 'igx-column-hiding',
1717
templateUrl: './column-hiding.component.html'
1818
})
19-
export class IgxColumnHidingComponent extends ColumnChooserBase implements OnDestroy {
19+
export class IgxColumnHidingComponent extends ColumnChooserBaseDirective implements OnDestroy {
2020
/**
2121
* Returns a boolean indicating whether the `HIDE ALL` button is disabled.
2222
* ```html

projects/igniteui-angular/src/lib/grids/pinning/column-pinning.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
import { Component, ChangeDetectorRef } from '@angular/core';
3-
import { ColumnChooserBase } from '../column-chooser-base';
3+
import { ColumnChooserBaseDirective } from '../column-chooser-base';
44
import { IgxColumnPinningItemDirective } from './pinning.directive';
55

66

@@ -10,7 +10,7 @@ import { IgxColumnPinningItemDirective } from './pinning.directive';
1010
selector: 'igx-column-pinning',
1111
templateUrl: './column-pinning.component.html'
1212
})
13-
export class IgxColumnPinningComponent extends ColumnChooserBase {
13+
export class IgxColumnPinningComponent extends ColumnChooserBaseDirective {
1414

1515
constructor(public cdr: ChangeDetectorRef) {
1616
super(cdr);

projects/igniteui-angular/src/lib/grids/pinning/pinning.directive.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { Directive } from '@angular/core';
2-
import { ColumnChooserItemBase } from '../column-chooser-item-base';
2+
import { ColumnChooserItemBaseDirective } from '../column-chooser-item-base';
33

44

55
@Directive({
66
selector: '[igxColumnPinningItem]'
77
})
8-
export class IgxColumnPinningItemDirective extends ColumnChooserItemBase {
8+
export class IgxColumnPinningItemDirective extends ColumnChooserItemBaseDirective {
99

1010
constructor() {
1111
super('pinned');

projects/igniteui-angular/src/lib/grids/toolbar/grid-toolbar.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
import { IDisplayDensityOptions, DisplayDensityToken, DisplayDensityBase } from '../../core/displayDensity';
1313
import {
1414
CsvFileTypes,
15-
IgxBaseExporter,
15+
IgxBaseExporterDirective,
1616
IgxCsvExporterOptions,
1717
IgxCsvExporterService,
1818
IgxExcelExporterOptions,
@@ -309,7 +309,7 @@ export class IgxGridToolbarComponent extends DisplayDensityBase {
309309
this.performExport(this.csvExporter, 'csv');
310310
}
311311

312-
private performExport(exp: IgxBaseExporter, exportType: string) {
312+
private performExport(exp: IgxBaseExporterDirective, exportType: string) {
313313
this.exportClicked();
314314

315315
const fileName = 'ExportedData';

projects/igniteui-angular/src/lib/services/csv/csv-exporter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { EventEmitter, Injectable, Output } from '@angular/core';
2-
import { IgxBaseExporter } from '../exporter-common/base-export-service';
2+
import { IgxBaseExporterDirective } from '../exporter-common/base-export-service';
33
import { ExportUtilities } from '../exporter-common/export-utilities';
44
import { CharSeparatedValueData } from './char-separated-value-data';
55
import { CsvFileTypes, IgxCsvExporterOptions } from './csv-exporter-options';
@@ -32,7 +32,7 @@ export interface ICsvExportEndedEventArgs extends IBaseEventArgs {
3232
* ```
3333
*/
3434
@Injectable()
35-
export class IgxCsvExporterService extends IgxBaseExporter {
35+
export class IgxCsvExporterService extends IgxBaseExporterDirective {
3636
private _stringData: string;
3737

3838
/**

projects/igniteui-angular/src/lib/services/excel/excel-exporter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { ExcelElementsFactory } from './excel-elements-factory';
55
import { ExcelFolderTypes } from './excel-enums';
66
import { IgxExcelExporterOptions } from './excel-exporter-options';
77
import { IExcelFolder } from './excel-interfaces';
8-
import { IgxBaseExporter } from '../exporter-common/base-export-service';
8+
import { IgxBaseExporterDirective } from '../exporter-common/base-export-service';
99
import { ExportUtilities } from '../exporter-common/export-utilities';
1010
import { WorksheetData } from './worksheet-data';
1111
import { IBaseEventArgs } from '../../core/utils';
@@ -36,7 +36,7 @@ export interface IExcelExportEndedEventArgs extends IBaseEventArgs {
3636
* ```
3737
*/
3838
@Injectable()
39-
export class IgxExcelExporterService extends IgxBaseExporter {
39+
export class IgxExcelExporterService extends IgxBaseExporterDirective {
4040

4141
private static ZIP_OPTIONS = { compression: 'DEFLATE', type: 'base64' };
4242
private _xlsx: JSZip;

0 commit comments

Comments
 (0)