refactor(igx-ts): Remove suffixes from services in templates (#1547)

Co-authored-by: Hristo313 <57346540+Hristo313@users.noreply.github.com>
Co-authored-by: damyanpetev <3198469+damyanpetev@users.noreply.github.com>

Author: 3 people

packages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/__filePrefix__.ts

@@ -44,13 +44,13 @@ import {
 } from 'igniteui-angular-charts';
 import { timer } from 'rxjs';
 import { debounce } from 'rxjs/operators';
-import { LocalDataService } from './localData.service';
-import { Contract, REGIONS } from './localData/financialData';
+import { LocalData } from './local-data';
+import { Contract, REGIONS } from './data/financialData';
 import { NgIf, NgFor, CurrencyPipe } from '@angular/common';
 import { ReactiveFormsModule, FormsModule } from '@angular/forms';
 
 @Component({
-  providers: [LocalDataService],
+  providers: [LocalData],
   selector: 'app-<%=filePrefix%>',
   templateUrl: './<%=filePrefix%>.html',
   styleUrl: './<%=filePrefix%>.scss',
@@ -136,11 +136,11 @@ export class <%=ClassName%> implements OnInit, AfterViewInit, OnDestroy {
   private timer: any;
   private volumeChanged: any;
   constructor(
-    private localService: LocalDataService,
+    private localData: LocalData,
     private elRef: ElementRef,
     private cdr: ChangeDetectorRef) {
-    this.subscription = this.localService.getData(this.volume);
-    this.localService.records.subscribe(x => { this.data = x; });
+    this.subscription = this.localData.getData(this.volume);
+    this.localData.records.subscribe(x => { this.data = x; });
   }
 
   public ngOnInit(): void {
@@ -166,7 +166,7 @@ export class <%=ClassName%> implements OnInit, AfterViewInit, OnDestroy {
     this.volumeChanged = this.volumeSlider.valueChange.pipe(debounce(() => timer(200)));
     this.volumeChanged.subscribe(
       () => {
-        this.localService.getData(this.volume);
+        this.localData.getData(this.volume);
       },
       (err: string) => console.log('Error: ' + err));
   }

…/app/__path__/localData/financialData.ts …s/src/app/__path__/data/financialData.tspackages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/localData/financialData.ts renamed to packages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/data/financialData.ts packages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/localData/financialData.ts renamed to packages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/data/financialData.ts

@@ -1,9 +1,9 @@
 import { Injectable } from '@angular/core';
 import { BehaviorSubject, Observable} from 'rxjs';
-import { FinancialData } from './localData/financialData';
+import { FinancialData } from './data/financialData';
 
 @Injectable()
-export class LocalDataService {
+export class LocalData {
   public records: Observable<any[]>;
   public records$: BehaviorSubject<any[]>;
 

…es/src/app/__path__/localData.service.ts …rid/files/src/app/__path__/local-data.tspackages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/localData.service.ts renamed to packages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/local-data.ts packages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/localData.service.ts renamed to packages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/local-data.ts

@@ -33,13 +33,13 @@ import {
 } from '<%=igxPackage%>';
 import { timer } from 'rxjs';
 import { debounce } from 'rxjs/operators';
-import { LocalDataService } from './localData.service';
+import { LocalData } from './local-data';
 import { ITreeGridAggregation, <%=ClassName%>TreeGridGroupingPipe } from './tree-grid-grouping.pipe';
 import { NgIf, CurrencyPipe } from '@angular/common';
 import { ReactiveFormsModule, FormsModule } from '@angular/forms';
 
 @Component({
-  providers: [LocalDataService],
+  providers: [LocalData],
   selector: 'app-<%=filePrefix%>',
   templateUrl: './<%=filePrefix%>.html',
   styleUrl: './<%=filePrefix%>.scss',
@@ -140,17 +140,17 @@ export class <%=ClassName%> implements OnInit, AfterViewInit, OnDestroy {
   private timer: any;
   private volumeChanged: any;
 
-  constructor(private zone: NgZone, private localService: LocalDataService, private elRef: ElementRef) {
-    this.subscription = this.localService.getData(this.volume);
-    this.localService.records.subscribe((d) => this.data = d);
+  constructor(private zone: NgZone, private localData: LocalData, private elRef: ElementRef) {
+    this.subscription = this.localData.getData(this.volume);
+    this.localData.records.subscribe((d) => this.data = d);
   }
 
   public ngOnInit(): void {
     this.grid1.sortingExpressions = [{ fieldName: this.groupColumnKey, dir: SortingDirection.Desc }];
     this.volumeChanged = this.volumeSlider.valueChange.pipe(debounce(() => timer(200)));
     this.volumeChanged.subscribe(
       () => {
-        this.localService.getData(this.volume);
+        this.localData.getData(this.volume);
       },
       (err: string) => console.log('Error: ' + err));
   }

packages/igx-templates/igx-ts/custom-templates/fintech-tree-grid/files/src/app/__path__/__filePrefix__.ts

@@ -3,7 +3,7 @@ import { BehaviorSubject, Observable} from 'rxjs';
 import { FinancialData } from './assets/financialData';
 
 @Injectable()
-export class LocalDataService {
+export class LocalData {
   public records: Observable<any[]>;
   public records$: BehaviorSubject<any[]>;
 

…es/src/app/__path__/localData.service.ts …rid/files/src/app/__path__/local-data.tspackages/igx-templates/igx-ts/custom-templates/fintech-tree-grid/files/src/app/__path__/localData.service.ts renamed to packages/igx-templates/igx-ts/custom-templates/fintech-tree-grid/files/src/app/__path__/local-data.ts packages/igx-templates/igx-ts/custom-templates/fintech-tree-grid/files/src/app/__path__/localData.service.ts renamed to packages/igx-templates/igx-ts/custom-templates/fintech-tree-grid/files/src/app/__path__/local-data.ts

@@ -5,7 +5,7 @@ import { provideRouter } from '@angular/router';
 
 import { environment } from '../environments/environment';
 import { routes } from './app.routes';
-import { GlobalErrorHandlerService } from './error-routing/error/global-error-handler.service';
+import { GlobalErrorHandler } from './error-routing/error/global-error-handler';
 
 export const appConfig: ApplicationConfig = {
   providers: [
@@ -14,6 +14,6 @@ export const appConfig: ApplicationConfig = {
     provideRouter(routes),
     importProvidersFrom(BrowserModule, HammerModule),
     provideAnimations(),
-    ...(environment.production ? [{ provide: ErrorHandler, useClass: GlobalErrorHandlerService }] : [])
+    ...(environment.production ? [{ provide: ErrorHandler, useClass: GlobalErrorHandler }] : [])
   ]
 };

packages/igx-templates/igx-ts/projects/_base/files/src/app/app.config.ts

@@ -2,7 +2,7 @@ import { ErrorHandler, Injectable, Injector, NgZone, inject } from '@angular/cor
 import { Router } from '@angular/router';
 
 @Injectable()
-export class GlobalErrorHandlerService implements ErrorHandler {
+export class GlobalErrorHandler implements ErrorHandler {
   private injector = inject(Injector);
   private zone = inject(NgZone);
 

…ng/error/global-error-handler.service.ts …or-routing/error/global-error-handler.tspackages/igx-templates/igx-ts/projects/_base/files/src/app/error-routing/error/global-error-handler.service.ts renamed to packages/igx-templates/igx-ts/projects/_base/files/src/app/error-routing/error/global-error-handler.ts packages/igx-templates/igx-ts/projects/_base/files/src/app/error-routing/error/global-error-handler.service.ts renamed to packages/igx-templates/igx-ts/projects/_base/files/src/app/error-routing/error/global-error-handler.ts

@@ -7,7 +7,7 @@ import {
 } from 'igniteui-angular';
 import { AppRoutingModule } from './app-routing-module';
 import { App } from './app';
-import { AuthenticationModule, ExternalAuthService } from './authentication';
+import { AuthenticationModule, ExternalAuth } from './authentication';
 import { Home } from './home/home';
 
 @NgModule({
@@ -33,7 +33,7 @@ import { Home } from './home/home';
 })
 export class AppModule {
 
-  constructor(private externalAuthService: ExternalAuthService) {
+  constructor(private externalAuthService: ExternalAuth) {
     /**
      * To register a social login, un-comment one or more of the following and add your service provider Client ID.
      * See https://github.com/IgniteUI/igniteui-cli/wiki/Angular-Authentication-Project-Template#add-a-third-party-social-provider

packages/igx-templates/igx-ts/projects/side-nav-auth/files/src/app/app-module.ts

@@ -9,7 +9,7 @@ import {
   IgxRippleModule,
 } from '<%=igxPackage%>';
 
-import { AuthenticationModule, ExternalAuthService } from './authentication';
+import { AuthenticationModule, ExternalAuth } from './authentication';
 import { routes } from './app.routes';
 
 export const appConfig: ApplicationConfig = {
@@ -27,6 +27,6 @@ export const appConfig: ApplicationConfig = {
       AuthenticationModule
     ),
     provideAnimations(),
-    ExternalAuthService
+    ExternalAuth
   ]
 };

packages/igx-templates/igx-ts/projects/side-nav-auth/files/src/app/app.config.ts

@@ -1,15 +1,15 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router';
-import { UserService } from './services/user.service';
+import { UserStore } from './services/user-store';
 
 @Injectable({
   providedIn: 'root'
 })
 export class AuthGuard implements CanActivate {
-  constructor(private router: Router, private userService: UserService) { }
+  constructor(private router: Router, private userStore: UserStore) { }
 
   canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
-    if (this.userService.currentUser) {
+    if (this.userStore.currentUser) {
       return true;
     }
     this.router.navigate([''], { queryParams: { returnUrl: state.url } });