diff --git a/packages/cli/package.json b/packages/cli/package.json index df149d3ba..9def909fa 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "igniteui-cli", - "version": "14.6.4", + "version": "14.6.5-beta.0", "description": "CLI tool for creating Ignite UI projects", "keywords": [ "CLI", @@ -76,8 +76,8 @@ "all": true }, "dependencies": { - "@igniteui/angular-templates": "~20.1.1464", - "@igniteui/cli-core": "~14.6.4", + "@igniteui/angular-templates": "~20.1.1465-beta.0", + "@igniteui/cli-core": "~14.6.5-beta.0", "@inquirer/prompts": "^5.4.0", "@types/yargs": "^17.0.33", "chalk": "^5.3.0", diff --git a/packages/core/package.json b/packages/core/package.json index 89c7b12c3..c4ce585e0 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@igniteui/cli-core", - "version": "14.6.4", + "version": "14.6.5-beta.0", "description": "Base types and functionality for Ignite UI CLI", "repository": { "type": "git", diff --git a/packages/igx-templates/igx-ts/carousel/default/files/src/app/__path__/__filePrefix__.component.ts b/packages/igx-templates/igx-ts/carousel/default/files/src/app/__path__/__filePrefix__.component.ts index 6600e47fe..04ee71006 100644 --- a/packages/igx-templates/igx-ts/carousel/default/files/src/app/__path__/__filePrefix__.component.ts +++ b/packages/igx-templates/igx-ts/carousel/default/files/src/app/__path__/__filePrefix__.component.ts @@ -14,7 +14,6 @@ export class <%=ClassName%>Component implements OnInit { public interval = 3000; public pause = true; public loop = true; - constructor() { } public ngOnInit() { this.addNewSlide(); diff --git a/packages/igx-templates/igx-ts/custom-templates/awesome-grid/files/src/app/__path__/__filePrefix__.component.ts b/packages/igx-templates/igx-ts/custom-templates/awesome-grid/files/src/app/__path__/__filePrefix__.component.ts index cbad7b657..4424c78f6 100644 --- a/packages/igx-templates/igx-ts/custom-templates/awesome-grid/files/src/app/__path__/__filePrefix__.component.ts +++ b/packages/igx-templates/igx-ts/custom-templates/awesome-grid/files/src/app/__path__/__filePrefix__.component.ts @@ -17,7 +17,6 @@ import { IgxOverlayService, IgxStringFilteringOperand, IgxSummaryResult, - OverlayClosingEventArgs, OverlaySettings, IgxSwitchComponent, IgxInputGroupComponent, @@ -86,10 +85,10 @@ export class <%=ClassName%>Component implements OnInit, OnDestroy, AfterViewInit public overlaySettings!: OverlaySettings; public winner: Athlete = { Avatar: '', Name: '' } as Athlete; public top3: Athlete[] = []; - private _live: boolean = true; + private _live = true; private _timer: any; private windowWidth: any; - private _overlayId: string = ''; + private _overlayId = ''; get live(): boolean { return this._live; @@ -127,7 +126,7 @@ export class <%=ClassName%>Component implements OnInit, OnDestroy, AfterViewInit this.localData.forEach(rec => this.getSpeed(rec)); this.windowWidth = window.innerWidth; this._timer = setInterval(() => this.ticker(), 1500); - this.overlayService.closing.subscribe((event: OverlayClosingEventArgs) => { + this.overlayService.closing.subscribe(() => { this.showOverlay = false; }); } diff --git a/packages/igx-templates/igx-ts/custom-templates/crm-grid/files/src/app/__path__/__filePrefix__.component.ts b/packages/igx-templates/igx-ts/custom-templates/crm-grid/files/src/app/__path__/__filePrefix__.component.ts index abffcb7c4..9de06eca0 100644 --- a/packages/igx-templates/igx-ts/custom-templates/crm-grid/files/src/app/__path__/__filePrefix__.component.ts +++ b/packages/igx-templates/igx-ts/custom-templates/crm-grid/files/src/app/__path__/__filePrefix__.component.ts @@ -94,8 +94,8 @@ export class <%=ClassName%>Component implements OnInit, AfterViewInit { public soonSummary = SoonSummary; public cols!: QueryList; - public hiddenColsLength: number = 0; - public pinnedColsLength: number = 0; + public hiddenColsLength = 0; + public pinnedColsLength = 0; public searchText = ''; public caseSensitive = false; diff --git a/packages/igx-templates/igx-ts/custom-templates/crm-grid/files/src/app/__path__/data.ts b/packages/igx-templates/igx-ts/custom-templates/crm-grid/files/src/app/__path__/data.ts index fce682c71..01fd1996b 100644 --- a/packages/igx-templates/igx-ts/custom-templates/crm-grid/files/src/app/__path__/data.ts +++ b/packages/igx-templates/igx-ts/custom-templates/crm-grid/files/src/app/__path__/data.ts @@ -34,7 +34,6 @@ export interface Employee { tags: string; } -/* tslint:disable */ export const DATA: Employee[] = [ { "id": 256286239, "avatar": "assets/images/men/43.jpg", "name": "Gawain Beadnall", "email": "gbeadnall0@etsy.com", "company": "Divanoodle", "position": "Statistician I", "work_phone": "+1-317-866-4381", "mobile_phone": "+1-203-937-3567", "fax": "+1-212-115-1790", "street": "47 Garrison Park", "city": "Indianapolis", "post_code": 46207, "state": "IN", "country": "United States", "referred_by": "Vyky Corwin", "created_on": new Date("12/8/2017"), "birthday": new Date("2/10/2002"), "last_activity": new Date("12/16/2017"), "next_activity": new Date("4/16/2019"), "deals_won": 5, "deals_lost": 13, "deals_pending": 7, "deals_total": 25, "ratio": 28, "estimated_sales": 686210, "actual_sales": 421105, "tags": "warm, engineering" }, { "id": 863241310, "avatar": "assets/images/women/40.jpg", "name": "Ivy Simkovich", "email": "isimkovich1@clickbank.net", "company": "Linktype", "position": "Research Nurse", "work_phone": "+1-770-283-2050", "mobile_phone": "+1-509-995-2578", "fax": "+1-907-491-2187", "street": "3 Aberg Street", "city": "Marietta", "post_code": 30061, "state": "GA", "country": "United States", "referred_by": "Hew Chung", "created_on": new Date("6/24/2017"), "birthday": new Date("1/1/1997"), "last_activity": new Date("7/15/2017"), "next_activity": new Date("6/15/2019"), "deals_won": 2, "deals_lost": 4, "deals_pending": 29, "deals_total": 35, "ratio": 33, "estimated_sales": 2008801, "actual_sales": 186592, "tags": "demo, medical" }, @@ -487,4 +486,3 @@ export const DATA: Employee[] = [ { "id": 75323534, "avatar": "assets/images/women/52.jpg", "name": "Lorena Mousdall", "email": "lmousdallcn@elegantthemes.com", "company": "Aimbo", "position": "Geologist III", "work_phone": "+1-720-341-5046", "mobile_phone": "+1-916-195-7584", "fax": "+1-215-624-1834", "street": "12 Melby Place", "city": "Denver", "post_code": 80241, "state": "CO", "country": "United States", "referred_by": "Carmina Tomaszek", "created_on": new Date("3/13/2017"), "birthday": new Date("9/13/1978"), "last_activity": new Date("3/24/2017"), "next_activity": new Date("10/24/2018"), "deals_won": 14, "deals_lost": 11, "deals_pending": 2, "deals_total": 27, "ratio": 56, "estimated_sales": 300438, "actual_sales": 1338988, "tags": "cool, engineering" }, { "id": 46063202, "avatar": "assets/images/women/71.jpg", "name": "Gayle St Pierre", "email": "gstco@cargocollective.com", "company": "Trupe", "position": "VP Accounting", "work_phone": "+1-530-168-6924", "mobile_phone": "+1-646-366-5359", "fax": "+1-757-548-1834", "street": "48 Veith Junction", "city": "Chico", "post_code": 95973, "state": "CA", "country": "United States", "referred_by": "Lynda Drinan", "created_on": new Date("3/26/2017"), "birthday": new Date("3/10/1971"), "last_activity": new Date("4/17/2017"), "next_activity": new Date("10/17/2018"), "deals_won": 13, "deals_lost": 14, "deals_pending": 9, "deals_total": 36, "ratio": 48, "estimated_sales": 1716966, "actual_sales": 668928, "tags": "cold, medical" }, { "id": 743401827, "avatar": "assets/images/women/56.jpg", "name": "Romy Giacomelli", "email": "rgiacomellicp@ezinearticles.com", "company": "Eimbee", "position": "Cost Accountant", "work_phone": "+1-719-646-0552", "mobile_phone": "+1-203-707-2786", "fax": "+1-214-685-1141", "street": "952 Springs Alley", "city": "Colorado Springs", "post_code": 80915, "state": "CO", "country": "United States", "referred_by": "Alanna Begg", "created_on": new Date("11/18/2017"), "birthday": new Date("10/16/1982"), "last_activity": new Date("12/2/2017"), "next_activity": new Date("2/2/2018"), "deals_won": 5, "deals_lost": 13, "deals_pending": 8, "deals_total": 26, "ratio": 28, "estimated_sales": 1423424, "actual_sales": 949815, "tags": "subscriber, construction" }]; -/* tslint:enable */ diff --git a/packages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/__filePrefix__.component.html b/packages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/__filePrefix__.component.html index 90abbf391..c4467f4a2 100644 --- a/packages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/__filePrefix__.component.html +++ b/packages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/__filePrefix__.component.html @@ -5,7 +5,7 @@ Dark
- Grouped
@@ -203,7 +203,7 @@ -
+
Chart
diff --git a/packages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/__filePrefix__.component.ts b/packages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/__filePrefix__.component.ts index e5411089c..ffb16822d 100644 --- a/packages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/__filePrefix__.component.ts +++ b/packages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/__filePrefix__.component.ts @@ -93,13 +93,13 @@ export class <%=ClassName%>Component implements OnInit, AfterViewInit, OnDestroy @ViewChild('chart1', { static: true }) public chart1!: IgxCategoryChartComponent; @ViewChild('dialog', { static: true }) public dialog!: IgxDialogComponent; - public showToolbar: boolean = false; + public showToolbar = false; public properties: string[] = []; public selectionMode: GridSelectionMode = 'multiple'; public chartType = CategoryChartType; - public theme: boolean = false; - public volume: number = 1000; - public frequency: number = 500; + public theme = false; + public volume = 1000; + public frequency = 500; public data: any[] = []; public chartData: any[] = []; public multiCellSelection: { data: any[] } = { data: [] }; @@ -133,7 +133,7 @@ export class <%=ClassName%>Component implements OnInit, AfterViewInit, OnDestroy public contracts = Contract; public regions = REGIONS; private subscription: any; - private selectedButton: number = -1; + private selectedButton = -1; private timer: any; private volumeChanged: any; constructor( @@ -166,7 +166,7 @@ export class <%=ClassName%>Component implements OnInit, AfterViewInit, OnDestroy ]; this.volumeChanged = this.volumeSlider.valueChange.pipe(debounce(() => timer(200))); this.volumeChanged.subscribe( - (x: any) => { + () => { this.localService.getData(this.volume); }, (err: string) => console.log('Error: ' + err)); @@ -250,7 +250,7 @@ export class <%=ClassName%>Component implements OnInit, AfterViewInit, OnDestroy } } - public onChange(event: IChangeCheckboxEventArgs): void { + public onChange(): void { if (this.grid1.groupingExpressions.length > 0) { this.grid1.groupingExpressions = []; } else { @@ -364,11 +364,10 @@ export class <%=ClassName%>Component implements OnInit, AfterViewInit, OnDestroy private strongPositive = (rowData: any): boolean => { return rowData['Change(%)'] >= 1; } - private strongNegative = (rowData: any, key: string): boolean => { + private strongNegative = (rowData: any): boolean => { return rowData['Change(%)'] <= -1; } - // tslint:disable:member-ordering public trends = { changeNeg: this.changeNegative, changePos: this.changePositive, @@ -431,8 +430,6 @@ export class <%=ClassName%>Component implements OnInit, AfterViewInit, OnDestroy } } - // tslint:enable:member-ordering - private disableOtherButtons(ind: number, disableButtons: boolean): void { if (this.subscription) { this.subscription.unsubscribe(); @@ -480,9 +477,8 @@ export class <%=ClassName%>Component implements OnInit, AfterViewInit, OnDestroy */ private updateRandomPrices(data: any[]): any { const newData = data.slice(); - for (let i = Math.round(Math.random() * 10), y = 0; i < data.length; i += Math.round(Math.random() * 10)) { + for (let i = Math.round(Math.random() * 10); i < data.length; i += Math.round(Math.random() * 10)) { newData[i] = this.randomizeObjectData(data[i]); - y++; } return newData; } diff --git a/packages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/localData.service.ts b/packages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/localData.service.ts index 5868d1753..2cdf8c9f4 100644 --- a/packages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/localData.service.ts +++ b/packages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/localData.service.ts @@ -12,7 +12,7 @@ export class LocalDataService { this.records = this.records$.asObservable(); } - public getData(count: number = 10) { + public getData(count = 10) { const financialData: FinancialData = new FinancialData(); this.records$.next(financialData.generateData(count)); } diff --git a/packages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/localData/financialData.ts b/packages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/localData/financialData.ts index 157f4256d..253454a39 100644 --- a/packages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/localData/financialData.ts +++ b/packages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/localData/financialData.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ export const REGIONS: any[] = [ { "Region": "North America", @@ -48,7 +47,6 @@ export const MOCKFINANCEDATA: any[] = [ "IndSect": "Consumer, Cyclical", "IndSubg": "Airlines", "SecType": "PUBLIC", - // tslint:disable-next-line:object-literal-sort-keys "CpnTyp": "FIXED", "IssuerN": "AMERICAN AIRLINES GROUP", "Moodys": "WR", @@ -887,7 +885,6 @@ interface IResponse { data: any[]; recordsUpdated: number; } -/* tslint:enable */ export class FinancialData { public generateData(count: number): any[] { const currData = []; @@ -900,13 +897,10 @@ export class FinancialData { const region = REGIONS[this.generateRandomNumber(0, 5)]; dataObj.Region = region.Region; dataObj.Country = this.randomizeCountry(region); - // for (let y = 0; y < 80; y++) { - // dataObj["Text" + y] = "Text"; - // } for (const mockData of MOCKFINANCEDATA) { for (const prop in mockData) { - if (mockData.hasOwnProperty(prop)) { + if (Object.prototype.hasOwnProperty.call(mockData, prop)) { dataObj[prop] = mockData[prop]; } } @@ -930,12 +924,10 @@ export class FinancialData { public updateRandomPrices(data: any[]): any { const currData = data.slice(0, data.length + 1); - let y = 0; for (let i = Math.round(Math.random() * 10); i < data.length; i += Math.round(Math.random() * 10)) { const dataObj = Object.assign({}, data[i]); this.randomizeObjectData(dataObj); currData[i] = dataObj; - y++; } // return {data: currData, recordsUpdated: y }; return currData; diff --git a/packages/igx-templates/igx-ts/custom-templates/fintech-tree-grid/files/src/app/__path__/__filePrefix__.component.ts b/packages/igx-templates/igx-ts/custom-templates/fintech-tree-grid/files/src/app/__path__/__filePrefix__.component.ts index ead426ff6..6fc43626f 100644 --- a/packages/igx-templates/igx-ts/custom-templates/fintech-tree-grid/files/src/app/__path__/__filePrefix__.component.ts +++ b/packages/igx-templates/igx-ts/custom-templates/fintech-tree-grid/files/src/app/__path__/__filePrefix__.component.ts @@ -70,11 +70,11 @@ export class <%=ClassName%>Component implements OnInit, AfterViewInit, OnDestroy @ViewChild('slider1', { static: true }) public volumeSlider!: IgxSliderComponent; @ViewChild('slider2', { static: true }) public intervalSlider!: IgxSliderComponent; - public showToolbar: boolean = true; + public showToolbar = true; public selectionMode: GridSelectionMode = 'multiple'; - public theme: boolean = false; - public volume: number = 1000; - public frequency: number = 500; + public theme = false; + public volume = 1000; + public frequency = 500; public data: any[] = []; public controls = [ { @@ -111,7 +111,7 @@ export class <%=ClassName%>Component implements OnInit, AfterViewInit, OnDestroy field: 'Price' }, { - aggregate: (parent: any, data: any[]) => { + aggregate: (parent: any) => { return parent.Change / (parent.Price - parent.Change) * 100; }, field: 'Change(%)' @@ -137,7 +137,7 @@ export class <%=ClassName%>Component implements OnInit, AfterViewInit, OnDestroy }; private subscription: any; - private selectedButton: number = -1; + private selectedButton = -1; private timer: any; private volumeChanged: any; @@ -150,7 +150,7 @@ export class <%=ClassName%>Component implements OnInit, AfterViewInit, OnDestroy this.grid1.sortingExpressions = [{ fieldName: this.groupColumnKey, dir: SortingDirection.Desc }]; this.volumeChanged = this.volumeSlider.valueChange.pipe(debounce(() => timer(200))); this.volumeChanged.subscribe( - (x: any) => { + () => { this.localService.getData(this.volume); }, (err: string) => console.log('Error: ' + err)); @@ -241,11 +241,10 @@ export class <%=ClassName%>Component implements OnInit, AfterViewInit, OnDestroy private strongPositive = (rowData: any): boolean => { return rowData['Change(%)'] >= 1; } - private strongNegative = (rowData: any, key: string): boolean => { + private strongNegative = (rowData: any): boolean => { return rowData['Change(%)'] <= -1; } - // tslint:disable:member-ordering public trends = { changeNeg: this.changeNegative, changePos: this.changePositive, @@ -261,7 +260,6 @@ export class <%=ClassName%>Component implements OnInit, AfterViewInit, OnDestroy strongNegative2: this.strongNegative, strongPositive2: this.strongPositive }; - // tslint:enable:member-ordering private disableOtherButtons(ind: number, disableButtons: boolean): void { if (this.subscription) { @@ -308,10 +306,8 @@ export class <%=ClassName%>Component implements OnInit, AfterViewInit, OnDestroy */ private updateRandomPrices(data: any[]): any { const newData = data.slice(); - let y = 0; for (let i = Math.round(Math.random() * 10); i < newData.length; i += Math.round(Math.random() * 10)) { this.randomizeObjectData(newData[i]); - y++; } return newData; } diff --git a/packages/igx-templates/igx-ts/custom-templates/fintech-tree-grid/files/src/app/__path__/assets/financialData.ts b/packages/igx-templates/igx-ts/custom-templates/fintech-tree-grid/files/src/app/__path__/assets/financialData.ts index 157f4256d..253454a39 100644 --- a/packages/igx-templates/igx-ts/custom-templates/fintech-tree-grid/files/src/app/__path__/assets/financialData.ts +++ b/packages/igx-templates/igx-ts/custom-templates/fintech-tree-grid/files/src/app/__path__/assets/financialData.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ export const REGIONS: any[] = [ { "Region": "North America", @@ -48,7 +47,6 @@ export const MOCKFINANCEDATA: any[] = [ "IndSect": "Consumer, Cyclical", "IndSubg": "Airlines", "SecType": "PUBLIC", - // tslint:disable-next-line:object-literal-sort-keys "CpnTyp": "FIXED", "IssuerN": "AMERICAN AIRLINES GROUP", "Moodys": "WR", @@ -887,7 +885,6 @@ interface IResponse { data: any[]; recordsUpdated: number; } -/* tslint:enable */ export class FinancialData { public generateData(count: number): any[] { const currData = []; @@ -900,13 +897,10 @@ export class FinancialData { const region = REGIONS[this.generateRandomNumber(0, 5)]; dataObj.Region = region.Region; dataObj.Country = this.randomizeCountry(region); - // for (let y = 0; y < 80; y++) { - // dataObj["Text" + y] = "Text"; - // } for (const mockData of MOCKFINANCEDATA) { for (const prop in mockData) { - if (mockData.hasOwnProperty(prop)) { + if (Object.prototype.hasOwnProperty.call(mockData, prop)) { dataObj[prop] = mockData[prop]; } } @@ -930,12 +924,10 @@ export class FinancialData { public updateRandomPrices(data: any[]): any { const currData = data.slice(0, data.length + 1); - let y = 0; for (let i = Math.round(Math.random() * 10); i < data.length; i += Math.round(Math.random() * 10)) { const dataObj = Object.assign({}, data[i]); this.randomizeObjectData(dataObj); currData[i] = dataObj; - y++; } // return {data: currData, recordsUpdated: y }; return currData; diff --git a/packages/igx-templates/igx-ts/custom-templates/fintech-tree-grid/files/src/app/__path__/localData.service.ts b/packages/igx-templates/igx-ts/custom-templates/fintech-tree-grid/files/src/app/__path__/localData.service.ts index 4b5398012..08807db0c 100644 --- a/packages/igx-templates/igx-ts/custom-templates/fintech-tree-grid/files/src/app/__path__/localData.service.ts +++ b/packages/igx-templates/igx-ts/custom-templates/fintech-tree-grid/files/src/app/__path__/localData.service.ts @@ -12,7 +12,7 @@ export class LocalDataService { this.records = this.records$.asObservable(); } - public getData(count: number = 10): void { + public getData(count = 10): void { const financialData: FinancialData = new FinancialData(); this.records$.next(financialData.generateData(count)); } diff --git a/packages/igx-templates/igx-ts/custom-templates/fintech-tree-grid/files/src/app/__path__/tree-grid-grouping.pipe.ts b/packages/igx-templates/igx-ts/custom-templates/fintech-tree-grid/files/src/app/__path__/tree-grid-grouping.pipe.ts index 052aa4866..4bfc3c0b0 100644 --- a/packages/igx-templates/igx-ts/custom-templates/fintech-tree-grid/files/src/app/__path__/tree-grid-grouping.pipe.ts +++ b/packages/igx-templates/igx-ts/custom-templates/fintech-tree-grid/files/src/app/__path__/tree-grid-grouping.pipe.ts @@ -7,7 +7,7 @@ class GroupByRecord { } export class ITreeGridAggregation { - public field: string = ''; + public field = ''; public aggregate: (parent: any, children: any[]) => any = [] as any; } @@ -40,7 +40,7 @@ export class <%=ClassName%>TreeGridGroupingPipe implements PipeTransform { parentID: any, data: any[]) { for (const groupRecord of groupRecords) { - const parent: { [key: string]: any } = {}; + const parent: Record = {}; const children = groupRecord.records; parent[primaryKey] = parentID + groupRecord.key; diff --git a/packages/igx-templates/igx-ts/custom-templates/login/files/src/app/__path__/__filePrefix__.component.ts b/packages/igx-templates/igx-ts/custom-templates/login/files/src/app/__path__/__filePrefix__.component.ts index 2aafcb9af..92b852cd1 100644 --- a/packages/igx-templates/igx-ts/custom-templates/login/files/src/app/__path__/__filePrefix__.component.ts +++ b/packages/igx-templates/igx-ts/custom-templates/login/files/src/app/__path__/__filePrefix__.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Output } from '@angular/core'; +import { Component } from '@angular/core'; import { FormBuilder, FormGroup, @@ -56,6 +56,7 @@ export class <%=ClassName%>Component { } tryLogin() { + // eslint-disable-next-line @typescript-eslint/no-unused-vars const loginInfo = this.loginForm.value; // use loginInfo this.showLogin = false; @@ -72,6 +73,7 @@ export class <%=ClassName%>Component { } tryRegister() { + // eslint-disable-next-line @typescript-eslint/no-unused-vars const registerInfo = this.registrationForm.value; // use registerInfo this.showRegister = false; diff --git a/packages/igx-templates/igx-ts/custom-templates/weather-forecast/files/src/app/__path__/weather-data.ts b/packages/igx-templates/igx-ts/custom-templates/weather-forecast/files/src/app/__path__/weather-data.ts index dae6070c9..724ff340a 100644 --- a/packages/igx-templates/igx-ts/custom-templates/weather-forecast/files/src/app/__path__/weather-data.ts +++ b/packages/igx-templates/igx-ts/custom-templates/weather-forecast/files/src/app/__path__/weather-data.ts @@ -1,4 +1,3 @@ -// tslint:disable:object-literal-sort-keys export const data = { city: 'Sofia', humidity: '44%', diff --git a/packages/igx-templates/igx-ts/generate/files/src/app/__path__/__filePrefix__.component.ts b/packages/igx-templates/igx-ts/generate/files/src/app/__path__/__filePrefix__.component.ts index f5337963e..9bed78fa8 100644 --- a/packages/igx-templates/igx-ts/generate/files/src/app/__path__/__filePrefix__.component.ts +++ b/packages/igx-templates/igx-ts/generate/files/src/app/__path__/__filePrefix__.component.ts @@ -8,5 +8,4 @@ import { Component } from '@angular/core'; }) export class <%=ClassName%>Component { title = '<%=name%>'; - constructor() { } } diff --git a/packages/igx-templates/igx-ts/grid/grid-custom/index.ts b/packages/igx-templates/igx-ts/grid/grid-custom/index.ts index 61dd10b98..778733801 100644 --- a/packages/igx-templates/igx-ts/grid/grid-custom/index.ts +++ b/packages/igx-templates/igx-ts/grid/grid-custom/index.ts @@ -61,7 +61,6 @@ class IgxCustomGridTemplate extends IgniteUIForAngularTemplate { const featureUrl = "https://www.infragistics.com/products/ignite-ui-angular/angular/components/grid/"; const anchorWrapper = { start: ``, text: ``, diff --git a/packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-batch-editing/files/src/app/__path__/data.ts b/packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-batch-editing/files/src/app/__path__/data.ts index b726e1be5..f4f00e20c 100644 --- a/packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-batch-editing/files/src/app/__path__/data.ts +++ b/packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-batch-editing/files/src/app/__path__/data.ts @@ -3704,7 +3704,7 @@ export const CUSTOMERS = [ CompanyName: "Godos Cocina Típica", ContactName: "José Pedro Freyre", ContactTitle: "Sales Manager", - Address: "C\/ Romero, 33", + Address: "C/ Romero, 33", City: "Sevilla", PostalCode: "41101", Country: "Spain", @@ -3719,7 +3719,7 @@ export const CUSTOMERS = [ ShipVia: 2, Freight: 107.8300, ShipName: "Godos Cocina Típica", - ShipAddress: "C\/ Romero, 33", + ShipAddress: "C/ Romero, 33", ShipCity: "Sevilla", ShipPostalCode: "41101", ShipCountry: "Spain", @@ -4698,7 +4698,7 @@ export const CUSTOMERS = [ CompanyName: "Bólido Comidas preparadas", ContactName: "Martín Sommer", ContactTitle: "Owner", - Address: "C\/ Araquil, 67", + Address: "C/ Araquil, 67", City: "Madrid", PostalCode: "28023", Country: "Spain", @@ -4714,7 +4714,7 @@ export const CUSTOMERS = [ ShipVia: 2, Freight: 77.9200, ShipName: "Bólido Comidas preparadas", - ShipAddress: "C\/ Araquil, 67", + ShipAddress: "C/ Araquil, 67", ShipCity: "Madrid", ShipPostalCode: "28023", ShipCountry: "Spain", @@ -12973,7 +12973,7 @@ export const CUSTOMERS = [ ] }, { CustomerID: "NORTS", - CompanyName: "North\/South", + CompanyName: "North/South", ContactName: "Simon Crowther", ContactTitle: "Sales Associate", Address: "South House 300 Queensbridge", @@ -12991,7 +12991,7 @@ export const CUSTOMERS = [ ShippedDate: new Date("1997-04-29T00:00:00"), ShipVia: 3, Freight: 32.0700, - ShipName: "North\/South", + ShipName: "North/South", ShipAddress: "South House 300 Queensbridge", ShipCity: "London", ShipPostalCode: "SW7 1RZ", @@ -14431,7 +14431,7 @@ export const CUSTOMERS = [ CompanyName: "Godos Cocina Típica", ContactName: "José Pedro Freyre", ContactTitle: "Sales Manager", - Address: "C\/ Romero, 33", + Address: "C/ Romero, 33", City: "Sevilla", PostalCode: "41101", Country: "Spain", @@ -14446,7 +14446,7 @@ export const CUSTOMERS = [ ShipVia: 3, Freight: 4.3200, ShipName: "Godos Cocina Típica", - ShipAddress: "C\/ Romero, 33", + ShipAddress: "C/ Romero, 33", ShipCity: "Sevilla", ShipPostalCode: "41101", ShipCountry: "Spain", @@ -17227,7 +17227,7 @@ export const CUSTOMERS = [ CustomerID: "WILMK", CompanyName: "Wilman Kala", ContactName: "Matti Karttunen", - ContactTitle: "Owner\/Marketing Assistant", + ContactTitle: "Owner/Marketing Assistant", Address: "Keskuskatu 45", City: "Helsinki", PostalCode: "21240", @@ -17812,7 +17812,7 @@ export const CUSTOMERS = [ CompanyName: "Godos Cocina Típica", ContactName: "José Pedro Freyre", ContactTitle: "Sales Manager", - Address: "C\/ Romero, 33", + Address: "C/ Romero, 33", City: "Sevilla", PostalCode: "41101", Country: "Spain", @@ -17827,7 +17827,7 @@ export const CUSTOMERS = [ ShipVia: 3, Freight: 85.4600, ShipName: "Godos Cocina Típica", - ShipAddress: "C\/ Romero, 33", + ShipAddress: "C/ Romero, 33", ShipCity: "Sevilla", ShipPostalCode: "41101", ShipCountry: "Spain", @@ -19704,7 +19704,7 @@ export const CUSTOMERS = [ CustomerID: "WILMK", CompanyName: "Wilman Kala", ContactName: "Matti Karttunen", - ContactTitle: "Owner\/Marketing Assistant", + ContactTitle: "Owner/Marketing Assistant", Address: "Keskuskatu 45", City: "Helsinki", PostalCode: "21240", @@ -20654,7 +20654,7 @@ export const CUSTOMERS = [ CustomerID: "WILMK", CompanyName: "Wilman Kala", ContactName: "Matti Karttunen", - ContactTitle: "Owner\/Marketing Assistant", + ContactTitle: "Owner/Marketing Assistant", Address: "Keskuskatu 45", City: "Helsinki", PostalCode: "21240", @@ -23153,7 +23153,7 @@ export const CUSTOMERS = [ ] }, { CustomerID: "NORTS", - CompanyName: "North\/South", + CompanyName: "North/South", ContactName: "Simon Crowther", ContactTitle: "Sales Associate", Address: "South House 300 Queensbridge", @@ -23171,7 +23171,7 @@ export const CUSTOMERS = [ ShippedDate: new Date("1997-11-28T00:00:00"), ShipVia: 3, Freight: 1.3900, - ShipName: "North\/South", + ShipName: "North/South", ShipAddress: "South House 300 Queensbridge", ShipCity: "London", ShipPostalCode: "SW7 1RZ", @@ -25229,7 +25229,7 @@ export const CUSTOMERS = [ CompanyName: "Bólido Comidas preparadas", ContactName: "Martín Sommer", ContactTitle: "Owner", - Address: "C\/ Araquil, 67", + Address: "C/ Araquil, 67", City: "Madrid", PostalCode: "28023", Country: "Spain", @@ -25245,7 +25245,7 @@ export const CUSTOMERS = [ ShipVia: 2, Freight: 97.0900, ShipName: "Bólido Comidas preparadas", - ShipAddress: "C\/ Araquil, 67", + ShipAddress: "C/ Araquil, 67", ShipCity: "Madrid", ShipPostalCode: "28023", ShipCountry: "Spain", @@ -28357,7 +28357,7 @@ export const CUSTOMERS = [ CompanyName: "Godos Cocina Típica", ContactName: "José Pedro Freyre", ContactTitle: "Sales Manager", - Address: "C\/ Romero, 33", + Address: "C/ Romero, 33", City: "Sevilla", PostalCode: "41101", Country: "Spain", @@ -28372,7 +28372,7 @@ export const CUSTOMERS = [ ShipVia: 2, Freight: 175.3200, ShipName: "Godos Cocina Típica", - ShipAddress: "C\/ Romero, 33", + ShipAddress: "C/ Romero, 33", ShipCity: "Sevilla", ShipPostalCode: "41101", ShipCountry: "Spain", @@ -28405,7 +28405,7 @@ export const CUSTOMERS = [ CustomerID: "WILMK", CompanyName: "Wilman Kala", ContactName: "Matti Karttunen", - ContactTitle: "Owner\/Marketing Assistant", + ContactTitle: "Owner/Marketing Assistant", Address: "Keskuskatu 45", City: "Helsinki", PostalCode: "21240", @@ -28446,7 +28446,7 @@ export const CUSTOMERS = [ CompanyName: "Godos Cocina Típica", ContactName: "José Pedro Freyre", ContactTitle: "Sales Manager", - Address: "C\/ Romero, 33", + Address: "C/ Romero, 33", City: "Sevilla", PostalCode: "41101", Country: "Spain", @@ -28461,7 +28461,7 @@ export const CUSTOMERS = [ ShipVia: 2, Freight: 19.5800, ShipName: "Godos Cocina Típica", - ShipAddress: "C\/ Romero, 33", + ShipAddress: "C/ Romero, 33", ShipCity: "Sevilla", ShipPostalCode: "41101", ShipCountry: "Spain", @@ -28639,7 +28639,7 @@ export const CUSTOMERS = [ CustomerID: "WILMK", CompanyName: "Wilman Kala", ContactName: "Matti Karttunen", - ContactTitle: "Owner\/Marketing Assistant", + ContactTitle: "Owner/Marketing Assistant", Address: "Keskuskatu 45", City: "Helsinki", PostalCode: "21240", @@ -29025,7 +29025,7 @@ export const CUSTOMERS = [ CompanyName: "Godos Cocina Típica", ContactName: "José Pedro Freyre", ContactTitle: "Sales Manager", - Address: "C\/ Romero, 33", + Address: "C/ Romero, 33", City: "Sevilla", PostalCode: "41101", Country: "Spain", @@ -29040,7 +29040,7 @@ export const CUSTOMERS = [ ShipVia: 2, Freight: 51.8700, ShipName: "Godos Cocina Típica", - ShipAddress: "C\/ Romero, 33", + ShipAddress: "C/ Romero, 33", ShipCity: "Sevilla", ShipPostalCode: "41101", ShipCountry: "Spain", @@ -29919,7 +29919,7 @@ export const CUSTOMERS = [ CustomerID: "WILMK", CompanyName: "Wilman Kala", ContactName: "Matti Karttunen", - ContactTitle: "Owner\/Marketing Assistant", + ContactTitle: "Owner/Marketing Assistant", Address: "Keskuskatu 45", City: "Helsinki", PostalCode: "21240", @@ -29965,7 +29965,7 @@ export const CUSTOMERS = [ CompanyName: "Godos Cocina Típica", ContactName: "José Pedro Freyre", ContactTitle: "Sales Manager", - Address: "C\/ Romero, 33", + Address: "C/ Romero, 33", City: "Sevilla", PostalCode: "41101", Country: "Spain", @@ -29980,7 +29980,7 @@ export const CUSTOMERS = [ ShipVia: 1, Freight: 38.1900, ShipName: "Godos Cocina Típica", - ShipAddress: "C\/ Romero, 33", + ShipAddress: "C/ Romero, 33", ShipCity: "Sevilla", ShipPostalCode: "41101", ShipCountry: "Spain", @@ -31526,7 +31526,7 @@ export const CUSTOMERS = [ CompanyName: "Godos Cocina Típica", ContactName: "José Pedro Freyre", ContactTitle: "Sales Manager", - Address: "C\/ Romero, 33", + Address: "C/ Romero, 33", City: "Sevilla", PostalCode: "41101", Country: "Spain", @@ -31541,7 +31541,7 @@ export const CUSTOMERS = [ ShipVia: 3, Freight: 23.3900, ShipName: "Godos Cocina Típica", - ShipAddress: "C\/ Romero, 33", + ShipAddress: "C/ Romero, 33", ShipCity: "Sevilla", ShipPostalCode: "41101", ShipCountry: "Spain", @@ -32460,7 +32460,7 @@ export const CUSTOMERS = [ CompanyName: "Bólido Comidas preparadas", ContactName: "Martín Sommer", ContactTitle: "Owner", - Address: "C\/ Araquil, 67", + Address: "C/ Araquil, 67", City: "Madrid", PostalCode: "28023", Country: "Spain", @@ -32476,7 +32476,7 @@ export const CUSTOMERS = [ ShipVia: 1, Freight: 16.1600, ShipName: "Bólido Comidas preparadas", - ShipAddress: "C\/ Araquil, 67", + ShipAddress: "C/ Araquil, 67", ShipCity: "Madrid", ShipPostalCode: "28023", ShipCountry: "Spain", @@ -33944,7 +33944,7 @@ export const CUSTOMERS = [ CustomerID: "WILMK", CompanyName: "Wilman Kala", ContactName: "Matti Karttunen", - ContactTitle: "Owner\/Marketing Assistant", + ContactTitle: "Owner/Marketing Assistant", Address: "Keskuskatu 45", City: "Helsinki", PostalCode: "21240", @@ -34114,7 +34114,7 @@ export const CUSTOMERS = [ CompanyName: "Godos Cocina Típica", ContactName: "José Pedro Freyre", ContactTitle: "Sales Manager", - Address: "C\/ Romero, 33", + Address: "C/ Romero, 33", City: "Sevilla", PostalCode: "41101", Country: "Spain", @@ -34129,7 +34129,7 @@ export const CUSTOMERS = [ ShipVia: 1, Freight: 59.1100, ShipName: "Godos Cocina Típica", - ShipAddress: "C\/ Romero, 33", + ShipAddress: "C/ Romero, 33", ShipCity: "Sevilla", ShipPostalCode: "41101", ShipCountry: "Spain", @@ -35318,7 +35318,7 @@ export const CUSTOMERS = [ CompanyName: "Godos Cocina Típica", ContactName: "José Pedro Freyre", ContactTitle: "Sales Manager", - Address: "C\/ Romero, 33", + Address: "C/ Romero, 33", City: "Sevilla", PostalCode: "41101", Country: "Spain", @@ -35333,7 +35333,7 @@ export const CUSTOMERS = [ ShipVia: 1, Freight: 3.2000, ShipName: "Godos Cocina Típica", - ShipAddress: "C\/ Romero, 33", + ShipAddress: "C/ Romero, 33", ShipCity: "Sevilla", ShipPostalCode: "41101", ShipCountry: "Spain", @@ -36125,7 +36125,7 @@ export const CUSTOMERS = [ ] }, { CustomerID: "NORTS", - CompanyName: "North\/South", + CompanyName: "North/South", ContactName: "Simon Crowther", ContactTitle: "Sales Associate", Address: "South House 300 Queensbridge", @@ -36143,7 +36143,7 @@ export const CUSTOMERS = [ ShippedDate: new Date("1998-05-01T00:00:00"), ShipVia: 3, Freight: 4.1300, - ShipName: "North\/South", + ShipName: "North/South", ShipAddress: "South House 300 Queensbridge", ShipCity: "London", ShipPostalCode: "SW7 1RZ", diff --git a/packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-batch-editing/files/src/app/__path__/singer.ts b/packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-batch-editing/files/src/app/__path__/singer.ts index 7bc9bb80a..caf44cdc5 100644 --- a/packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-batch-editing/files/src/app/__path__/singer.ts +++ b/packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-batch-editing/files/src/app/__path__/singer.ts @@ -1,4 +1,3 @@ -// tslint:disable:interface-name export interface Song { TrackNumber: number; Title: string; diff --git a/packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-custom/files/src/app/__path__/__filePrefix__.component.ts b/packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-custom/files/src/app/__path__/__filePrefix__.component.ts index fefd05467..4a406f72e 100644 --- a/packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-custom/files/src/app/__path__/__filePrefix__.component.ts +++ b/packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-custom/files/src/app/__path__/__filePrefix__.component.ts @@ -12,7 +12,11 @@ export class <%=ClassName%>Component { public localData: Artist[] = ARTISTS; public toggleColumn(col: ColumnType, event: MouseEvent): void { - col.pinned ? col.unpin() : col.pin(); + if (col.pinned) { + col.unpin(); + } else { + col.pin(); + } event.stopPropagation(); } } diff --git a/packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-custom/index.ts b/packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-custom/index.ts index 03b0001d9..1cd53d2e9 100644 --- a/packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-custom/index.ts +++ b/packages/igx-templates/igx-ts/hierarchical-grid/hierarchical-grid-custom/index.ts @@ -56,7 +56,6 @@ class IgxHierarchicalGridTemplate extends IgniteUIForAngularTemplate { // must be assigned after getSelectedFeatures evaluates, TODO: refactor method additionalMarkup: this.additionalElements.join("\n"), - // tslint:disable-next-line: object-literal-sort-keys columnFeatures: columnFeatures.join(" "), gridFeatures: gridFeatures.join(" "), rowIslandFeatures: gridFeatures.join(" ").replace(/Singers/g, "Albums") @@ -75,7 +74,6 @@ class IgxHierarchicalGridTemplate extends IgniteUIForAngularTemplate { return super.generateConfig(name, { extraConfig }); } - //tslint:disable private pinningTemplate(columnName: string): string { // https://github.com/IgniteUI/igniteui-angular/issues/3998 // Defining let-columnRef="column" does not seem to work. diff --git a/packages/igx-templates/igx-ts/projects/_base/files/angular.json b/packages/igx-templates/igx-ts/projects/_base/files/angular.json index 636503930..24c35dfd1 100644 --- a/packages/igx-templates/igx-ts/projects/_base/files/angular.json +++ b/packages/igx-templates/igx-ts/projects/_base/files/angular.json @@ -111,7 +111,6 @@ "lint": { "builder": "@angular-eslint/builder:lint", "options": { - "eslintConfig": "eslint.config.mjs", "lintFilePatterns": [ "src/**/*.ts", "src/**/*.html" @@ -121,7 +120,9 @@ } } }, - "cli": { - "schematicCollections": ["@angular-eslint/schematics"] - } + "cli": { + "schematicCollections": [ + "@angular-eslint/schematics" + ] + } } diff --git a/packages/igx-templates/igx-ts/projects/_base/files/eslint.config.js b/packages/igx-templates/igx-ts/projects/_base/files/eslint.config.js new file mode 100644 index 000000000..a3173171b --- /dev/null +++ b/packages/igx-templates/igx-ts/projects/_base/files/eslint.config.js @@ -0,0 +1,48 @@ +// @ts-check +const eslint = require("@eslint/js"); +const tseslint = require("typescript-eslint"); +const angular = require("angular-eslint"); + +module.exports = tseslint.config( + { + files: ["**/*.ts"], + extends: [ + eslint.configs.recommended, + ...tseslint.configs.recommended, + ...tseslint.configs.stylistic, + ...angular.configs.tsRecommended, + ], + processor: angular.processInlineTemplates, + rules: { + "@angular-eslint/directive-selector": [ + "error", + { + type: "attribute", + prefix: "app", + style: "camelCase", + }, + ], + "@angular-eslint/component-selector": [ + "error", + { + type: "element", + prefix: "app", + style: "kebab-case", + }, + ], + // Relax rules + "@typescript-eslint/no-explicit-any": "off", + "@angular-eslint/prefer-inject": "off", + }, + }, + { + files: ["**/*.html"], + extends: [ + ...angular.configs.templateRecommended, + ], + rules: { + // Relax rules + "@angular-eslint/template/eqeqeq": "off", + }, + } +); diff --git a/packages/igx-templates/igx-ts/projects/_base/files/eslint.config.mjs b/packages/igx-templates/igx-ts/projects/_base/files/eslint.config.mjs deleted file mode 100644 index 46062caf5..000000000 --- a/packages/igx-templates/igx-ts/projects/_base/files/eslint.config.mjs +++ /dev/null @@ -1,29 +0,0 @@ -import { FlatCompat } from '@eslint/eslintrc'; - -const compat = new FlatCompat(); - -export default [ - { - files: ['**/*.ts', '**/*.tsx'], - languageOptions: { - parser: await import('@typescript-eslint/parser'), - parserOptions: { - project: ['tsconfig.json'], - createDefaultProgram: true, - }, - }, - rules: { - // Basic TypeScript linting without Angular template processing - }, - }, - { - files: ['**/*.html'], - ...compat.extends('plugin:@angular-eslint/template/recommended')[0], - rules: { - eqeqeq: 'off' - }, - }, - { - ignores: ['projects/**/*', '**/*.spec.ts'] - }, -]; diff --git a/packages/igx-templates/igx-ts/projects/_base/files/package.json b/packages/igx-templates/igx-ts/projects/_base/files/package.json index 4e9bd023f..cf75d1548 100644 --- a/packages/igx-templates/igx-ts/projects/_base/files/package.json +++ b/packages/igx-templates/igx-ts/projects/_base/files/package.json @@ -35,20 +35,11 @@ }, "devDependencies": { "@angular-devkit/build-angular": "~20.3.0", - "@angular-eslint/builder": "~20.3.0", - "@angular-eslint/eslint-plugin": "~20.3.0", - "@angular-eslint/eslint-plugin-template": "~20.3.0", - "@angular-eslint/schematics": "~20.3.0", - "@angular-eslint/template-parser": "~20.3.0", "@angular/cli": "~20.3.0", "@angular/compiler-cli": "~20.3.0", "@types/jasmine": "~5.1.4", - "@typescript-eslint/eslint-plugin": "~8.45.0", - "@typescript-eslint/parser": "~8.45.0", - "eslint": "~9.36.0", - "eslint-plugin-import": "^2.32.0", - "eslint-plugin-prefer-arrow": "^1.2.3", - "eslint-plugin-unicorn": "^61.0.2", + "angular-eslint": "~20.3.0", + "eslint": "~9.35.0", "igniteui-cli": "~<%=cliVersion%>", "jasmine-core": "~5.11.0", "karma": "~6.4.4", @@ -56,6 +47,7 @@ "karma-coverage": "~2.2.1", "karma-jasmine": "~5.1.0", "karma-jasmine-html-reporter": "~2.1.0", - "typescript": "~5.9.2" + "typescript": "~5.9.2", + "typescript-eslint": "~8.40.0" } } diff --git a/packages/igx-templates/igx-ts/projects/_base/index.ts b/packages/igx-templates/igx-ts/projects/_base/index.ts index c8087003b..1b376db92 100644 --- a/packages/igx-templates/igx-ts/projects/_base/index.ts +++ b/packages/igx-templates/igx-ts/projects/_base/index.ts @@ -8,7 +8,7 @@ export class BaseIgxProject implements ProjectTemplate { public dependencies: string[] = []; public framework: string = "angular"; public projectType: string = "igx-ts"; - public hasExtraConfiguration: boolean = false; + public hasExtraConfiguration = false; public delimiters = { content: { end: `%>`, diff --git a/packages/igx-templates/igx-ts/projects/_base_with_home/files/src/app/home/home.component.ts b/packages/igx-templates/igx-ts/projects/_base_with_home/files/src/app/home/home.component.ts index 96bef05e2..0d54789c1 100644 --- a/packages/igx-templates/igx-ts/projects/_base_with_home/files/src/app/home/home.component.ts +++ b/packages/igx-templates/igx-ts/projects/_base_with_home/files/src/app/home/home.component.ts @@ -8,5 +8,4 @@ import { Component } from '@angular/core'; }) export class HomeComponent { title = 'Welcome to Ignite UI for Angular!'; - constructor() { } } diff --git a/packages/igx-templates/igx-ts/projects/_base_with_home/index.ts b/packages/igx-templates/igx-ts/projects/_base_with_home/index.ts index 769634ccd..4d8902e42 100644 --- a/packages/igx-templates/igx-ts/projects/_base_with_home/index.ts +++ b/packages/igx-templates/igx-ts/projects/_base_with_home/index.ts @@ -9,7 +9,7 @@ export class BaseWithHomeProject extends BaseIgxProject implements ProjectTempla public dependencies: string[] = []; public framework: string = "angular"; public projectType: string = "igx-ts"; - public hasExtraConfiguration: boolean = false; + public hasExtraConfiguration = false; public get templatePaths() { return [...super.templatePaths, path.join(__dirname, "files")]; diff --git a/packages/igx-templates/igx-ts/projects/base/index.ts b/packages/igx-templates/igx-ts/projects/base/index.ts index af7d2f9fd..a89daf4c6 100644 --- a/packages/igx-templates/igx-ts/projects/base/index.ts +++ b/packages/igx-templates/igx-ts/projects/base/index.ts @@ -9,7 +9,7 @@ export class BasePageTemplate extends BaseIgxProject implements ProjectTemplate public dependencies: string[] = []; public framework: string = "angular"; public projectType: string = "igx-ts"; - public hasExtraConfiguration: boolean = false; + public hasExtraConfiguration = false; public get templatePaths(): string[] { return [...super.templatePaths, path.join(__dirname, "files")]; diff --git a/packages/igx-templates/igx-ts/projects/empty/index.ts b/packages/igx-templates/igx-ts/projects/empty/index.ts index 36a6ba37c..3d0a2a55f 100644 --- a/packages/igx-templates/igx-ts/projects/empty/index.ts +++ b/packages/igx-templates/igx-ts/projects/empty/index.ts @@ -9,7 +9,7 @@ export class EmptyPageTemplate extends BaseWithHomeProject implements ProjectTem public dependencies: string[] = []; public framework: string = "angular"; public projectType: string = "igx-ts"; - public hasExtraConfiguration: boolean = false; + public hasExtraConfiguration = false; public get templatePaths(): string[] { return [...super.templatePaths, path.join(__dirname, "files")]; diff --git a/packages/igx-templates/igx-ts/projects/side-nav-auth/files/src/app/authentication/providers/microsoft-provider.ts b/packages/igx-templates/igx-ts/projects/side-nav-auth/files/src/app/authentication/providers/microsoft-provider.ts index 6bd799034..64f0b631e 100644 --- a/packages/igx-templates/igx-ts/projects/side-nav-auth/files/src/app/authentication/providers/microsoft-provider.ts +++ b/packages/igx-templates/igx-ts/projects/side-nav-auth/files/src/app/authentication/providers/microsoft-provider.ts @@ -20,7 +20,6 @@ export class MicrosoftProvider extends BaseOidcProvider { // Microsoft OIDC doesn't support CORS for keys discovery URIs, intended for backend // See https://stackoverflow.com/a/44688644 // Example implementation: - // tslint:disable-next-line:max-line-length // https://blogs.msdn.microsoft.com/mihansen/2018/07/12/net-core-angular-app-with-openid-connection-implicit-flow-authentication-angular-auth-oidc-client/ // https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-protocols-oidc this.oidcConfigService.wellKnownEndpoints.jwks_uri = MicrosoftProvider.keysURL; diff --git a/packages/igx-templates/igx-ts/projects/side-nav-auth/files/src/app/authentication/services/local-storage.ts b/packages/igx-templates/igx-ts/projects/side-nav-auth/files/src/app/authentication/services/local-storage.ts index f9bae1273..118d4fa89 100644 --- a/packages/igx-templates/igx-ts/projects/side-nav-auth/files/src/app/authentication/services/local-storage.ts +++ b/packages/igx-templates/igx-ts/projects/side-nav-auth/files/src/app/authentication/services/local-storage.ts @@ -3,7 +3,7 @@ import { Inject, Injectable, PLATFORM_ID } from '@angular/core'; class LocalStorageFallback implements Storage { [name: string]: any; - readonly length: number = 0; + readonly length = 0; clear(): void { } getItem(key: string): string | null { return null; } key(index: number): string | null { return null; } diff --git a/packages/igx-templates/igx-ts/projects/side-nav-auth/files/src/app/authentication/services/microsoft-keys.ts b/packages/igx-templates/igx-ts/projects/side-nav-auth/files/src/app/authentication/services/microsoft-keys.ts index 848d5932f..8fa3b9b61 100644 --- a/packages/igx-templates/igx-ts/projects/side-nav-auth/files/src/app/authentication/services/microsoft-keys.ts +++ b/packages/igx-templates/igx-ts/projects/side-nav-auth/files/src/app/authentication/services/microsoft-keys.ts @@ -1,5 +1,3 @@ -// tslint:disable - // Replace with backend discovery from https://login.microsoftonline.com/consumers/discovery/v2.0/keys // See https://blogs.msdn.microsoft.com/mihansen/2018/07/12/net-core-angular-app-with-openid-connection-implicit-flow-authentication-angular-auth-oidc-client/ export default { "keys": [{ "kty": "RSA", "use": "sig", "kid": "1LTMzakihiRla_8z2BEJVXeWMqo", "x5t": "1LTMzakihiRla_8z2BEJVXeWMqo", "n": "3sKcJSD4cHwTY5jYm5lNEzqk3wON1CaARO5EoWIQt5u-X-ZnW61CiRZpWpfhKwRYU153td5R8p-AJDWT-NcEJ0MHU3KiuIEPmbgJpS7qkyURuHRucDM2lO4L4XfIlvizQrlyJnJcd09uLErZEO9PcvKiDHoois2B4fGj7CsAe5UZgExJvACDlsQSku2JUyDmZUZP2_u_gCuqNJM5o0hW7FKRI3MFoYCsqSEmHnnumuJ2jF0RHDRWQpodhlAR6uKLoiWHqHO3aG7scxYMj5cMzkpe1Kq_Dm5yyHkMCSJ_JaRhwymFfV_SWkqd3n-WVZT0ADLEq0RNi9tqZ43noUnO_w", "e": "AQAB", "x5c": ["MIIDYDCCAkigAwIBAgIJAIB4jVVJ3BeuMA0GCSqGSIb3DQEBCwUAMCkxJzAlBgNVBAMTHkxpdmUgSUQgU1RTIFNpZ25pbmcgUHVibGljIEtleTAeFw0xNjA0MDUxNDQzMzVaFw0yMTA0MDQxNDQzMzVaMCkxJzAlBgNVBAMTHkxpdmUgSUQgU1RTIFNpZ25pbmcgUHVibGljIEtleTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN7CnCUg+HB8E2OY2JuZTRM6pN8DjdQmgETuRKFiELebvl/mZ1utQokWaVqX4SsEWFNed7XeUfKfgCQ1k/jXBCdDB1NyoriBD5m4CaUu6pMlEbh0bnAzNpTuC+F3yJb4s0K5ciZyXHdPbixK2RDvT3Lyogx6KIrNgeHxo+wrAHuVGYBMSbwAg5bEEpLtiVMg5mVGT9v7v4ArqjSTOaNIVuxSkSNzBaGArKkhJh557pridoxdERw0VkKaHYZQEerii6Ilh6hzt2hu7HMWDI+XDM5KXtSqvw5ucsh5DAkifyWkYcMphX1f0lpKnd5/llWU9AAyxKtETYvbameN56FJzv8CAwEAAaOBijCBhzAdBgNVHQ4EFgQU9IdLLpbC2S8Wn1MCXsdtFac9SRYwWQYDVR0jBFIwUIAU9IdLLpbC2S8Wn1MCXsdtFac9SRahLaQrMCkxJzAlBgNVBAMTHkxpdmUgSUQgU1RTIFNpZ25pbmcgUHVibGljIEtleYIJAIB4jVVJ3BeuMAsGA1UdDwQEAwIBxjANBgkqhkiG9w0BAQsFAAOCAQEAXk0sQAib0PGqvwELTlflQEKS++vqpWYPW/2gCVCn5shbyP1J7z1nT8kE/ZDVdl3LvGgTMfdDHaRF5ie5NjkTHmVOKbbHaWpTwUFbYAFBJGnx+s/9XSdmNmW9GlUjdpd6lCZxsI6888r0ptBgKINRRrkwMlq3jD1U0kv4JlsIhafUIOqGi4+hIDXBlY0F/HJPfUU75N885/r4CCxKhmfh3PBM35XOch/NGC67fLjqLN+TIWLoxnvil9m3jRjqOA9u50JUeDGZABIYIMcAdLpI2lcfru4wXcYXuQul22nAR7yOyGKNOKULoOTE4t4AeGRqCogXSxZgaTgKSBhvhE+MGg=="], "issuer": "https://login.microsoftonline.com/9188040d-6c67-4c5b-b112-36a304b66dad/v2.0" }, { "kty": "RSA", "use": "sig", "kid": "xP_zn6I1YkXcUUmlBoPuXTGsaxk", "x5t": "xP_zn6I1YkXcUUmlBoPuXTGsaxk", "n": "2pWatafeb3mB0A73-Z-URwrubwDldWvivRu19GNC61MBOb3fZ4I4lyhUhNuS7aJRPJIFB6zl-HFx1nHpGg74BHe0z9skODHYZEACd2iKBIet55DdduIe1CXsZ9keyEmNaGv3XS4OW_7IDM0j5wR9OHugUifkH3PQIcFvTYanHmXojTmgjIOWoz7y0okpyN9-FbZRzdfx-ej-njaj5gR8r69muwO5wlTbIG20V40R6zYh-QODMUpayy7jDGFGw5vjFH9Ca0tLZcNQq__JKE_mp-0fODOAQobOrBUoASFkyCd95BVW7KJrndvW7ofRWaCTuZZOy5SnU4asbjMrgxFZFw", "e": "AQAB", "x5c": ["MIIDYDCCAkigAwIBAgIJAJzCyTLC+DjJMA0GCSqGSIb3DQEBCwUAMCkxJzAlBgNVBAMTHkxpdmUgSUQgU1RTIFNpZ25pbmcgUHVibGljIEtleTAeFw0xNjA3MTMyMDMyMTFaFw0yMTA3MTIyMDMyMTFaMCkxJzAlBgNVBAMTHkxpdmUgSUQgU1RTIFNpZ25pbmcgUHVibGljIEtleTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANqVmrWn3m95gdAO9/mflEcK7m8A5XVr4r0btfRjQutTATm932eCOJcoVITbku2iUTySBQes5fhxcdZx6RoO+AR3tM/bJDgx2GRAAndoigSHreeQ3XbiHtQl7GfZHshJjWhr910uDlv+yAzNI+cEfTh7oFIn5B9z0CHBb02Gpx5l6I05oIyDlqM+8tKJKcjffhW2Uc3X8fno/p42o+YEfK+vZrsDucJU2yBttFeNEes2IfkDgzFKWssu4wxhRsOb4xR/QmtLS2XDUKv/yShP5qftHzgzgEKGzqwVKAEhZMgnfeQVVuyia53b1u6H0Vmgk7mWTsuUp1OGrG4zK4MRWRcCAwEAAaOBijCBhzAdBgNVHQ4EFgQU11z579/IePwuc4WBdN4L0ljG4CUwWQYDVR0jBFIwUIAU11z579/IePwuc4WBdN4L0ljG4CWhLaQrMCkxJzAlBgNVBAMTHkxpdmUgSUQgU1RTIFNpZ25pbmcgUHVibGljIEtleYIJAJzCyTLC+DjJMAsGA1UdDwQEAwIBxjANBgkqhkiG9w0BAQsFAAOCAQEAiASLEpQseGNahE+9f9PQgmX3VgjJerNjXr1zXWXDJfFE31DxgsxddjcIgoBL9lwegOHHvwpzK1ecgH45xcJ0Z/40OgY8NITqXbQRfdgLrEGJCoyOQEbjb5PW5k2aOdn7LBxvDsH6Y8ax26v+EFMPh3G+xheh6bfoIRSK1b+44PfoDZoJ9NfJibOZ4Cq+wt/yOvpMYQDB/9CNo18wmA3RCLYjf2nAc7RO0PDYHSIq5QDWV+1awmXDKgIdRpYPpRtn9KFXQkpCeEc/lDTG+o6n7nC40wyjioyR6QmHGvNkMR4VfSoTKCTnFATyDpI1bqU2K7KNjUEsCYfwybFB8d6mjQ=="], "issuer": "https://login.microsoftonline.com/9188040d-6c67-4c5b-b112-36a304b66dad/v2.0" }] }; diff --git a/packages/igx-templates/igx-ts/projects/side-nav-auth/files/src/app/authentication/services/user.service.ts b/packages/igx-templates/igx-ts/projects/side-nav-auth/files/src/app/authentication/services/user.service.ts index 25daa591d..c313a4491 100644 --- a/packages/igx-templates/igx-ts/projects/side-nav-auth/files/src/app/authentication/services/user.service.ts +++ b/packages/igx-templates/igx-ts/projects/side-nav-auth/files/src/app/authentication/services/user.service.ts @@ -16,7 +16,6 @@ const USER_TOKEN = 'currentUser'; providedIn: 'root' }) export class UserService { - // tslint:disable-next-line:variable-name private _currentUser: User | null; /** Current logged in user, if any */ public get currentUser() { return this._currentUser; } diff --git a/packages/igx-templates/igx-ts/projects/side-nav-auth/index.ts b/packages/igx-templates/igx-ts/projects/side-nav-auth/index.ts index aa2f84288..324f4e91e 100644 --- a/packages/igx-templates/igx-ts/projects/side-nav-auth/index.ts +++ b/packages/igx-templates/igx-ts/projects/side-nav-auth/index.ts @@ -9,7 +9,7 @@ export class AuthSideProject extends SideNavProject implements ProjectTemplate { public dependencies: string[] = []; public framework: string = "angular"; public projectType: string = "igx-ts"; - public hasExtraConfiguration: boolean = false; + public hasExtraConfiguration = false; public get templatePaths() { return [...super.templatePaths, path.join(__dirname, "files")]; diff --git a/packages/igx-templates/igx-ts/projects/side-nav/index.ts b/packages/igx-templates/igx-ts/projects/side-nav/index.ts index ab2f2177c..63e0f81fe 100644 --- a/packages/igx-templates/igx-ts/projects/side-nav/index.ts +++ b/packages/igx-templates/igx-ts/projects/side-nav/index.ts @@ -9,7 +9,7 @@ export class SideNavProject extends BaseWithHomeProject implements ProjectTempla public dependencies: string[] = []; public framework: string = "angular"; public projectType: string = "igx-ts"; - public hasExtraConfiguration: boolean = false; + public hasExtraConfiguration = false; public get templatePaths() { return [...super.templatePaths, path.join(__dirname, "files")]; diff --git a/packages/igx-templates/igx-ts/select/default/files/src/app/__path__/__filePrefix__.component.html b/packages/igx-templates/igx-ts/select/default/files/src/app/__path__/__filePrefix__.component.html index 9d8d64dd5..a2f5d1206 100644 --- a/packages/igx-templates/igx-ts/select/default/files/src/app/__path__/__filePrefix__.component.html +++ b/packages/igx-templates/igx-ts/select/default/files/src/app/__path__/__filePrefix__.component.html @@ -7,8 +7,8 @@

- - + + {{item}} diff --git a/packages/igx-templates/igx-ts/select/select-groups/files/src/app/__path__/__filePrefix__.component.html b/packages/igx-templates/igx-ts/select/select-groups/files/src/app/__path__/__filePrefix__.component.html index 3e857a903..e44c4e8b0 100644 --- a/packages/igx-templates/igx-ts/select/select-groups/files/src/app/__path__/__filePrefix__.component.html +++ b/packages/igx-templates/igx-ts/select/select-groups/files/src/app/__path__/__filePrefix__.component.html @@ -8,8 +8,8 @@

- - + + {{fruit}} diff --git a/packages/igx-templates/igx-ts/select/select-in-form/files/src/app/__path__/__filePrefix__.component.html b/packages/igx-templates/igx-ts/select/select-in-form/files/src/app/__path__/__filePrefix__.component.html index ea483cd3d..71e54dfea 100644 --- a/packages/igx-templates/igx-ts/select/select-in-form/files/src/app/__path__/__filePrefix__.component.html +++ b/packages/igx-templates/igx-ts/select/select-in-form/files/src/app/__path__/__filePrefix__.component.html @@ -10,9 +10,9 @@
- - + Fruit None diff --git a/packages/igx-templates/igx-ts/tree-grid/tree-grid-custom/index.ts b/packages/igx-templates/igx-ts/tree-grid/tree-grid-custom/index.ts index 506b723d2..339017a65 100644 --- a/packages/igx-templates/igx-ts/tree-grid/tree-grid-custom/index.ts +++ b/packages/igx-templates/igx-ts/tree-grid/tree-grid-custom/index.ts @@ -55,7 +55,6 @@ class IgxCustomTreeGridTemplate extends IgniteUIForAngularTemplate { const anchorWrapper = { start: ``, text: ``, diff --git a/packages/igx-templates/igx-ts/tree/default/files/src/app/__path__/services/data.service.ts b/packages/igx-templates/igx-ts/tree/default/files/src/app/__path__/services/data.service.ts index 89d70b27b..12de7b1a9 100644 --- a/packages/igx-templates/igx-ts/tree/default/files/src/app/__path__/services/data.service.ts +++ b/packages/igx-templates/igx-ts/tree/default/files/src/app/__path__/services/data.service.ts @@ -7,7 +7,7 @@ export class DataService { private nodeData: SelectableNodeData[] = []; private selectedNode: Set = new Set(); private deselectedNode: Set = new Set(); - private data$: ReplaySubject = new ReplaySubject(); + private data$: ReplaySubject = new ReplaySubject(); public get data(): Observable { return this.data$; } diff --git a/packages/igx-templates/package.json b/packages/igx-templates/package.json index 7b1842ae4..0cfe5eb7e 100644 --- a/packages/igx-templates/package.json +++ b/packages/igx-templates/package.json @@ -1,6 +1,6 @@ { "name": "@igniteui/angular-templates", - "version": "20.1.1464", + "version": "20.1.1465-beta.0", "description": "Templates for Ignite UI for Angular projects and components", "repository": { "type": "git", @@ -12,7 +12,7 @@ "author": "Infragistics", "license": "MIT", "dependencies": { - "@igniteui/cli-core": "~14.6.4", + "@igniteui/cli-core": "~14.6.5-beta.0", "typescript": "~5.5.4" } } diff --git a/packages/ng-schematics/package.json b/packages/ng-schematics/package.json index 96c2c00b9..7da739fbd 100644 --- a/packages/ng-schematics/package.json +++ b/packages/ng-schematics/package.json @@ -1,6 +1,6 @@ { "name": "@igniteui/angular-schematics", - "version": "20.1.1464", + "version": "20.1.1465-beta.0", "description": "Ignite UI for Angular Schematics for ng new and ng generate", "repository": { "type": "git", @@ -20,8 +20,8 @@ "dependencies": { "@angular-devkit/core": "^19.0.0", "@angular-devkit/schematics": "^19.0.0", - "@igniteui/angular-templates": "~20.1.1464", - "@igniteui/cli-core": "~14.6.4", + "@igniteui/angular-templates": "~20.1.1465-beta.0", + "@igniteui/cli-core": "~14.6.5-beta.0", "@schematics/angular": "~19.0.0", "minimatch": "^10.0.1", "rxjs": "^7.8.1"