+
+
+
+
+
Plex Servers
+
+
+
+
+ dns
+ {{server.name}}
+
+
+
-
- When a Plex User adds something to their watchlist in Plex, it will turn up in Ombi as a Request if enabled. This only applies to users that are logging in with their Plex Account
-
-
+
+
+
+ add_circle
+ Add Server
+
+
+
+
+
-
- If enabled then watchlist requests for TV Shows will request the whole
-
+
+
+
Sync Actions
+
+
+ sync
+ Full Sync
+
+
+ update
+ Partial Sync
+
+
+ cleaning_services
+ Clear & Resync
+
+
+ playlist_add
+ Run Watchlist Import
+
+
+
+
+
+
+
+
Plex Credentials
+
+
+
+ These fields are optional to automatically fill in your Plex server settings.
+
+
+ Username
+
-
+ Password
+
-
-
-
Servers
-
-
-
- {{server.name}}
-
-
+
+ key
+ Load Servers
+
-
-
- Manually Add Server
-
-
-
-
-
-
-
-
-
- Full
- Sync
-
- Partial Sync
-
-
-
- Clear Data And Resync
-
-
-
-
- Run Watchlist Import
-
-
-
-
-
-
-
+
-
-
-
- Plex Credentials
- These fields are optional to automatically fill in your Plex server settings.
-
-
-
-
-
-
-
-
-
-
- Please select the server:
-
-
-
-
+
+
+ save
+ Save Changes
+
+
+
-
diff --git a/src/Ombi/ClientApp/src/app/settings/plex/plex.component.scss b/src/Ombi/ClientApp/src/app/settings/plex/plex.component.scss
index 443e033a9..6449d548f 100644
--- a/src/Ombi/ClientApp/src/app/settings/plex/plex.component.scss
+++ b/src/Ombi/ClientApp/src/app/settings/plex/plex.component.scss
@@ -43,4 +43,258 @@
h3 {
margin: 0;
}
- }
\ No newline at end of file
+ }
+
+.plex-settings-container {
+ padding: 20px;
+ max-width: 1400px;
+ margin: 0 auto;
+}
+
+.settings-card {
+ margin-bottom: 20px;
+ background: transparent;
+ box-shadow: 0 2px 12px 0 rgba(0,0,0,0.25);
+ border-radius: 12px;
+ border: 1px solid #353a45;
+}
+
+.section-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin-bottom: 20px;
+}
+
+.settings-grid {
+ display: grid;
+ grid-template-columns: repeat(auto-fit, minmax(320px, 1fr));
+ gap: 24px;
+ margin-bottom: 30px;
+}
+
+.setting-card {
+ height: 100%;
+ background: transparent;
+ border-radius: 10px;
+ border: 1px solid #353a45;
+ box-shadow: 0 1px 6px 0 rgba(0,0,0,0.18);
+ color: #f1f3f6;
+}
+
+.setting-card.disabled {
+ opacity: 0.6;
+}
+
+.setting-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin-bottom: 10px;
+ font-weight: 600;
+ color: #fff;
+}
+
+.setting-description {
+ color: #e0e3ea;
+ font-size: 15px;
+ margin: 0;
+ font-weight: 400;
+ line-height: 1.6;
+}
+
+.main-content {
+ display: grid;
+ grid-template-columns: 1fr 1fr;
+ gap: 36px;
+ margin-top: 36px;
+}
+
+.servers-grid {
+ display: grid;
+ grid-template-columns: repeat(auto-fill, minmax(220px, 1fr));
+ gap: 18px;
+}
+
+.server-card {
+ text-align: center;
+ background: transparent;
+ border-radius: 10px;
+ border: 1px solid #353a45;
+ box-shadow: 0 1px 6px 0 rgba(0,0,0,0.18);
+ color: #f1f3f6;
+}
+
+.server-card button {
+ width: 100%;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ padding: 24px;
+ color: #f1f3f6;
+ font-weight: 500;
+}
+
+.server-card mat-icon {
+ font-size: 32px;
+ height: 32px;
+ width: 32px;
+ margin-bottom: 10px;
+ color: #90caf9;
+}
+
+.sync-actions-grid {
+ display: grid;
+ grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));
+ gap: 18px;
+}
+
+.sync-actions-grid button {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ padding: 24px;
+ color: #f1f3f6;
+ background: transparent;
+ border: 1px solid #353a45;
+ border-radius: 10px;
+ font-weight: 500;
+ box-shadow: 0 1px 6px 0 rgba(0,0,0,0.18);
+}
+
+.sync-actions-grid mat-icon {
+ font-size: 32px;
+ height: 32px;
+ width: 32px;
+ margin-bottom: 10px;
+ color: #90caf9;
+}
+
+.credentials-card {
+ padding: 24px;
+ background: transparent;
+ border-radius: 10px;
+ border: 1px solid #353a45;
+ box-shadow: 0 1px 6px 0 rgba(0,0,0,0.18);
+ color: #f1f3f6;
+}
+
+.credentials-description {
+ color: #e0e3ea;
+ margin-bottom: 20px;
+ font-size: 15px;
+ font-weight: 400;
+}
+
+mat-card-title, h2, h3 {
+ color: #fff !important;
+ font-weight: 700 !important;
+ letter-spacing: 0.5px;
+}
+
+mat-card-header {
+ border-bottom: 1px solid #353a45;
+ margin-bottom: 16px;
+}
+
+mat-form-field {
+ color: #f1f3f6 !important;
+}
+
+mat-label, .mat-form-field-label {
+ color: #b0b6c3 !important;
+ font-weight: 500;
+}
+
+input[matInput], .mat-input-element {
+ color: #f1f3f6 !important;
+ background: transparent !important;
+}
+
+mat-select {
+ color: #f1f3f6 !important;
+ background: transparent !important;
+}
+
+.full-width {
+ width: 100%;
+}
+
+.mt-3 {
+ margin-top: 1rem;
+}
+
+.mat-slide-toggle.mat-checked .mat-slide-toggle-bar {
+ background-color: #90caf9 !important;
+}
+
+.mat-slide-toggle-thumb {
+ background-color: #2196f3 !important;
+}
+
+button[mat-flat-button], button[mat-raised-button], button[mat-stroked-button], button[mat-button] {
+ font-weight: 600;
+ letter-spacing: 0.2px;
+ color: #f1f3f6;
+ background: #2196f3;
+ border-radius: 6px;
+ box-shadow: 0 1px 4px 0 rgba(0,0,0,0.12);
+ transition: background 0.2s;
+}
+button[mat-flat-button]:hover, button[mat-raised-button]:hover, button[mat-stroked-button]:hover, button[mat-button]:hover {
+ background: #42a5f5;
+}
+
+@media (max-width: 1200px) {
+ .main-content {
+ grid-template-columns: 1fr;
+ }
+}
+
+@media (max-width: 768px) {
+ .settings-grid {
+ grid-template-columns: 1fr;
+ }
+
+ .servers-grid {
+ grid-template-columns: 1fr;
+ }
+
+ .sync-actions-grid {
+ grid-template-columns: 1fr;
+ }
+}
+
+.watchlist-errors-btn-row {
+ display: flex;
+ justify-content: center;
+ margin-top: 18px;
+}
+
+.info-banner {
+ display: flex;
+ align-items: center;
+ background: #23272f;
+ color: #e0e3ea;
+ border: 1px solid #1976d2;
+ box-shadow: 0 1px 6px 0 rgba(0,0,0,0.12);
+ border-radius: 8px;
+ padding: 16px 20px;
+ margin-top: 18px;
+ margin-bottom: 0;
+ font-size: 16px;
+ font-weight: 500;
+ gap: 12px;
+}
+
+.info-banner mat-icon {
+ font-size: 28px;
+ color: #42a5f5;
+}
+
+.info-banner button[mat-button] {
+ margin-left: 16px;
+ font-weight: 600;
+}
\ No newline at end of file
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 5a3e24e90..59dfdd2ec 100644
--- a/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.html
@@ -1,5 +1,5 @@
-
+
Radarr Settings
@@ -33,4 +33,4 @@
-
\ 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 620daf41f..46014230e 100644
--- a/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.ts
+++ b/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, QueryList, ViewChildren } from "@angular/core";
+import { Component, OnDestroy, OnInit, QueryList, ViewChildren } from "@angular/core";
import { UntypedFormBuilder, UntypedFormGroup } from "@angular/forms";
import { RadarrFacade } from "app/state/radarr";
@@ -6,36 +6,41 @@ import { IMinimumAvailability, IRadarrCombined, IRadarrProfile, IRadarrRootFolde
import { NotificationService } from "../../services";
import { FeaturesFacade } from "../../state/features/features.facade";
import { RadarrFormComponent } from "./components/radarr-form.component";
+import { Observable, ReplaySubject, Subject, combineLatest, map, switchMap, takeUntil, tap } from "rxjs";
@Component({
templateUrl: "./radarr.component.html",
styleUrls: ["./radarr.component.scss"]
})
-export class RadarrComponent implements OnInit {
+export class RadarrComponent implements OnInit, OnDestroy {
public qualities: IRadarrProfile[];
public rootFolders: IRadarrRootFolder[];
public minimumAvailabilityOptions: IMinimumAvailability[];
public profilesRunning: boolean;
public rootFoldersRunning: boolean;
- public form: UntypedFormGroup;
public is4kEnabled: boolean = false;
- @ViewChildren('4kForm') public form4k: QueryList
;
- @ViewChildren('normalForm') public normalForm: QueryList;
+ public readonly form$: Observable;
- constructor(private radarrFacade: RadarrFacade,
- private notificationService: NotificationService,
- private featureFacade: FeaturesFacade,
- private fb: UntypedFormBuilder) { }
+ private readonly form4k$: ReplaySubject>;
+ private readonly normalForm$: ReplaySubject>;
+ private readonly destroyed$: Subject;
+ constructor(
+ private readonly radarrFacade: RadarrFacade,
+ private readonly notificationService: NotificationService,
+ private readonly featureFacade: FeaturesFacade,
+ readonly fb: UntypedFormBuilder
+ ) {
+ this.form4k$ = new ReplaySubject();
+ this.normalForm$ = new ReplaySubject();
+ this.destroyed$ = new Subject();
- public ngOnInit() {
- this.is4kEnabled = this.featureFacade.is4kEnabled();
- this.radarrFacade.state$()
- .subscribe(x => {
- this.form = this.fb.group({
- radarr: this.fb.group({
+ this.form$ = radarrFacade.state$()
+ .pipe(
+ map(x => fb.group({
+ radarr: fb.group({
enabled: [x.settings.radarr.enabled],
apiKey: [x.settings.radarr.apiKey],
defaultQualityProfile: [+x.settings.radarr.defaultQualityProfile],
@@ -50,7 +55,7 @@ export class RadarrComponent implements OnInit {
minimumAvailability: [x.settings.radarr.minimumAvailability],
scanForAvailability: [x.settings.radarr.scanForAvailability]
}),
- radarr4K: this.fb.group({
+ radarr4K: fb.group({
enabled: [x.settings.radarr4K.enabled],
apiKey: [x.settings.radarr4K.apiKey],
defaultQualityProfile: [+x.settings.radarr4K.defaultQualityProfile],
@@ -65,19 +70,44 @@ export class RadarrComponent implements OnInit {
minimumAvailability: [x.settings.radarr4K.minimumAvailability],
scanForAvailability: [x.settings.radarr4K.scanForAvailability]
}),
- });
- this.normalForm.changes.forEach((comp => {
- comp.first.toggleValidators();
}))
- if (this.is4kEnabled) {
- this.form4k.changes.forEach((comp => {
- comp.first.toggleValidators();
- }))
- }
- });
-
+ )
}
+ @ViewChildren('4kForm')
+ protected set form4k(component: QueryList) {
+ this.form4k$.next(component);
+ }
+
+ @ViewChildren('normalForm')
+ protected set normalForm(component: QueryList) {
+ this.normalForm$.next(component);
+ }
+
+ public ngOnInit() {
+ this.is4kEnabled = this.featureFacade.is4kEnabled();
+
+ combineLatest([this.form$, this.normalForm$])
+ .pipe(
+ switchMap(([, normalForm]) => normalForm.changes),
+ tap(comp => comp.first.toggleValidators()),
+ takeUntil(this.destroyed$)
+ ).subscribe();
+
+ if (this.is4kEnabled) {
+ combineLatest([this.form$, this.form4k$])
+ .pipe(
+ switchMap(([, form4k]) => form4k.changes),
+ tap(comp => comp.first.toggleValidators()),
+ takeUntil(this.destroyed$)
+ ).subscribe();
+ }
+ }
+
+ public ngOnDestroy(): void {
+ this.destroyed$.next();
+ this.destroyed$.complete();
+ }
public onSubmit(form: UntypedFormGroup) {
if (form.invalid) {
diff --git a/src/Ombi/ClientApp/src/app/state/radarr/radarr.state.ts b/src/Ombi/ClientApp/src/app/state/radarr/radarr.state.ts
index 20bf3fe9c..b59faa624 100644
--- a/src/Ombi/ClientApp/src/app/state/radarr/radarr.state.ts
+++ b/src/Ombi/ClientApp/src/app/state/radarr/radarr.state.ts
@@ -18,7 +18,7 @@ export class RadarrSettingsState {
@Action(LoadSettings)
public load({ setState }: StateContext): Observable {
- const isAdmin = this.authService.hasRole("Admin");
+ const isAdmin = this.authService.isAdmin();
const calls = isAdmin ? [this.settingsService.getRadarr()] : [of({})];
return combineLatest(calls).pipe(
diff --git a/src/Ombi/ClientApp/src/app/state/sonarr/sonarr.state.ts b/src/Ombi/ClientApp/src/app/state/sonarr/sonarr.state.ts
index 218dd912c..38d2c35e9 100644
--- a/src/Ombi/ClientApp/src/app/state/sonarr/sonarr.state.ts
+++ b/src/Ombi/ClientApp/src/app/state/sonarr/sonarr.state.ts
@@ -18,7 +18,7 @@ export class SonarrSettingsState {
@Action(LoadSettings)
public load({ setState }: StateContext): Observable {
- const isAdmin = this.authService.hasRole("Admin");
+ const isAdmin = this.authService.isAdmin();
const calls = isAdmin ? [this.sonarrService.getVersion(), this.settingsService.getSonarr()] : [of(""), of({})];
return combineLatest(calls).pipe(
diff --git a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement-user.component.ts b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement-user.component.ts
index 1110490b9..a2e1872f9 100644
--- a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement-user.component.ts
+++ b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement-user.component.ts
@@ -37,6 +37,13 @@ export class UserManagementUserComponent implements OnInit {
private appUrl: string = this.customizationFacade.appUrl();
private accessToken: string;
+ // List of excluded notification agents that should not be shown in user preferences
+ private readonly excludedAgents = [
+ INotificationAgent.Email,
+ INotificationAgent.Mobile,
+ INotificationAgent.Webhook
+ ];
+
constructor(private identityService: IdentityService,
private notificationService: MessageService,
private router: Router,
@@ -74,9 +81,15 @@ export class UserManagementUserComponent implements OnInit {
}
});
if(this.edit) {
- this.identityService.getNotificationPreferencesForUser(this.userId).subscribe(x => this.notificationPreferences = x);
+ this.identityService.getNotificationPreferencesForUser(this.userId).subscribe(x => {
+ // Filter out excluded notification agents
+ this.notificationPreferences = x.filter(pref => !this.excludedAgents.includes(pref.agent));
+ });
} else {
- this.identityService.getNotificationPreferences().subscribe(x => this.notificationPreferences = x);
+ this.identityService.getNotificationPreferences().subscribe(x => {
+ // Filter out excluded notification agents
+ this.notificationPreferences = x.filter(pref => !this.excludedAgents.includes(pref.agent));
+ });
}
this.sonarrService.getQualityProfilesWithoutSettings().subscribe(x => {
this.sonarrQualities = x;
diff --git a/src/Ombi/ClientApp/src/app/wizard/database/database.component.html b/src/Ombi/ClientApp/src/app/wizard/database/database.component.html
new file mode 100644
index 000000000..40aa353b6
--- /dev/null
+++ b/src/Ombi/ClientApp/src/app/wizard/database/database.component.html
@@ -0,0 +1,104 @@
+
diff --git a/src/Ombi/ClientApp/src/app/wizard/database/database.component.ts b/src/Ombi/ClientApp/src/app/wizard/database/database.component.ts
new file mode 100644
index 000000000..8c037f07f
--- /dev/null
+++ b/src/Ombi/ClientApp/src/app/wizard/database/database.component.ts
@@ -0,0 +1,92 @@
+import { Component, EventEmitter, OnInit, Output } from "@angular/core";
+import { FormBuilder, FormGroup, Validators } from "@angular/forms";
+import { BehaviorSubject } from "rxjs";
+import { WizardService } from "../services/wizard.service";
+import { NotificationService } from "app/services";
+import { MatTabChangeEvent } from "@angular/material/tabs";
+
+@Component({
+ templateUrl: "./database.component.html",
+ styleUrls: ["../welcome/welcome.component.scss"],
+ selector: "wizard-database-selector",
+})
+export class DatabaseComponent implements OnInit {
+ public constructor(private fb: FormBuilder, private service: WizardService, private notification: NotificationService) { }
+ @Output() public configuredDatabase = new EventEmitter();
+
+ public form: FormGroup;
+
+ public connectionString = new BehaviorSubject("Server=;Port=3306;Database=ombi");
+
+ public ngOnInit(): void {
+ this.form = this.fb.group({
+ type: [""],
+ host: ["", [Validators.required]],
+ port: [3306, [Validators.required]],
+ name: ["ombi", [Validators.required]],
+ user: [""],
+ password: [""],
+ });
+
+ this.form.valueChanges.subscribe(x => {
+ console.log(x);
+ let connection = `Server=${x.host};Port=${x.port};Database=${x.name}`;
+
+ if (x.user) {
+ connection += `;User=${x.user}`;
+ if (x.password) {
+ connection += `;Password=*******`;
+ }
+ }
+
+ if (x.type !== "MySQL") {
+ connection = connection.replace("Server", "Host").replace("User", "Username");
+ }
+
+ this.connectionString.next(connection);
+ });
+ }
+
+ public tabChange(event: MatTabChangeEvent) {
+ if (event.index === 0) {
+ this.form.reset();
+ }
+ if (event.index === 1) {
+ this.form.reset({
+ type: "MySQL",
+ host: "",
+ name: "ombi",
+ port: 3306,
+ });
+ this.form.controls.type.setValue("MySQL");
+
+ }
+ if (event.index === 2) {
+ this.form.reset({
+ type:"Postgres",
+ host: "",
+ name: "ombi",
+ port: 5432,
+ });
+
+ }
+ this.form.markAllAsTouched();
+ }
+
+ public save() {
+ this.service.addDatabaseConfig(this.form.value).subscribe({
+ next: () => {
+ this.notification.success(`Database configuration updated! Please now restart Ombi!`);
+ this.configuredDatabase.emit();
+ },
+ error: error => {
+ if (error.error.message) {
+ this.notification.error(error.error.message);
+ } else {
+ this.notification.error("Something went wrong, please check the logs");
+ }
+ },
+ });
+ }
+
+}
diff --git a/src/Ombi/ClientApp/src/app/wizard/models/DatabaseSettings.ts b/src/Ombi/ClientApp/src/app/wizard/models/DatabaseSettings.ts
new file mode 100644
index 000000000..41043a24b
--- /dev/null
+++ b/src/Ombi/ClientApp/src/app/wizard/models/DatabaseSettings.ts
@@ -0,0 +1,13 @@
+export interface DatabaseSettings {
+ type: string;
+ host: string;
+ port: number;
+ name: string;
+ user: string;
+ password: string;
+}
+
+export interface DatabaseConfigurationResult {
+ success: boolean;
+ message: string;
+}
\ No newline at end of file
diff --git a/src/Ombi/ClientApp/src/app/wizard/services/wizard.service.ts b/src/Ombi/ClientApp/src/app/wizard/services/wizard.service.ts
index 0f6511265..03cf9768d 100644
--- a/src/Ombi/ClientApp/src/app/wizard/services/wizard.service.ts
+++ b/src/Ombi/ClientApp/src/app/wizard/services/wizard.service.ts
@@ -5,6 +5,7 @@ import { Observable } from "rxjs";
import { ICustomizationSettings } from "../../interfaces";
import { ServiceHelpers } from "../../services";
import { IOmbiConfigModel } from "../models/OmbiConfigModel";
+import { DatabaseConfigurationResult, DatabaseSettings } from "../models/DatabaseSettings";
@Injectable()
@@ -16,4 +17,8 @@ export class WizardService extends ServiceHelpers {
public addOmbiConfig(config: IOmbiConfigModel): Observable {
return this.http.post(`${this.url}config`, config, {headers: this.headers});
}
+
+ public addDatabaseConfig(config: DatabaseSettings): Observable {
+ return this.http.post(`${this.url}database`, config, {headers: this.headers});
+ }
}
diff --git a/src/Ombi/ClientApp/src/app/wizard/welcome/welcome.component.html b/src/Ombi/ClientApp/src/app/wizard/welcome/welcome.component.html
index 5d693f834..f2958ccc4 100644
--- a/src/Ombi/ClientApp/src/app/wizard/welcome/welcome.component.html
+++ b/src/Ombi/ClientApp/src/app/wizard/welcome/welcome.component.html
@@ -1,6 +1,7 @@
-
+ @if (!needsRestart) {
+
+
+ Database
+ Back
+ Next
+
+ } @else {
+
+
+ Restart
+
+
+
+
+
+
Please Restart Ombi for the database changes to take effect!
+
+
+
+
+ }
+
+ 
+
+ 
+
+ 
+
+ 
+ 
@@ -780,13 +787,6 @@ Here are some of the features Ombi has:
Abe Kline
@@ -901,6 +901,13 @@ Here are some of the features Ombi has: