From d500e1a9d6b954dd13eeee2c2289c857aeddfa37 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Fri, 11 Feb 2022 14:18:24 +0000 Subject: [PATCH] feat: fixed the radarr ui --- .../components/radarr-form.component.html | 6 +- .../components/radarr-form.component.ts | 3 +- .../app/settings/radarr/radarr.component.html | 6 +- .../app/settings/radarr/radarr.component.ts | 7 +- .../src/app/settings/settings.module.ts | 68 ------------------- 5 files changed, 10 insertions(+), 80 deletions(-) diff --git a/src/Ombi/ClientApp/src/app/settings/radarr/components/radarr-form.component.html b/src/Ombi/ClientApp/src/app/settings/radarr/components/radarr-form.component.html index 1583b906f..2dbf6869d 100644 --- a/src/Ombi/ClientApp/src/app/settings/radarr/components/radarr-form.component.html +++ b/src/Ombi/ClientApp/src/app/settings/radarr/components/radarr-form.component.html @@ -56,7 +56,7 @@
Quality Profiles - + {{quality.name}} @@ -71,7 +71,7 @@
Default Root Folder - + {{folder.path}} @@ -82,7 +82,7 @@
Default Minimum Availability - + {{min.name}} diff --git a/src/Ombi/ClientApp/src/app/settings/radarr/components/radarr-form.component.ts b/src/Ombi/ClientApp/src/app/settings/radarr/components/radarr-form.component.ts index ed93e8339..f426f273b 100644 --- a/src/Ombi/ClientApp/src/app/settings/radarr/components/radarr-form.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/radarr/components/radarr-form.component.ts @@ -9,7 +9,7 @@ import { TesterService, NotificationService, RadarrService } from "../../../serv selector: "ombi-settings-radarr-form", templateUrl: "./radarr-form.component.html", styleUrls: ["./radarr-form.component.scss"], - changeDetection: ChangeDetectionStrategy.OnPush + // changeDetection: ChangeDetectionStrategy.OnPush }) export class RadarrFormComponent implements OnInit { @@ -27,6 +27,7 @@ export class RadarrFormComponent implements OnInit { public ngOnInit() { this.form = this.controlContainer.control; + // this.toggleValidators(); this.qualities = []; this.qualities.push({ name: "Please Select", id: -1 }); diff --git a/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.html b/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.html index 0d9fc055f..ae164fa3f 100644 --- a/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.html +++ b/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.html @@ -31,8 +31,4 @@
- - -
-    {{ form.value | json }}
-
\ No newline at end of file + \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.ts b/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.ts index cd7f79e94..1bf3cd4ea 100644 --- a/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from "@angular/core"; -import { FormBuilder, FormGroup } from "@angular/forms"; +import { FormBuilder, FormGroup, ValidationErrors } from "@angular/forms"; import { IMinimumAvailability, IRadarrCombined, IRadarrProfile, IRadarrRootFolder } from "../../interfaces"; import { NotificationService, SettingsService } from "../../services"; @@ -63,11 +63,12 @@ export class RadarrComponent implements OnInit { } const radarrForm = form.controls.radarr as FormGroup; const radarr4KForm = form.controls.radarr4K as FormGroup; - if (radarrForm.controls.enabled && (radarrForm.controls.defaultQualityProfile.value === "-1" || radarrForm.controls.defaultRootPath.value === "Please Select")) { + + if (radarrForm.controls.enabled.value && (radarrForm.controls.defaultQualityProfile.value === -1 || radarrForm.controls.defaultRootPath.value === "Please Select")) { this.notificationService.error("Please check your entered values for Radarr"); return; } - if (radarr4KForm.controls.enabled && (radarr4KForm.controls.defaultQualityProfile.value === "-1" || radarr4KForm.controls.defaultRootPath.value === "Please Select")) { + if (radarr4KForm.controls.enabled.value && (radarr4KForm.controls.defaultQualityProfile.value === -1 || radarr4KForm.controls.defaultRootPath.value === "Please Select")) { this.notificationService.error("Please check your entered values for Radarr 4K"); return; } diff --git a/src/Ombi/ClientApp/src/app/settings/settings.module.ts b/src/Ombi/ClientApp/src/app/settings/settings.module.ts index c5a696604..333fcbe95 100644 --- a/src/Ombi/ClientApp/src/app/settings/settings.module.ts +++ b/src/Ombi/ClientApp/src/app/settings/settings.module.ts @@ -82,74 +82,6 @@ import { VoteComponent } from "./vote/vote.component"; import { WebhookComponent } from "./notifications/webhook.component"; import { WhatsAppComponent } from "./notifications/twilio/whatsapp.component"; import { WikiComponent } from "./wiki.component"; - -// import { TagInputModule } from "ngx-chips"; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - const routes: Routes = [ { path: "Ombi", component: OmbiComponent, canActivate: [AuthGuard] },