Merge branch 'master' into develop

.github/workflows/cypress.yml

@@ -70,6 +70,9 @@ jobs:
         wait-on: http://localhost:5000/
         # 10 minutes
         wait-on-timeout: 600
+        wait-on: http://localhost:5000/
+        # 10 minutes
+        wait-on-timeout: 600
       env:
         CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -550,7 +550,8 @@ Here are some of the features Ombi has:
             <br />
             <sub><b>Jacob Pyke</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/jamesmacwhite">
             <img src="https://avatars.githubusercontent.com/u/8067792?v=4" width="50;" alt="jamesmacwhite"/>
@@ -593,7 +594,8 @@ Here are some of the features Ombi has:
             <br />
             <sub><b>Kris Klosterman</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/kmlucy">
             <img src="https://avatars.githubusercontent.com/u/13952475?v=4" width="50;" alt="kmlucy"/>
@@ -630,6 +632,13 @@ Here are some of the features Ombi has:
         </a>
     </td></tr>
 <tr>
+    <td align="center">
+        <a href="https://github.com/marleypowell">
+            <img src="https://avatars.githubusercontent.com/u/55280588?v=4" width="50;" alt="marleypowell"/>
+            <br />
+            <sub><b>Marley</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/marleypowell">
             <img src="https://avatars.githubusercontent.com/u/55280588?v=4" width="50;" alt="marleypowell"/>
@@ -643,7 +652,8 @@ Here are some of the features Ombi has:
             <br />
             <sub><b>Matt</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/LMaxence">
             <img src="https://avatars.githubusercontent.com/u/29194680?v=4" width="50;" alt="LMaxence"/>
@@ -686,7 +696,8 @@ Here are some of the features Ombi has:
             <br />
             <sub><b>Rob Gökemeijer</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/sambartik">
             <img src="https://avatars.githubusercontent.com/u/63553146?v=4" width="50;" alt="sambartik"/>
@@ -729,7 +740,8 @@ Here are some of the features Ombi has:
             <br />
             <sub><b>Tim Trott</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/tombomb">
             <img src="https://avatars.githubusercontent.com/u/544509?v=4" width="50;" alt="tombomb"/>
@@ -772,7 +784,8 @@ Here are some of the features Ombi has:
             <br />
             <sub><b>Blake Drumm</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/camjac251">
             <img src="https://avatars.githubusercontent.com/u/6313132?v=4" width="50;" alt="camjac251"/>

src/Ombi/ClientApp/.storybook/preview-body.html

@@ -1,3 +1,7 @@
+<style>
+    .test-class {
+        background-color: purple;
+    }
 <style>
     .test-class {
         background-color: purple;

src/Ombi/ClientApp/angular.json

@@ -105,6 +105,7 @@
           "options": {
             "tsConfig": [
               "src/tsconfig.json"
+              "src/tsconfig.json"
             ],
             "exclude": [
               "**/node_modules/**"

src/Ombi/ClientApp/package.json

@@ -44,7 +44,7 @@
     "moment": "^2.29.1",
     "ng2-cookies": "^1.0.12",
     "ngx-clipboard": "^12.1.0",
-    "ngx-infinite-scroll": "^14.0.0",
+    "ngx-infinite-scroll": "^9.0.0",
     "ngx-moment": "^3.0.1",
     "ngx-order-pipe": "^2.2.0",
     "popper.js": "^1.14.3",
@@ -69,7 +69,5 @@
     "protractor": "~5.4.0",
     "ts-node": "~5.0.1",
     "tslint": "^5.12.0"
-  },
+  }
-  "readme": "ERROR: No README data found!",
-  "_id": "ombi@3.0.0"
 }

src/Ombi/ClientApp/src/app/components/image/image.component.ts

@@ -75,3 +75,11 @@ export class ImageComponent {
     }
   }
 }
+
+        // Retry the original image
+        const timeout = setTimeout(() => {
+            event.target.src = this.src;
+            clearTimeout(timeout);
+        }, Math.floor(Math.random() * (7000 - 1000 + 1)) + 1000);
+    }
+  }

src/Ombi/ClientApp/src/app/discover/discover.module.ts

@@ -9,6 +9,7 @@ import { RouterModule } from "@angular/router";
 import { SharedModule } from "../shared/shared.module";
 import { SkeletonModule } from 'primeng/skeleton';
 import { ImageComponent } from 'app/components';
+import { ImageComponent } from 'app/components';
 
 @NgModule({
     imports: [

src/Ombi/ClientApp/src/app/login/login.component.ts

@@ -1,5 +1,6 @@
 import { Component, OnDestroy, OnInit, Inject } from "@angular/core";
 import { UntypedFormBuilder, UntypedFormGroup, Validators } from "@angular/forms";
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from "@angular/forms";
 import { ActivatedRoute, Router } from "@angular/router";
 import { TranslateService } from "@ngx-translate/core";
 
@@ -19,6 +20,7 @@ import { RadarrFacade } from "app/state/radarr";
   styleUrls: ["./login.component.scss"],
 })
 export class LoginComponent implements OnDestroy, OnInit {
+  public form: UntypedFormGroup;
   public form: UntypedFormGroup;
   public customizationSettings: ICustomizationSettings;
   public authenticationSettings: IAuthenticationSettings;
@@ -53,6 +55,7 @@ export class LoginComponent implements OnDestroy, OnInit {
     private router: Router,
     private status: StatusService,
     private fb: UntypedFormBuilder,
+    private fb: UntypedFormBuilder,
     private settingsService: SettingsService,
     private customziationFacade: CustomizationFacade,
     private route: ActivatedRoute,
@@ -119,6 +122,7 @@ export class LoginComponent implements OnDestroy, OnInit {
       .subscribe((x) => (this.errorValidation = x));
   }
 
+  public onSubmit(form: UntypedFormGroup) {
   public onSubmit(form: UntypedFormGroup) {
     if (form.invalid) {
       this.notify.open(this.errorValidation, "OK", {

src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.ts

@@ -142,7 +142,14 @@ export class TvDetailsComponent implements OnInit {
         this.tv.images.original = 'https://image.tmdb.org/t/p/w300/' + this.tv.images.original
       };
     }
-
+    private checkPoster() {
+      if (this.tv.images.original == null) {
+        this.tv.images.original = "../../../images/default_movie_poster.png";
+      }
+      else {
+        this.tv.images.original = 'https://image.tmdb.org/t/p/w300/' + this.tv.images.original
+      };
+    }
     private loadAdvancedInfo() {
         const profile = this.sonarrService.getQualityProfilesWithoutSettings();
         const folders = this.sonarrService.getRootFoldersWithoutSettings();

src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.ts

@@ -75,6 +75,7 @@ export class RadarrComponent implements OnInit {
                     }))
                 }
             });
+
     }
 
 

src/Ombi/ClientApp/src/app/shared/advanced-search-dialog/advanced-search-dialog-data.service.ts

@@ -38,7 +38,6 @@ export class AdvancedSearchDialogDataService {
     getOptions(): any {
         return this._options;
     }
-
     getLoaded(): number {
         return this._options.loaded;
     }