Fixed the about page, we now include a count of the users online too!

src/Ombi.Schedule/Jobs/Plex/PlexContentSync.cs

@@ -51,15 +51,13 @@ namespace Ombi.Schedule.Jobs.Plex
     public class PlexContentSync : IPlexContentSync
     {
         public PlexContentSync(ISettingsService<PlexSettings> plex, IPlexApi plexApi, ILogger<PlexContentSync> logger, IPlexContentRepository repo,
-            IPlexEpisodeSync epsiodeSync, IRefreshMetadata metadataRefresh, IPlexAvailabilityChecker checker, IHubContext<NotificationHub> hub)
+            IPlexEpisodeSync epsiodeSync, IHubContext<NotificationHub> hub)
         {
             Plex = plex;
             PlexApi = plexApi;
             Logger = logger;
             Repo = repo;
             EpisodeSync = epsiodeSync;
-            Metadata = metadataRefresh;
-            Checker = checker;
             Notification = hub;
             Plex.ClearCache();
         }
@@ -69,8 +67,6 @@ namespace Ombi.Schedule.Jobs.Plex
         private ILogger<PlexContentSync> Logger { get; }
         private IPlexContentRepository Repo { get; }
         private IPlexEpisodeSync EpisodeSync { get; }
-        private IRefreshMetadata Metadata { get; }
-        private IPlexAvailabilityChecker Checker { get; }
         private IHubContext<NotificationHub> Notification { get; set; }
 
         public async Task Execute(IJobExecutionContext context)

src/Ombi/ClientApp/src/app/interfaces/IHub.ts

@@ -0,0 +1,7 @@
+import { UserType } from "./IUser";
+
+export interface IConnectedUser {
+    userId: string;
+    displayName: string;
+    userType: UserType
+}

src/Ombi/ClientApp/src/app/interfaces/index.ts

@@ -18,3 +18,4 @@ export * from "./ILidarr";
 export * from "./ISearchMusicResult";
 export * from "./IVote";
 export * from "./IFailedRequests";
+export * from "./IHub";

src/Ombi/ClientApp/src/app/services/hub.service.ts

@@ -0,0 +1,19 @@
+import { APP_BASE_HREF } from "@angular/common";
+import { Injectable, Inject } from "@angular/core";
+import { Observable } from "rxjs";
+
+import { HttpClient } from "@angular/common/http";
+
+import { IConnectedUser } from "../interfaces";
+import { ServiceHelpers } from "./service.helpers";
+
+@Injectable()
+export class HubService extends ServiceHelpers {
+    constructor(public http: HttpClient, @Inject(APP_BASE_HREF) href:string) {
+        super(http, "/api/v2/hub/", href);
+    }
+
+    public getConnectedUsers(): Promise<IConnectedUser[]> {
+        return this.http.get<IConnectedUser[]>(`${this.url}users`, {headers: this.headers}).toPromise();
+    }
+}

src/Ombi/ClientApp/src/app/services/index.ts

@@ -19,3 +19,4 @@ export * from "./requestretry.service";
 export * from "./searchV2.service";
 export * from "./custompage.service";
 export * from "./message.service";
+export * from "./hub.service";

src/Ombi/ClientApp/src/app/settings/about/about.component.html

@@ -1,106 +1,71 @@
-
-<settings-menu></settings-menu>
+<settings-menu></settings-menu>
 <div *ngIf="about" class="container">
-    <fieldset>
-        <legend>About</legend>
-        <form>
-            <div class="col-md-8">
-                <table class="table table-striped table-hover table-responsive table-condensed">
-                    <thead>
-                    </thead>
-                    <tbody>
-                        <tr>
-                            <td>
-                                <span>Version</span>
-                            </td>
-                            <td>
-                                <span>{{about.version}} <a [routerLink]="['/Settings/Update']" *ngIf="newUpdate" style="color:#df691a"><b>(New Update Available)</b></a></span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <span>Branch</span>
-                            </td>
-                            <td>
-                                <span>{{about.branch}}</span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <span>Github</span>
-                            </td>
-                            <td>
-                                <a href="https://github.com/tidusjar/Ombi" target="_blank">https://github.com/tidusjar/Ombi</a>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <span>Discord</span>
-                            </td>
-                            <td>
-                                <a href="https://discord.gg/Sa7wNWb" target="_blank">https://discord.gg/Sa7wNWb</a>
-                            </td>
-                        </tr>
+  <legend>About</legend>
 
-                        <tr>
-                            <td>
-                                <span>Reddit</span>
-                            </td>
-                            <td>
-                                <a href="https://www.reddit.com/r/Ombi/" target="_blank">https://www.reddit.com/r/Ombi/</a>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <span>Issues</span>
-                            </td>
-                            <td>
-                                <a href="https://github.com/tidusjar/Ombi/issues" target="_blank">https://github.com/tidusjar/Ombi/issues</a>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <span>Wiki</span>
-                            </td>
-                            <td>
-                                <a href="https://github.com/tidusjar/Ombi/wiki" target="_blank">https://github.com/tidusjar/Ombi/wiki</a>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <span>OS Architecture</span>
-                            </td>
-                            <td>
-                                <span>{{about.osArchitecture}}</span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <span>OS Description</span>
-                            </td>
-                            <td>
-                                <span>{{about.osDescription}}</span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <span>Process Architecture</span>
-                            </td>
-                            <td>
-                                <span>{{about.processArchitecture}}</span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <span>Application Base Path</span>
-                            </td>
-                            <td>
-                                <span>{{about.applicationBasePath}}</span>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </form>
-    </fieldset>
+  <div class="mat-table">
+    <div class="mat-row" *ngIf="connectedUsers">
+      <div class="mat-cell">Users Online</div>
+      <div class="mat-cell">{{connectedUsers.length}}</div>
+    </div>
+    <div class="mat-row">
+      <div class="mat-cell">Version</div>
+      <div class="mat-cell">{{about.version}} <a [routerLink]="['/Settings/Update']" *ngIf="newUpdate"
+          style="color:#df691a"><b>(New Update Available)</b></a></div>
+    </div>
+
+    <div class="mat-row">
+      <div class="mat-cell">Branch</div>
+      <div class="mat-cell">{{about.branch}}</div>
+    </div>
+
+    <div class="mat-row">
+      <div class="mat-cell">Github</div>
+      <div class="mat-cell"> <a href="https://github.com/tidusjar/Ombi"
+          target="_blank">https://github.com/tidusjar/Ombi</a></div>
+    </div>
+
+    <div class="mat-row">
+      <div class="mat-cell">Discord</div>
+      <div class="mat-cell"><a href="https://discord.gg/Sa7wNWb" target="_blank">https://discord.gg/Sa7wNWb</a></div>
+    </div>
+
+    <div class="mat-row">
+      <div class="mat-cell">Reddit</div>
+      <div class="mat-cell"> <a href="https://www.reddit.com/r/Ombi/" target="_blank">https://www.reddit.com/r/Ombi/</a>
+      </div>
+    </div>
+
+    <div class="mat-row">
+      <div class="mat-cell">Issues</div>
+      <div class="mat-cell"> <a href="https://github.com/tidusjar/Ombi/issues"
+          target="_blank">https://github.com/tidusjar/Ombi/issues</a></div>
+    </div>
+
+    <div class="mat-row">
+      <div class="mat-cell">Wiki</div>
+      <div class="mat-cell"> <a href="https://github.com/tidusjar/Ombi/wiki"
+          target="_blank">https://github.com/tidusjar/Ombi/wiki</a></div>
+    </div>
+
+    <div class="mat-row">
+      <div class="mat-cell">OS Architecture</div>
+      <div class="mat-cell"> {{about.osArchitecture}}</div>
+    </div>
+
+    <div class="mat-row">
+      <div class="mat-cell">OS Description</div>
+      <div class="mat-cell">{{about.osDescription}}</div>
+    </div>
+
+    <div class="mat-row">
+      <div class="mat-cell">Process Architecture</div>
+      <div class="mat-cell">{{about.processArchitecture}}</div>
+    </div>
+
+    <div class="mat-row">
+      <div class="mat-cell">Application Base Path</div>
+      <div class="mat-cell">{{about.applicationBasePath}}</div>
+    </div>
+
+  </div>
 </div>

src/Ombi/ClientApp/src/app/settings/about/about.component.scss

@@ -0,0 +1,20 @@
+.mat-table {
+    display: block;
+  }
+  
+  .mat-row,
+  .mat-header-row {
+    display: flex;
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+    align-items: center;
+    min-height: 48px;
+    padding: 0 24px;
+  }
+  
+  .mat-cell,
+  .mat-header-cell {
+    flex: 1;
+    overflow: hidden;
+    word-wrap: break-word;
+  }

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

@@ -1,19 +1,23 @@
 import { Component, OnInit } from "@angular/core";
 import { IAbout } from "../../interfaces/ISettings";
-import { JobService, SettingsService } from "../../services";
+import { JobService, SettingsService, HubService } from "../../services";
+import { IConnectedUser } from "../../interfaces";
 
 @Component({
     templateUrl: "./about.component.html",
+    styleUrls: ["./about.component.scss"]
 })
 export class AboutComponent implements OnInit {
 
     public about: IAbout;
     public newUpdate: boolean;
+    public connectedUsers: IConnectedUser[];
 
     constructor(private readonly settingsService: SettingsService,
-                private readonly jobService: JobService) { }
+                private readonly jobService: JobService,
+                private readonly hubService: HubService) { }
 
-    public ngOnInit() {
+    public async ngOnInit() {
         this.settingsService.about().subscribe(x => this.about = x);
         this.jobService.getCachedUpdate().subscribe(x => {
             if (x === true) {
@@ -21,5 +25,6 @@ export class AboutComponent implements OnInit {
             }
         });
 
+        this.connectedUsers = await this.hubService.getConnectedUsers();
     }
 }

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

@@ -51,6 +51,7 @@ import { SettingsMenuComponent } from "./settingsmenu.component";
 import { AutoCompleteModule, CalendarModule, DialogModule, InputSwitchModule, InputTextModule, MenuModule, RadioButtonModule, TooltipModule } from "primeng/primeng";
 import { MatMenuModule} from "@angular/material";
 import { SharedModule } from "../shared/shared.module";
+import { HubService } from "../services/hub.service";
 
 const routes: Routes = [
     { path: "Ombi", component: OmbiComponent, canActivate: [AuthGuard] },
@@ -160,6 +161,7 @@ const routes: Routes = [
         NotificationMessageService,
         LidarrService,
         RequestRetryService,
+        HubService,
     ],
 
 })

src/Ombi/Controllers/V2/HubController.cs

@@ -1,53 +1,56 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
+using System;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
-using Ombi.Api.TheMovieDb.Models;
-using Ombi.Core.Engine.V2;
 using System.Collections.Generic;
-using System.Linq;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.SignalR;
-using Ombi.Core;
-using Ombi.Core.Engine.Interfaces;
-using Ombi.Core.Models.Search;
-using Ombi.Core.Models.Search.V2;
-using Ombi.Helpers;
+using Microsoft.EntityFrameworkCore;
+using Ombi.Attributes;
+using Ombi.Core.Authentication;
 using Ombi.Hubs;
 using Ombi.Models;
 
 namespace Ombi.Controllers.V2
 {
     [ApiV2]
-    [Authorize]
+    [Admin]
     [ApiController]
     public class HubController : ControllerBase
     {
-        public HubController(IHubContext<NotificationHub> hub)
+        public HubController(OmbiUserManager um)
         {
-            _hub = hub;
+            _um = um;
         }
 
-        private readonly IHubContext<NotificationHub> _hub;
+        private readonly OmbiUserManager _um;
 
         /// <summary>
-        /// Returns search results for both TV and Movies
+        /// Returns the currently connected users in Ombi
         /// </summary>
         /// <returns></returns>
-        [HttpGet("{searchTerm}")]
-        public async Task MultiSearch(string searchTerm)
+        [HttpGet("Users")]
+        public async Task<List<ConnectedUsersViewModel>> GetConnectedUsers()
         {
-            await _hub.Clients.All.SendAsync("Notification", searchTerm);
-        }
+            var users = NotificationHub.UsersOnline.Values;
+            var allUsers = _um.Users;
+            var model = new List<ConnectedUsersViewModel>();
+            foreach (var user in users)
+            {
+                var ombiUser = await allUsers.FirstOrDefaultAsync(x => x.Id.Equals(user.UserId, StringComparison.InvariantCultureIgnoreCase));
 
-        /// <summary>
-        /// Returns search results for both TV and Movies
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet("admin/{searchTerm}")]
-        public async Task Admin(string searchTerm)
-        {
-            var admins = NotificationHub.UsersOnline.Where(x => x.Value.Roles.Contains(OmbiRoles.Admin)).Select(x => x.Key).ToList();
-            await _hub.Clients.Clients(admins).SendAsync("Notification", searchTerm);
+                if (ombiUser == null)
+                {
+                    continue;
+                }
+
+                model.Add(new ConnectedUsersViewModel
+                {
+                    UserId = ombiUser.Id,
+                    DisplayName = ombiUser.UserAlias,
+                    UserType = ombiUser.UserType
+                });
+            }
+
+            return model;
         }
     }
 }

src/Ombi/Models/ConnectedUsersViewModel.cs

@@ -0,0 +1,12 @@
+
+using Ombi.Store.Entities;
+
+namespace Ombi.Models
+{
+    public class ConnectedUsersViewModel
+    {
+        public string UserId { get; set; }
+        public string DisplayName { get; set; }
+        public UserType UserType { get; set; }
+    }
+}