Merge 2078b3b into f858c88

src/Ombi/ClientApp/angular.json

@@ -19,7 +19,7 @@
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.app.json",
+            "tsConfig": "src/tsconfig.json",
             "assets": [
               "src/assets"
             ],
@@ -114,7 +114,7 @@
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": [
-              "src/tsconfig.app.json"
+              "src/tsconfig.json"
             ],
             "exclude": [
               "**/node_modules/**"
@@ -124,7 +124,6 @@
       }
     }
   },
-  "defaultProject": "ombi",
   "cli": {
     "analytics": false
   }

src/Ombi/ClientApp/package.json

@@ -4,23 +4,23 @@
   "scripts": {
     "ng": "ng",
     "start": "ng serve --port 3578 --configuration hmr",
-    "build": "node --max_old_space_size=6144 node_modules/@angular/cli/bin/ng build --prod",
+    "build": "node --max_old_space_size=6144 node_modules/@angular/cli/bin/ng build -c production",
     "lint": "ng lint"
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^13.2.0",
+    "@angular/animations": "^14.0.0",
     "@angular/cdk": "^13.2.0",
-    "@angular/common": "^13.2.0",
-    "@angular/compiler": "^13.2.0",
-    "@angular/core": "^13.2.0",
-    "@angular/forms": "^13.2.0",
-    "@angular/localize": "^13.2.0",
+    "@angular/common": "^14.0.0",
+    "@angular/compiler": "^14.0.0",
+    "@angular/core": "^14.0.0",
+    "@angular/forms": "^14.0.0",
+    "@angular/localize": "^14.0.0",
     "@angular/material": "^13.2.0",
-    "@angular/platform-browser": "^13.2.0",
-    "@angular/platform-browser-dynamic": "^13.2.0",
-    "@angular/platform-server": "^13.2.0",
-    "@angular/router": "^13.2.0",
+    "@angular/platform-browser": "^14.0.0",
+    "@angular/platform-browser-dynamic": "^14.0.0",
+    "@angular/platform-server": "^14.0.0",
+    "@angular/router": "^14.0.0",
     "@angularclass/hmr": "^3.0.0",
     "@aspnet/signalr": "^1.1.0",
     "@auth0/angular-jwt": "^5.0.2",
@@ -34,7 +34,6 @@
     "@ngxs/store": "^3.7.3",
     "@types/jquery": "^3.5.13",
     "@yellowspot/ng-truncate": "^2.0.0",
-    "angular-bootstrap-md": "^7.5.4",
     "angular-router-loader": "^0.8.5",
     "angularx-qrcode": "^13.0.3",
     "bootstrap": "^4.2.1",
@@ -63,19 +62,19 @@
     "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~13.2.0",
-    "@angular/cli": "~13.2.0",
-    "@angular/compiler-cli": "^13.2.0",
-    "@angular/language-service": "^13.2.0",
+    "@angular-devkit/build-angular": "^14.0.0",
+    "@angular/cli": "^14.0.0",
+    "@angular/compiler-cli": "^14.0.0",
+    "@angular/language-service": "^14.0.0",
     "@types/jasmine": "~3.6.7",
     "@types/jasminewd2": "~2.0.8",
     "@types/node": "^16.10.9",
     "codelyzer": "^6.0.1",
-    "typescript": "~4.5.5"
+    "typescript": "~4.7.3"
   },
   "optionalDependencies": {
     "protractor": "~5.4.0",
     "ts-node": "~5.0.1",
     "tslint": "^5.12.0"
   }
-}
+}

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

@@ -1,5 +1,4 @@
 import { APP_BASE_HREF, CommonModule, PlatformLocation } from "@angular/common";
-import { CardsFreeModule, MDBBootstrapModule, NavbarModule } from "angular-bootstrap-md";
 import { CustomPageService, ImageService, RequestService, SettingsService } from "./services";
 import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 import { HTTP_INTERCEPTORS, HttpClient, HttpClientModule } from "@angular/common/http";
@@ -131,7 +130,6 @@ export function JwtTokenGetter() {
         MatSnackBarModule,
         DialogModule,
         MatButtonModule,
-        NavbarModule,
         MatCardModule,
         MatTooltipModule,
         MatMenuModule,
@@ -145,11 +143,9 @@ export function JwtTokenGetter() {
         ConfirmDialogModule,
         OverlayPanelModule,
         CommonModule,
-        CardsFreeModule,
         OverlayModule,
         MatCheckboxModule,
         MatProgressSpinnerModule,
-        MDBBootstrapModule.forRoot(),
         JwtModule.forRoot({
             config: {
                 tokenGetter: JwtTokenGetter,

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

@@ -1,5 +1,5 @@
 import { Component, OnInit, SecurityContext } from "@angular/core";
-import { FormBuilder, FormGroup, Validators } from "@angular/forms";
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from "@angular/forms";
 import { DomSanitizer } from "@angular/platform-browser";
 import { AuthService } from "../auth/auth.service";
 import { CustomPageService, NotificationService } from "../services";
@@ -10,11 +10,11 @@ import { CustomPageService, NotificationService } from "../services";
 })
 export class CustomPageComponent implements OnInit {
 
-    public form: FormGroup;
+    public form: UntypedFormGroup;
     public isEditing: boolean;
     public isAdmin: boolean;
 
-    constructor(private auth: AuthService, private settings: CustomPageService, private fb: FormBuilder,
+    constructor(private auth: AuthService, private settings: CustomPageService, private fb: UntypedFormBuilder,
                 private notificationService: NotificationService, 
                 private sanitizer: DomSanitizer) {
     }

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

@@ -1,5 +1,5 @@
 import { Component, OnDestroy, OnInit, Inject } from "@angular/core";
-import { FormBuilder, FormGroup, Validators } from "@angular/forms";
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from "@angular/forms";
 import { ActivatedRoute, Router } from "@angular/router";
 import { TranslateService } from "@ngx-translate/core";
 
@@ -24,7 +24,7 @@ import { CustomizationFacade } from "../state/customization";
   styleUrls: ["./login.component.scss"],
 })
 export class LoginComponent implements OnDestroy, OnInit {
-  public form: FormGroup;
+  public form: UntypedFormGroup;
   public customizationSettings: ICustomizationSettings;
   public authenticationSettings: IAuthenticationSettings;
   public plexEnabled: boolean;
@@ -59,7 +59,7 @@ export class LoginComponent implements OnDestroy, OnInit {
     private authService: AuthService,
     private router: Router,
     private status: StatusService,
-    private fb: FormBuilder,
+    private fb: UntypedFormBuilder,
     private settingsService: SettingsService,
     private customziationFacade: CustomizationFacade,
     private images: ImageService,
@@ -132,7 +132,7 @@ export class LoginComponent implements OnDestroy, OnInit {
       .subscribe((x) => (this.errorValidation = x));
   }
 
-  public onSubmit(form: FormGroup) {
+  public onSubmit(form: UntypedFormGroup) {
     if (form.invalid) {
       this.notify.open(this.errorValidation, "OK", {
         duration: 300000,

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

@@ -1,6 +1,6 @@
 import { PlatformLocation, APP_BASE_HREF } from "@angular/common";
 import { Component, OnInit, Inject } from "@angular/core";
-import { FormBuilder, FormGroup, Validators } from "@angular/forms";
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from "@angular/forms";
 import { DomSanitizer } from "@angular/platform-browser";
 import { fadeInOutAnimation } from "../animations/fadeinout";
 
@@ -15,15 +15,15 @@ import { CustomizationFacade } from "../state/customization";
 })
 export class ResetPasswordComponent implements OnInit {
 
-    public form: FormGroup;
+    public form: UntypedFormGroup;
     public customizationSettings: ICustomizationSettings;
     public emailSettingsEnabled: boolean;
     public baseUrl: string;
     public background: any;
     private href: string;
 
     constructor(private identityService: IdentityService, private notify: NotificationService,
-                private fb: FormBuilder, private settingsService: SettingsService, @Inject(APP_BASE_HREF) href:string,
+                private fb: UntypedFormBuilder, private settingsService: SettingsService, @Inject(APP_BASE_HREF) href:string,
                 private images: ImageService, private sanitizer: DomSanitizer, private customizationFacade: CustomizationFacade) {
                     this.href = href;
         this.form = this.fb.group({
@@ -43,7 +43,7 @@ export class ResetPasswordComponent implements OnInit {
         this.settingsService.getEmailSettingsEnabled().subscribe(x => this.emailSettingsEnabled = x);
     }
 
-    public onSubmit(form: FormGroup) {
+    public onSubmit(form: UntypedFormGroup) {
         if (this.emailSettingsEnabled) {
 
             if (form.invalid) {

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

@@ -1,6 +1,6 @@
 import { ActivatedRoute, Params } from "@angular/router";
 import { Component, OnInit } from "@angular/core";
-import { FormBuilder, FormGroup, Validators } from "@angular/forms";
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from "@angular/forms";
 import { IdentityService, ImageService } from "../services";
 
 import { CustomizationFacade } from "../state/customization";
@@ -17,13 +17,13 @@ import { Router } from "@angular/router";
 })
 export class TokenResetPasswordComponent implements OnInit {
 
-    public form: FormGroup;
+    public form: UntypedFormGroup;
     public customizationSettings: ICustomizationSettings;
     public background: any;
     public baseUrl: string;
 
     constructor(private identityService: IdentityService, private router: Router, private route: ActivatedRoute, private notify: NotificationService,
-                private fb: FormBuilder, private location: PlatformLocation, private images: ImageService,
+                private fb: UntypedFormBuilder, private location: PlatformLocation, private images: ImageService,
                 private sanitizer: DomSanitizer, private customizationFacade: CustomizationFacade,
                 ) {
 
@@ -49,7 +49,7 @@ export class TokenResetPasswordComponent implements OnInit {
         this.customizationFacade.settings$().subscribe(x => this.customizationSettings = x);
     }
 
-    public onSubmit(form: FormGroup) {
+    public onSubmit(form: UntypedFormGroup) {
         if (form.invalid) {
             this.notify.error("Email address is required");
             return;

src/Ombi/ClientApp/src/app/media-details/components/shared/request-behalf/request-behalf.component.ts

@@ -1,11 +1,10 @@
 import { Component, OnInit } from "@angular/core";
-import { map, startWith } from "rxjs/operators";
-
-import { FormControl } from "@angular/forms";
-import { IUserDropdown } from "../../../../interfaces";
-import { IdentityService } from "../../../../services";
 import { MatDialogRef } from "@angular/material/dialog";
+import { IdentityService } from "../../../../services";
+import { IUserDropdown } from "../../../../interfaces";
+import { UntypedFormControl } from "@angular/forms";
 import { Observable } from "rxjs";
+import { map, startWith } from "rxjs/operators";
 
 @Component({
     selector: "request-behalf",
@@ -16,7 +15,7 @@ export class RequestBehalfComponent implements OnInit {
         public dialogRef: MatDialogRef<RequestBehalfComponent>,
         public identity: IdentityService) { }
 
-    public myControl = new FormControl();
+    public myControl = new UntypedFormControl();
     public options: IUserDropdown[];
     public filteredOptions: Observable<IUserDropdown[]>;
     public userId: string;

src/Ombi/ClientApp/src/app/my-nav/nav-search.component.ts

@@ -8,7 +8,7 @@ import {
 
 import { empty} from "rxjs";
 import { Router } from "@angular/router";
-import { FormGroup, FormBuilder } from "@angular/forms";
+import { UntypedFormGroup, UntypedFormBuilder } from "@angular/forms";
 
 @Component({
   selector: "app-nav-search",
@@ -17,11 +17,11 @@ import { FormGroup, FormBuilder } from "@angular/forms";
 })
 export class NavSearchComponent implements OnInit {
 
-  public searchForm: FormGroup;
+  public searchForm: UntypedFormGroup;
 
   constructor(
     private router: Router,
-    private fb: FormBuilder
+    private fb: UntypedFormBuilder
   ) {}
 
   public async ngOnInit() {

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

@@ -1,27 +1,21 @@
-import { CommonModule } from "@angular/common";
-import { NgModule } from "@angular/core";
-import { FormsModule } from "@angular/forms";
-import { RouterModule, Routes } from "@angular/router";
-
+import { RouterModule, Routes } from "@angular/router";
 
-import { MovieSearchComponent } from "./moviesearch.component";
-import { MovieSearchGridComponent } from "./moviesearchgrid.component";
 import { AlbumSearchComponent } from "./music/albumsearch.component";
 import { ArtistSearchComponent } from "./music/artistsearch.component";
+import { AuthGuard } from "../auth/auth.guard";
+import { CommonModule } from "@angular/common";
+import { FormsModule } from "@angular/forms";
+import { MovieSearchComponent } from "./moviesearch.component";
+import { MovieSearchGridComponent } from "./moviesearchgrid.component";
 import { MusicSearchComponent } from "./music/musicsearch.component";
-import { SearchComponent } from "./search.component";
-import { SeriesInformationComponent } from "./seriesinformation.component";
-import { TvSearchComponent } from "./tvsearch.component";
-
-import { CardsFreeModule } from "angular-bootstrap-md";
-
+import { NgModule } from "@angular/core";
+import { RemainingRequestsComponent } from "../requests/remainingrequests.component";
 import { RequestService } from "../services";
+import { SearchComponent } from "./search.component";
 import { SearchService } from "../services";
-
-import { AuthGuard } from "../auth/auth.guard";
-
-import { RemainingRequestsComponent } from "../requests/remainingrequests.component";
+import { SeriesInformationComponent } from "./seriesinformation.component";
 import { SharedModule } from "../shared/shared.module";
+import { TvSearchComponent } from "./tvsearch.component";
 
 const routes: Routes = [
     { path: "", component: SearchComponent, canActivate: [AuthGuard] },
@@ -36,7 +30,6 @@ const routes: Routes = [
         SharedModule,
         SidebarModule,
         TooltipModule,
-        CardsFreeModule,
     ],
     declarations: [
         SearchComponent,

src/Ombi/ClientApp/src/app/services/helpers/validation.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from "@angular/core";
-import { FormGroup, ValidatorFn, Validators } from "@angular/forms";
+import { UntypedFormGroup, ValidatorFn, Validators } from "@angular/forms";
 
 @Injectable()
 export class ValidationService {
@@ -9,7 +9,7 @@ export class ValidationService {
      * @param form
      * @param name
      */
-    public disableValidation(form: FormGroup, name: string) {
+    public disableValidation(form: UntypedFormGroup, name: string) {
         form.controls[name].clearValidators();
         form.controls[name].updateValueAndValidity();
     }
@@ -19,8 +19,8 @@ export class ValidationService {
      * @param form
      * @param name
      */
-    public enableValidation(form: FormGroup, name: string): void;
-    public enableValidation(form: FormGroup, name: string, validators?: ValidatorFn[]) {
+    public enableValidation(form: UntypedFormGroup, name: string): void;
+    public enableValidation(form: UntypedFormGroup, name: string, validators?: ValidatorFn[]) {
         if (validators) {
             // If we provide some use them
             form.controls[name].setValidators(validators);

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

@@ -1,5 +1,5 @@
 import { Component, OnInit } from "@angular/core";
-import { FormBuilder, FormGroup, Validators } from "@angular/forms";
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from "@angular/forms";
 
 import { NotificationService } from "../../services";
 import { SettingsService } from "../../services";
@@ -10,11 +10,11 @@ import { SettingsService } from "../../services";
 })
 export class AuthenticationComponent implements OnInit {
 
-    public form: FormGroup;
+    public form: UntypedFormGroup;
 
     constructor(private settingsService: SettingsService,
                 private notificationService: NotificationService,
-                private fb: FormBuilder) { }
+                private fb: UntypedFormBuilder) { }
 
     public ngOnInit() {
         this.settingsService.getAuthentication().subscribe(x => {
@@ -42,7 +42,7 @@ export class AuthenticationComponent implements OnInit {
 
     }
 
-    public onSubmit(form: FormGroup) {
+    public onSubmit(form: UntypedFormGroup) {
         if (form.invalid) {
             this.notificationService.error("Please check your entered values");
             return;