more wip on the issues

src/Ombi.Core/Engine/V2/IssuesEngine.cs

@@ -3,6 +3,7 @@ using Ombi.Store.Entities.Requests;
 using Ombi.Store.Repository;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Ombi.Core.Engine.V2
@@ -10,7 +11,8 @@ namespace Ombi.Core.Engine.V2
 
     public interface IIssuesEngine
     {
-        Task<IEnumerable<IssuesSummaryModel>> GetIssues(int position, int take, IssueStatus status);
+        Task<IEnumerable<IssuesSummaryModel>> GetIssues(int position, int take, IssueStatus status, CancellationToken token);
+        Task<IEnumerable<IssuesSummaryModel>> GetIssuesByTitle(string title, CancellationToken token);
     }
 
     public class IssuesEngine : IIssuesEngine
@@ -28,9 +30,30 @@ namespace Ombi.Core.Engine.V2
             _comments = comments;
         }
 
-        public async Task<IEnumerable<IssuesSummaryModel>> GetIssues(int position, int take, IssueStatus status)
+        public async Task<IEnumerable<IssuesSummaryModel>> GetIssues(int position, int take, IssueStatus status, CancellationToken token)
         {
-            var issues = await _issues.GetAll().Where(x => x.Status == status).Skip(position).Take(take).ToListAsync();
+            var issues = await _issues.GetAll().Include(x => x.UserReported).Include(x => x.IssueCategory).Where(x => x.Status == status).Skip(position).Take(take).OrderBy(x => x.Title).ToListAsync(token);
+            var grouped = issues.GroupBy(x => x.Title, (key, g) => new { Title = key, Issues = g });
+            
+            var model = new List<IssuesSummaryModel>();
+
+            foreach(var group in grouped)
+            {
+                model.Add(new IssuesSummaryModel
+                {
+                    Count = group.Issues.Count(),
+                    Title = group.Title,
+                    Issues = group.Issues
+                });
+            }
+
+            return model;
+        }
+
+        public async Task<IEnumerable<IssuesSummaryModel>> GetIssuesByTitle(string title, CancellationToken token)
+        {
+            var lowerTitle = title.ToLowerInvariant();
+            var issues = await _issues.GetAll().Include(x => x.UserReported).Include(x => x.IssueCategory).Where(x => x.Title.ToLowerInvariant() == lowerTitle).ToListAsync(token);
             var grouped = issues.GroupBy(x => x.Title, (key, g) => new { Title = key, Issues = g });
 
             var model = new List<IssuesSummaryModel>();

src/Ombi/ClientApp/src/app/issues/components/details-group/details-group.component.html

@@ -0,0 +1,27 @@
+<h1 mat-dialog-title>Issues for {{data.title}}</h1>
+<div mat-dialog-content>
+  
+    <div class="row">
+    <div class="col-6 top-spacing" *ngFor="let issue of data.issues">
+        <mat-card color="accent">
+            <mat-card-header>
+              <mat-card-title>{{issue.subject}}</mat-card-title>
+              <mat-card-subtitle>{{issue.userReported?.userName}} on {{issue.createdDate | date:short}}</mat-card-subtitle>
+            </mat-card-header>
+            <mat-card-content>
+              <p>
+                {{issue.description}}
+              </p>
+            </mat-card-content>
+            <mat-card-actions *ngIf="isAdmin && settings">
+              <button mat-raised-button color="accent" *ngIf="issue.status === IssueStatus.Pending && settings.enableInProgress" >{{'Issues.MarkInProgress' | translate }}</button>
+              <button mat-raised-button color="accent" *ngIf="issue.status === IssueStatus.Pending && !settings.enableInProgress || issue.status == IssueStatus.InProgress">{{'Issues.MarkResolved' | translate}}</button>
+            </mat-card-actions>
+          </mat-card>
+    </div>
+</div>
+</div>
+<div mat-dialog-actions>
+    <button  mat-raised-button color="warn" (click)="close()">Close</button>
+    <button *ngIf="hasRequest"  mat-raised-button color="accent"  (click)="navToRequest()">View Media</button>
+</div>

src/Ombi/ClientApp/src/app/issues/components/details-group/details-group.component.scss

@@ -0,0 +1,9 @@
+@import "~styles/variables.scss";
+
+::ng-deep .mat-card {
+  background: $ombi-background-primary-accent;
+}
+
+.top-spacing {
+  margin-top:2%;
+}

src/Ombi/ClientApp/src/app/issues/components/details-group/details-group.component.ts

@@ -0,0 +1,48 @@
+import { Component, Inject, OnInit } from "@angular/core";
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { AuthService } from "../../../auth/auth.service";
+import { IIssues, IIssueSettings, IssueStatus } from "../../../interfaces";
+import { SettingsService } from "../../../services";
+
+
+export interface IssuesDetailsGroupData {
+    issues: IIssues[];
+    title: string;
+  }
+
+@Component({
+    selector: "issues-details-group",
+    templateUrl: "details-group.component.html",
+    styleUrls: ["details-group.component.scss"],
+})
+export class DetailsGroupComponent implements OnInit {
+
+    public isAdmin: boolean;
+    public IssueStatus = IssueStatus;
+    public settings: IIssueSettings;
+    public get hasRequest(): boolean {
+        return this.data.issues.some(x => x.requestId);
+    }
+
+ constructor(public dialogRef: MatDialogRef<DetailsGroupComponent>,
+    @Inject(MAT_DIALOG_DATA) public data: IssuesDetailsGroupData,
+    private authService: AuthService,  private settingsService: SettingsService) { }
+
+    public ngOnInit() {
+        this.isAdmin = this.authService.hasRole("Admin") || this.authService.hasRole("PowerUser");
+        this.settingsService.getIssueSettings().subscribe(x => this.settings = x);
+    }
+
+    public close() {
+        this.dialogRef.close();
+      }
+
+      public navToRequest() {
+          var issue = this.data.issues.filter(x => {
+              return x.requestId;
+          })[0];
+
+          // close dialog and tell calling component to navigate
+      }
+
+}

src/Ombi/ClientApp/src/app/issues/components/index.ts

@@ -3,15 +3,13 @@ import { IssuesListComponent } from "./issues-list/issues-list.component";
 import { Routes } from "@angular/router";
 import { IssuesV2Service } from "../../services/issuesv2.service";
 import { IdentityService, SearchService } from "../../services";
+import { DetailsGroupComponent } from "./details-group/details-group.component";
 
 
 
 export const components: any[] = [
     IssuesListComponent,
-];
-
-
-export const entryComponents: any[] = [
+    DetailsGroupComponent,
 ];
 
 export const providers: any[] = [

src/Ombi/ClientApp/src/app/issues/issueDetails.component.html

@@ -84,7 +84,7 @@
         <div class="col-md-12">
             <div *ngIf="isAdmin && settings">
                 <div *ngIf="issue.status === IssueStatus.Pending && settings.enableInProgress">
-                    <button class="btn btn-primary btn-sm bottom-btn" (click)="inProgress()" [translate]="'Issues.MarkInProgress'"></button>
+                    <button class="btn btn-primary btn-sm bottom-btn" (click)="inProgress()">{{'Issues.MarkInProgress' | translate }}</button>
                 </div>
                 <div *ngIf="issue.status === IssueStatus.Pending && !settings.enableInProgress || issue.status == IssueStatus.InProgress">
                     <button class="btn btn-primary btn-sm bottom-btn" (click)="resolve()" [translate]="'Issues.MarkResolved'"></button>

src/Ombi/ClientApp/src/app/issues/issues.component.html

@@ -1,25 +1,19 @@
 <div class="small-middle-container">
-    <mat-tab-group>
-        <mat-tab label="{{'Issues.PendingTitle' | translate}}">
-            <ng-template matTabContent>
-                <div *ngIf="pendingIssues">
+    <div class="row" *ngIf="count">
+
+            <div *ngIf="pendingIssues.length  > 0" class="col-4">
+                <h2>{{'Issues.PendingTitle' | translate}}</h2>
                 <issues-table [issues]="pendingIssues" (changePage)="changePagePending($event)" [totalRecords]="count.pending"></issues-table>
             </div>
-            </ng-template>
-        </mat-tab>
-        <mat-tab *ngIf="inProgressIssues.length > 0" label="{{'Issues.InProgressTitle' | translate}}">
-            <ng-template matTabContent>
-                <div *ngIf="inProgressIssues">
+
+            <div *ngIf="inProgressIssues.length  > 0" class="col-4">
+                <h2>{{'Issues.InProgressTitle' | translate}}</h2>
                 <issues-table [issues]="inProgressIssues" (changePage)="changePageInProg($event)" [totalRecords]="count.inProgress"></issues-table>
             </div>
-            </ng-template>
-        </mat-tab>
-        <mat-tab label="{{'Issues.ResolvedTitle' | translate}}">
-            <ng-template matTabContent>
-                <div *ngIf="resolvedIssues">
+
+            <div *ngIf="resolvedIssues.length  > 0" class="col-4">
+                <h2>{{'Issues.ResolvedTitle' | translate}}</h2>
                 <issues-table [issues]="resolvedIssues" (changePage)="changePageResolved($event)" [totalRecords]="count.resolved"></issues-table>
             </div>
-            </ng-template>
-        </mat-tab>
-    </mat-tab-group>
+    </div>
 </div>

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

@@ -3,8 +3,6 @@ import { RouterModule, Routes } from "@angular/router";
 
 import { OrderModule } from "ngx-order-pipe";
 
-import { IdentityService, SearchService } from "../services";
-
 import { AuthGuard } from "../auth/auth.guard";
 
 import { SharedModule as OmbiShared } from "../shared/shared.module";
@@ -27,7 +25,7 @@ const routes: Routes = [
         RouterModule.forChild(routes),
         OrderModule,
         PipeModule,
-        OmbiShared,
+        OmbiShared
     ],
     declarations: [
         IssuesComponent,

src/Ombi/ClientApp/src/app/issues/issuestable.component.ts

@@ -1,6 +1,8 @@
 import { Component, EventEmitter, Input, Output } from "@angular/core";
+import { MatDialog } from "@angular/material/dialog";
 
 import { IIssues, IIssuesSummary, IPagenator, IssueStatus } from "../interfaces";
+import { DetailsGroupComponent, IssuesDetailsGroupData } from "./components/details-group/details-group.component";
 
 @Component({
     selector: "issues-table",
@@ -8,6 +10,8 @@ import { IIssues, IIssuesSummary, IPagenator, IssueStatus } from "../interfaces"
 })
 export class IssuesTableComponent  {
 
+    constructor(public dialog: MatDialog) { }
+
     @Input() public issues: IIssuesSummary[];
     @Input() public totalRecords: number;
 
@@ -50,7 +54,10 @@ export class IssuesTableComponent  {
     }
 
     public openDetails(summary: IIssuesSummary) {
-        
+        const dialogRef = this.dialog.open(DetailsGroupComponent, {
+            width: "50vw",
+            data: <IssuesDetailsGroupData>{ issues: summary.issues, title: summary.title },
+          });
     }
 
 }

src/Ombi/Controllers/V1/IssuesController.cs

@@ -142,7 +142,7 @@ namespace Ombi.Controllers.V1
             var notificationModel = new NotificationOptions
             {
                 RequestId = i.RequestId ?? 0,
-                DateTime = DateTime.Now,
+                DateTime = DateTime.UtcNow,
                 NotificationType = NotificationType.Issue,
                 RequestType = i.RequestType,
                 Recipient = string.Empty,

src/Ombi/Controllers/V2/IssuesController.cs

@@ -18,7 +18,7 @@ namespace Ombi.Controllers.V2
         [HttpGet("{position}/{take}/{status}")]
         public Task<IEnumerable<IssuesSummaryModel>> GetIssuesSummary(int position, int take, IssueStatus status)
         {
-            return _engine.GetIssues(position, take, status);
+            return _engine.GetIssues(position, take, status, HttpContext.RequestAborted);
         }
     }
 }