From 5123a76954e9f81d58c05e31afc7a29aec19cb7a Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Sun, 22 Jan 2023 20:47:05 +0000
Subject: [PATCH] fix(Hide music from navbar and request list when not
 enabled): :bug:

---
 src/Ombi/ClientApp/src/app/app.module.ts            |  3 ++-
 .../carousel-list/carousel-list.component.ts        |  2 +-
 .../ClientApp/src/app/my-nav/my-nav.component.html  |  2 +-
 .../ClientApp/src/app/my-nav/my-nav.component.ts    |  7 +++++--
 .../src/app/requests-list/components/index.ts       |  3 ++-
 .../components/requests-list.component.html         |  2 +-
 .../components/requests-list.component.ts           |  6 +++++-
 .../src/app/services/applications/lidarr.service.ts |  5 +++++
 .../advanced-search-dialog-data.service.ts          |  2 +-
 .../Controllers/V1/External/LidarrController.cs     | 13 ++++++++++++-
 10 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/src/Ombi/ClientApp/src/app/app.module.ts b/src/Ombi/ClientApp/src/app/app.module.ts
index 7e12d7b9b..c4547ffe2 100644
--- a/src/Ombi/ClientApp/src/app/app.module.ts
+++ b/src/Ombi/ClientApp/src/app/app.module.ts
@@ -1,5 +1,5 @@
 import { APP_BASE_HREF, CommonModule, PlatformLocation } from "@angular/common";
-import { CustomPageService, ImageService, RequestService, SettingsService, SonarrService } from "./services";
+import { CustomPageService, ImageService, LidarrService, RequestService, SettingsService, SonarrService } from "./services";
 import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 import { HTTP_INTERCEPTORS, HttpClient, HttpClientModule } from "@angular/common/http";
 import { IdentityService, IssuesService, JobService, MessageService, PlexTvService, SearchService, StatusService } from "./services";
@@ -209,6 +209,7 @@ export function JwtTokenGetter() {
         StorageService,
         RequestService,
         SonarrService,
+        LidarrService,
         SignalRNotificationService,
         FEATURES_INITIALIZER,
         SONARR_INITIALIZER,
diff --git a/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.ts b/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.ts
index 032da22e6..2aacd4bd6 100644
--- a/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.ts
+++ b/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.ts
@@ -45,7 +45,7 @@ export class CarouselListComponent implements OnInit {
     };
     private amountToLoad = 17;
     private currentlyLoaded = 0;
-    private baseUrl: string;
+    private baseUrl: string = "";
 
 
     constructor(private searchService: SearchV2Service,
diff --git a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html
index f35a8f612..e74c8d995 100644
--- a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html
+++ b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html
@@ -84,7 +84,7 @@
                         <mat-slide-toggle id="filterTv" class="mat-menu-item slide-menu" [checked]="searchFilter.tvShows"
                             (click)="$event.stopPropagation()" (change)="changeFilter($event,SearchFilterType.TvShow)">
                             {{ 'NavigationBar.Filter.TvShows' | translate}}</mat-slide-toggle>
-                        <mat-slide-toggle id="filterMusic" class="mat-menu-item slide-menu" [checked]="searchFilter.music"
+                        <mat-slide-toggle *ngIf="musicEnabled$ | async" id="filterMusic" class="mat-menu-item slide-menu" [checked]="searchFilter.music"
                             (click)="$event.stopPropagation()" (change)="changeFilter($event,SearchFilterType.Music)">
                             {{ 'NavigationBar.Filter.Music' | translate}}</mat-slide-toggle>
                         <!-- <mat-slide-toggle class="mat-menu-item slide-menu" [checked]="searchFilter.people"
diff --git a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.ts b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.ts
index e03e073eb..2d441682a 100644
--- a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.ts
+++ b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.ts
@@ -1,7 +1,7 @@
 import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
 import { Component, EventEmitter, Input, OnInit, Output, SimpleChanges } from '@angular/core';
 import { ICustomizationSettings, IUser, RequestType, UserType } from '../interfaces';
-import { SettingsService, SettingsStateService } from '../services';
+import { LidarrService, SettingsService, SettingsStateService } from '../services';
 
 import { AdvancedSearchDialogComponent } from '../shared/advanced-search-dialog/advanced-search-dialog.component';
 import { CustomizationFacade } from '../state/customization';
@@ -15,7 +15,7 @@ import { Observable } from 'rxjs';
 import { Router } from '@angular/router';
 import { SearchFilter } from './SearchFilter';
 import { StorageService } from '../shared/storage/storage-service';
-import { map } from 'rxjs/operators';
+import { map, take } from 'rxjs/operators';
 
 export enum SearchFilterType {
   Movie = 1,
@@ -56,9 +56,12 @@ export class MyNavComponent implements OnInit {
 
   private customizationSettings: ICustomizationSettings;
 
+  public readonly musicEnabled$ = this.lidarrService.enabled().pipe(take(1));
+
   constructor(private breakpointObserver: BreakpointObserver,
     private settingsService: SettingsService,
     private customizationFacade: CustomizationFacade,
+    private lidarrService: LidarrService,
     private store: StorageService,
     private filterService: FilterService,
     private dialogService: MatDialog,
diff --git a/src/Ombi/ClientApp/src/app/requests-list/components/index.ts b/src/Ombi/ClientApp/src/app/requests-list/components/index.ts
index d4bef4dfe..2df1acbaa 100644
--- a/src/Ombi/ClientApp/src/app/requests-list/components/index.ts
+++ b/src/Ombi/ClientApp/src/app/requests-list/components/index.ts
@@ -2,7 +2,7 @@
 import { MoviesGridComponent } from "./movies-grid/movies-grid.component";
 
 import { RequestServiceV2 } from "../../services/requestV2.service";
-import { RequestService } from "../../services";
+import { LidarrService, RequestService } from "../../services";
 import { TvGridComponent } from "./tv-grid/tv-grid.component";
 import { GridSpinnerComponent } from "./grid-spinner/grid-spinner.component";
 import { RequestOptionsComponent } from "./options/request-options.component";
@@ -20,4 +20,5 @@ export const components: any[] = [
 export const providers: any[] = [
     RequestService,
     RequestServiceV2,
+    LidarrService,
 ];
diff --git a/src/Ombi/ClientApp/src/app/requests-list/components/requests-list.component.html b/src/Ombi/ClientApp/src/app/requests-list/components/requests-list.component.html
index 3f1b9c861..0610f3d06 100644
--- a/src/Ombi/ClientApp/src/app/requests-list/components/requests-list.component.html
+++ b/src/Ombi/ClientApp/src/app/requests-list/components/requests-list.component.html
@@ -11,7 +11,7 @@
           <tv-grid (onOpenOptions)="onOpenOptions($event)"></tv-grid>
           </ng-template>
     </mat-tab>
-    <mat-tab label="{{ 'NavigationBar.Filter.Music' | translate }}">
+    <mat-tab *ngIf="musicEnabled$ | async" label="{{ 'NavigationBar.Filter.Music' | translate }}">
       <ng-template matTabContent>
         <albums-grid (onOpenOptions)="onOpenOptions($event)"></albums-grid>
         </ng-template>
diff --git a/src/Ombi/ClientApp/src/app/requests-list/components/requests-list.component.ts b/src/Ombi/ClientApp/src/app/requests-list/components/requests-list.component.ts
index 4ea6e4886..99e478878 100644
--- a/src/Ombi/ClientApp/src/app/requests-list/components/requests-list.component.ts
+++ b/src/Ombi/ClientApp/src/app/requests-list/components/requests-list.component.ts
@@ -3,6 +3,8 @@ import { Component, ViewChild } from "@angular/core";
 import { MatBottomSheet } from "@angular/material/bottom-sheet";
 import { RequestOptionsComponent } from "./options/request-options.component";
 import { UpdateType } from "../models/UpdateType";
+import { LidarrService } from "app/services";
+import { take } from "rxjs";
 
 @Component({
     templateUrl: "./requests-list.component.html",
@@ -10,7 +12,9 @@ import { UpdateType } from "../models/UpdateType";
 })
 export class RequestsListComponent {
 
-    constructor(private bottomSheet: MatBottomSheet) { }
+    constructor(private bottomSheet: MatBottomSheet, private lidarrService: LidarrService) { }
+
+    public readonly musicEnabled$ = this.lidarrService.enabled().pipe(take(1));
 
     public onOpenOptions(event: { request: any, filter: any, onChange: any, manageOwnRequests: boolean, isAdmin: boolean, has4kRequest: boolean, hasRegularRequest: boolean }) {
         const ref = this.bottomSheet.open(RequestOptionsComponent, { data: { id: event.request.id, type: event.request.requestType, canApprove: event.request.canApprove, manageOwnRequests: event.manageOwnRequests, isAdmin: event.isAdmin, has4kRequest: event.has4kRequest, hasRegularRequest: event.hasRegularRequest } });
diff --git a/src/Ombi/ClientApp/src/app/services/applications/lidarr.service.ts b/src/Ombi/ClientApp/src/app/services/applications/lidarr.service.ts
index dfe0e1164..c11648102 100644
--- a/src/Ombi/ClientApp/src/app/services/applications/lidarr.service.ts
+++ b/src/Ombi/ClientApp/src/app/services/applications/lidarr.service.ts
@@ -13,9 +13,14 @@ export class LidarrService extends ServiceHelpers {
         super(http, "/api/v1/Lidarr", href);
     }
 
+    public enabled(): Observable<boolean> {
+        return this.http.get<boolean>(`${this.url}/enabled/`,  {headers: this.headers});
+    }
+
     public getRootFolders(settings: ILidarrSettings): Observable<ILidarrRootFolder[]> {
         return this.http.post<ILidarrRootFolder[]>(`${this.url}/RootFolders/`, JSON.stringify(settings),  {headers: this.headers});
     }
+
     public getQualityProfiles(settings: ILidarrSettings): Observable<ILidarrProfile[]> {
         return this.http.post<ILidarrProfile[]>(`${this.url}/Profiles/`, JSON.stringify(settings),  {headers: this.headers});
     }
diff --git a/src/Ombi/ClientApp/src/app/shared/advanced-search-dialog/advanced-search-dialog-data.service.ts b/src/Ombi/ClientApp/src/app/shared/advanced-search-dialog/advanced-search-dialog-data.service.ts
index 480751e78..af6956bcd 100644
--- a/src/Ombi/ClientApp/src/app/shared/advanced-search-dialog/advanced-search-dialog-data.service.ts
+++ b/src/Ombi/ClientApp/src/app/shared/advanced-search-dialog/advanced-search-dialog-data.service.ts
@@ -38,7 +38,7 @@ export class AdvancedSearchDialogDataService {
     getOptions(): any {
         return this._options;
     }
-    
+
     getLoaded(): number {
         return this._options.loaded;
     }
diff --git a/src/Ombi/Controllers/V1/External/LidarrController.cs b/src/Ombi/Controllers/V1/External/LidarrController.cs
index 616f01918..bf92b57fc 100644
--- a/src/Ombi/Controllers/V1/External/LidarrController.cs
+++ b/src/Ombi/Controllers/V1/External/LidarrController.cs
@@ -11,7 +11,6 @@ using Ombi.Settings.Settings.Models.External;
 
 namespace Ombi.Controllers.V1.External
 {
-   [PowerUser]
    [ApiV1]
    [Produces("application/json")]
     public class LidarrController : Controller
@@ -28,11 +27,19 @@ namespace Ombi.Controllers.V1.External
         private readonly ISettingsService<LidarrSettings> _lidarrSettings;
         private ICacheService Cache { get; }
 
+        [HttpGet("enabled")]
+        public async Task<bool> Enabled()
+        {
+            var settings = await _lidarrSettings.GetSettingsAsync();
+            return settings.Enabled;
+        }
+
         /// <summary>
         /// Gets the Lidarr profiles.
         /// </summary>
         /// <param name="settings">The settings.</param>
         /// <returns></returns>
+        [PowerUser]
         [HttpPost("Profiles")]
         public async Task<IEnumerable<LidarrProfile>> GetProfiles([FromBody] LidarrSettings settings)
         {
@@ -44,6 +51,7 @@ namespace Ombi.Controllers.V1.External
         /// </summary>
         /// <param name="settings">The settings.</param>
         /// <returns></returns>
+        [PowerUser]
         [HttpPost("RootFolders")]
         public async Task<IEnumerable<LidarrRootFolder>> GetRootFolders([FromBody] LidarrSettings settings)
         {
@@ -55,6 +63,7 @@ namespace Ombi.Controllers.V1.External
         /// </summary>
         /// <param name="settings">The settings.</param>
         /// <returns></returns>
+        [PowerUser]
         [HttpPost("Metadata")]
         public async Task<IEnumerable<MetadataProfile>> GetMetadataProfiles([FromBody] LidarrSettings settings)
         {
@@ -66,6 +75,7 @@ namespace Ombi.Controllers.V1.External
         /// <remarks>The data is cached for an hour</remarks>
         /// </summary>
         /// <returns></returns>
+        [PowerUser]
         [HttpGet("Profiles")]
         public async Task<IEnumerable<LidarrProfile>> GetProfiles()
         {
@@ -85,6 +95,7 @@ namespace Ombi.Controllers.V1.External
         /// <remarks>The data is cached for an hour</remarks>
         /// </summary>
         /// <returns></returns>
+        [PowerUser]
         [HttpGet("RootFolders")]
         public async Task<IEnumerable<LidarrRootFolder>> GetRootFolders()
         {