fix(igx-ts-legacy): update igx ts legacy templates (#1517)

Author: Hristo313

packages/cli/lib/templates/AngularTemplate.ts

@@ -45,7 +45,7 @@ export class AngularTemplate implements Template {
 	}
 
 	public registerInProject(projectPath: string, name: string, options?: AddTemplateArgs) {
-		let modulePath = "app.module.ts";
+		let modulePath = "app-module.ts";
 		if (options && options.modulePath) {
 			modulePath = options.modulePath;
 		}
@@ -63,7 +63,7 @@ export class AngularTemplate implements Template {
 			//1) import the component class name,
 			//2) and populate the Routes array with the path and component
 			//for example: { path: "combo", component: ComboComponent }
-			const routingModulePath = path.join(projectPath, "src/app/app-routing.module.ts");
+			const routingModulePath = path.join(projectPath, "src/app/app-routing-module.ts");
 			const routingModule = new TsUpdate(routingModulePath, false, { singleQuotes: false });
 
 			routingModule.addRoute({
@@ -84,7 +84,7 @@ export class AngularTemplate implements Template {
 		mainModule.addNgModuleMeta({
 			declare: [className],
 			from: relativePath,
-			export: modulePath !== "app.module.ts" ? [className] : []
+			export: modulePath !== "app-module.ts" ? [className] : []
 		});
 		mainModule.finalize();
 

packages/igx-templates/IgniteUIForAngularTemplate.ts

@@ -50,7 +50,7 @@ export class IgniteUIForAngularTemplate implements Template {
 
 	//TODO: rename name to fullName for clarity + in all other places fileName to fullName
 	public registerInProject(projectPath: string, name: string, options?: AddTemplateArgs) {
-		let modulePath = "app.module.ts";
+		let modulePath = "app-module.ts";
 		if (options && options.modulePath) {
 			modulePath = options.modulePath;
 		}
@@ -66,8 +66,8 @@ export class IgniteUIForAngularTemplate implements Template {
 		const mainModulePath = path.join(projectPath, `src/app/${modulePath}`);
 		const folderName = this.folderName(name);
 		const fileName = this.fileName(name);
-		const componentFilePath = path.join(projectPath, `src/app/${folderName}/${fileName}.component.ts`);
-		const className = `${Util.className(Util.nameFromPath(name))}Component`;
+		const componentFilePath = path.join(projectPath, `src/app/${folderName}/${fileName}.ts`);
+		const className = `${Util.className(Util.nameFromPath(name))}`;
 		// standalone components
 		if (!this.fileExists(mainModulePath)) {
 			const appRoutesPath = "src/app/app.routes.ts";
@@ -108,11 +108,11 @@ export class IgniteUIForAngularTemplate implements Template {
 		}
 
 		// ngModule based components
-		if (!(options && options.skipRoute) && this.fileExists("src/app/app-routing.module.ts")) {
+		if (!(options && options.skipRoute) && this.fileExists("src/app/app-routing-module.ts")) {
 			//1) import the component class name,
 			//2) and populate the Routes array with the path and component
 			//for example: { path: 'combo', component: ComboComponent }
-			const routingModulePath = path.join(projectPath, "src/app/app-routing.module.ts");
+			const routingModulePath = path.join(projectPath, "src/app/app-routing-module.ts");
 			const routingModule = new TsUpdate(routingModulePath, false, { indentSize: 2, singleQuotes: true });
 			routingModule.addRoute({
 				modulePath: Util.relativePath(routingModulePath, componentFilePath, true, true),
@@ -130,7 +130,7 @@ export class IgniteUIForAngularTemplate implements Template {
 		mainModule.addNgModuleMeta({
 				declare: this.addAsNgModelDeclaration ? [className] : [],
 				from: Util.relativePath(mainModulePath, componentFilePath, true, true),
-				export: modulePath !== "app.module.ts" ? [className] : []
+				export: modulePath !== "app-module.ts" ? [className] : []
 			},
 			Util.applyDelimiters(this.getBaseVariables(name), this.delimiters.content),
 			true // multiline

packages/igx-templates/igx-ts-legacy/accordion/default/files/src/app/__path__/__filePrefix__.component.spec.ts

@@ -0,0 +1,27 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { <%=ClassName%> } from './<%=filePrefix%>';
+import { IgxAccordionModule, IgxSwitchModule } from '<%=igxPackage%>';
+
+describe('<%=ClassName%>', () => {
+  let component: <%=ClassName%>;
+  let fixture: ComponentFixture<<%=ClassName%>>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [<%=ClassName%>],
+      imports: [ NoopAnimationsModule, IgxAccordionModule, IgxSwitchModule ]
+    })
+      .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(<%=ClassName%>);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

…p/__path__/__filePrefix__.component.html …les/src/app/__path__/__filePrefix__.htmlpackages/igx-templates/igx-ts-legacy/accordion/default/files/src/app/__path__/__filePrefix__.component.html renamed to packages/igx-templates/igx-ts-legacy/accordion/default/files/src/app/__path__/__filePrefix__.html packages/igx-templates/igx-ts-legacy/accordion/default/files/src/app/__path__/__filePrefix__.component.html renamed to packages/igx-templates/igx-ts-legacy/accordion/default/files/src/app/__path__/__filePrefix__.html

@@ -2,10 +2,10 @@ import { Component } from '@angular/core';
 
 @Component({
   selector: 'app-<%=filePrefix%>',
-  templateUrl: './<%=filePrefix%>.component.html',
-  styleUrls: ['./<%=filePrefix%>.component.scss'],
+  templateUrl: './<%=filePrefix%>.html',
+  styleUrl: './<%=filePrefix%>.scss',
   standalone: false
 })
-export class <%=ClassName%>Component {
+export class <%=ClassName%> {
   public singleBranchExpand = false;
 }

…p/__path__/__filePrefix__.component.scss …les/src/app/__path__/__filePrefix__.scsspackages/igx-templates/igx-ts-legacy/accordion/default/files/src/app/__path__/__filePrefix__.component.scss renamed to packages/igx-templates/igx-ts-legacy/accordion/default/files/src/app/__path__/__filePrefix__.scss packages/igx-templates/igx-ts-legacy/accordion/default/files/src/app/__path__/__filePrefix__.component.scss renamed to packages/igx-templates/igx-ts-legacy/accordion/default/files/src/app/__path__/__filePrefix__.scss

@@ -1,23 +1,23 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { IgxAutocompleteModule, IgxDropDownModule, IgxInputGroupModule } from '<%=igxPackage%>';
-import { <%=ClassName%>Component, <%=ClassName%>PipeStartsWith } from './<%=filePrefix%>.component';
+import { <%=ClassName%>, <%=ClassName%>PipeStartsWith } from './<%=filePrefix%>';
 
-describe('<%=ClassName%>Component', () => {
-  let component: <%=ClassName%>Component;
-  let fixture: ComponentFixture<<%=ClassName%>Component>;
+describe('<%=ClassName%>', () => {
+  let component: <%=ClassName%>;
+  let fixture: ComponentFixture<<%=ClassName%>>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [<%=ClassName%>Component, <%=ClassName%>PipeStartsWith],
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [<%=ClassName%>, <%=ClassName%>PipeStartsWith],
       imports: [FormsModule, IgxDropDownModule, IgxAutocompleteModule, NoopAnimationsModule, IgxInputGroupModule]
     })
       .compileComponents();
-  }));
+  });
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(<%=ClassName%>Component);
+    fixture = TestBed.createComponent(<%=ClassName%>);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });