Merge 9d0b8c6 into ded94cd

azerothcore · Mar 21, 2020 · 3c81037 · 3c81037
2 parents ded94cd + 9d0b8c6
commit 3c81037
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/src/app/shared/modules/icon/icon.service.spec.ts b/src/app/shared/modules/icon/icon.service.spec.ts
@@ -24,6 +24,23 @@ describe('IconService', () => {
     expect(sqliteQueryService.getIconByItemDisplayId).toHaveBeenCalledWith(mockArgument);
   });
 
+  it('getIconByItemDisplayId() should remove .tga from icon name', () => {
+    const service = TestBed.inject(IconService);
+    const sqliteQueryService = TestBed.inject(SqliteQueryService);
+
+    const tgaIcon = 'icon.tga';
+    const icon = 'icon';
+
+    spyOn(sqliteQueryService, 'getIconByItemDisplayId').and.returnValue(of(tgaIcon));
+
+    service.getIconByItemDisplayId(mockArgument).subscribe(result => {
+      expect(result).toEqual(icon);
+    });
+    expect(sqliteQueryService.getIconByItemDisplayId).toHaveBeenCalledTimes(1);
+    expect(sqliteQueryService.getIconByItemDisplayId).toHaveBeenCalledWith(mockArgument);
+  });
+
+
   it('getIconByItemId() should correctly work [case mysqlQuery return non-null]', () => {
     const service = TestBed.inject(IconService);
     const mysqlQueryService = TestBed.inject(MysqlQueryService);

diff --git a/src/app/shared/modules/icon/icon.service.ts b/src/app/shared/modules/icon/icon.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { mergeMap } from 'rxjs/operators';
+import { mergeMap, map } from 'rxjs/operators';
 import { Observable, of } from 'rxjs';
 
 import { MysqlQueryService } from '@keira-shared/services/mysql-query.service';
@@ -16,7 +16,9 @@ export class IconService {
   ) {}
 
   getIconByItemDisplayId(displayId: string | number): Observable<string> {
-    return this.sqliteQueryService.getIconByItemDisplayId(displayId);
+    return this.sqliteQueryService.getIconByItemDisplayId(displayId).pipe(
+      map(icon => icon.replace('.tga', ''))
+    );
   }
 
   getIconByItemId(itemId: string | number): Observable<string> {