Merge branch 'develop' into pr/811

wowup-electron/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wowup",
   "productName": "WowUp",
-  "version": "2.2.0-beta.20",
+  "version": "2.2.0-beta.21",
   "description": "World of Warcraft addon updater",
   "homepage": "https://wowup.io",
   "author": {

wowup-electron/src/app/components/my-addons-addon-cell/my-addons-addon-cell.component.html

@@ -5,12 +5,7 @@
     </div>
     <div class="version-container">
       <div class="title-container">
-        <a *ngIf="listItem.addon.providerName !== unknownProviderName" class="addon-title hover-text-2"
-          (click)="viewDetails()" [ngClass]="{ 'text-3': listItem.addon.isIgnored, 'text-warning': hasWarning() }">{{
-          listItem.addon.name
-          }}</a>
-        <a *ngIf="listItem.addon.providerName === unknownProviderName" class="addon-title hover-text-2"
-          (click)="viewDetails()" [matTooltip]="'PAGES.MY_ADDONS.UNKNOWN_ADDON_INFO_TOOLTIP' | translate"
+        <a class="addon-title hover-text-2" (click)="viewDetails()"
           [ngClass]="{ 'text-3': listItem.addon.isIgnored, 'text-warning': hasWarning() }">{{
           listItem.addon.name
           }}</a>
@@ -47,7 +42,7 @@
             svgIcon="fas:exclamation-triangle">
           </mat-icon>
         </div>
-        <div *ngIf="hasWarning()" class="mr-2">
+        <div *ngIf="hasWarning() === true" class="mr-2">
           <mat-icon class="auto-update-icon text-warning" [matTooltip]="getWarningText()"
             svgIcon="fas:exclamation-triangle">
           </mat-icon>
@@ -57,6 +52,14 @@
             [svgIcon]="getIgnoreIcon()">
           </mat-icon>
         </div>
+        <!-- If no warning and not ignored for some specific reason, default to this -->
+        <div
+          *ngIf="listItem.isLoadOnDemand === false && hasIgnoreReason() === false && hasWarning() === false && listItem.addon.providerName === unknownProviderName"
+          class="mr-2">
+          <mat-icon class="auto-update-icon" [matTooltip]="'PAGES.MY_ADDONS.UNKNOWN_ADDON_INFO_TOOLTIP' | translate"
+            [matTooltipClass]="['text-center']" [style.color]="'#ff9800'" svgIcon="fas:exclamation-triangle">
+          </mat-icon>
+        </div>
         {{ listItem.addon.installedVersion }}
         <div *ngIf="showUpdateToVersion && listItem.needsUpdate()" class="text-1  row">
           <mat-icon class="upgrade-icon" svgIcon="fas:play"></mat-icon>

wowup-electron/src/app/pages/about/about.component.spec.ts

@@ -8,6 +8,8 @@ import { httpLoaderFactory } from "../../app.module";
 import { TranslateMessageFormatCompiler } from "ngx-translate-messageformat-compiler";
 import { MatModule } from "../../mat-module";
 import { NoopAnimationsModule } from "@angular/platform-browser/animations";
+import { SessionService } from "../../services/session/session.service";
+import { BehaviorSubject } from "rxjs";
 
 describe("AboutComponent", () => {
   let component: AboutComponent;
@@ -16,6 +18,7 @@ describe("AboutComponent", () => {
   let wowUpService: WowUpService;
   let electronServiceSpy: any;
   let wowUpServiceSpy: any;
+  let sessionService: SessionService;
 
   beforeEach(async () => {
     wowUpServiceSpy = jasmine.createSpyObj("WowUpService", {
@@ -25,6 +28,10 @@ describe("AboutComponent", () => {
       getVersionNumber: () => Promise.resolve("2.0.0"),
     });
 
+    sessionService = jasmine.createSpyObj("SessionService", [], {
+      selectedHomeTab$: new BehaviorSubject(1),
+    });
+
     await TestBed.configureTestingModule({
       declarations: [AboutComponent],
       imports: [
@@ -49,6 +56,7 @@ describe("AboutComponent", () => {
           providers: [
             { provide: WowUpService, useValue: wowUpServiceSpy },
             { provide: ElectronService, useValue: electronServiceSpy },
+            { provide: SessionService, useValue: sessionService },
           ],
         },
       })

wowup-electron/src/app/pages/about/about.component.ts

@@ -38,7 +38,7 @@ export class AboutComponent implements OnDestroy {
     this._subscriptions.push(tabIndexSub);
   }
 
-  ngOnDestroy(): void {
+  public ngOnDestroy(): void {
     this._subscriptions.forEach((subscription) => subscription.unsubscribe());
     this._subscriptions = [];
   }

wowup-electron/src/app/utils/test.utils.ts

@@ -7,7 +7,7 @@ export function testHttpLoaderFactory(http: HttpClient): TranslateHttpLoader {
   return new TranslateHttpLoader(http, "./assets/i18n/", ".json");
 }
 
-export function getStandardTestImports() {
+export function getStandardTestImports(): any[] {
   return [HttpClientModule, createTranslateModule()];
 }
 

wowup-electron/src/assets/changelog.json

@@ -1,5 +1,9 @@
 {
   "ChangeLogs": [
+    {
+      "Version": "2.2.0-beta.21",
+      "changes": ["Fix an issue from switching to the addon folder array"]
+    },
     {
       "Version": "2.2.0-beta.20",
       "changes": ["Fix an issue from switching to the addon folder array"]