Merge branch 'develop' of https://github.com/ombi-app/Ombi into develop

.azuredevops/pipelines/publish-job.yml

@@ -98,3 +98,21 @@ stages:
         isPreRelease: true
         changeLogCompareToRelease: 'lastNonDraftRelease'
         changeLogType: 'commitBased'
+
+    - task: PowerShell@2
+      displayName: "Trigger APT build"
+      inputs:
+        targetType: 'inline'
+        script: |
+          $body = @{
+            "ref"="main"
+            "inputs"= @{"version"= "$(gitTag)"}
+          } | ConvertTo-Json
+
+          $header = @{
+            "Accept"="application/vnd.github.v3+json"
+            "Authorization"="Bearer $(APTPAT)"
+            "User-Agent"="Ombi"
+          } 
+
+          Invoke-RestMethod -Uri "https://api.github.com/repos/Ombi-app/Ombi.Apt/actions/workflows/build-deb.yml/dispatches" -Method 'Post' -Body $body -Headers $header

src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.scss

@@ -256,6 +256,7 @@ a.poster-overlay:hover{
 ::ng-deep .ombi-card .button-request-container .button-request{
   padding-right:0px;
   padding-left:0px;
+  width:100%;
 }
 
 .c:hover .button-request-container {

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

@@ -4,6 +4,8 @@ import { IssuesService } from "../services";
 
 import { IIssueCount, IIssues, IPagenator, IssueStatus } from "../interfaces";
 
+import { PageEvent } from '@angular/material/paginator';
+
 @Component({
     templateUrl: "issues.component.html",
     styleUrls: ['issues.component.scss']
@@ -16,7 +18,7 @@ export class IssuesComponent implements OnInit {
 
     public count: IIssueCount;
 
-    private takeAmount = 10;
+    private takeAmount = 50;
     private pendingSkip = 0;
     private inProgressSkip = 0;
     private resolvedSkip = 0;
@@ -30,18 +32,18 @@ export class IssuesComponent implements OnInit {
         this.issueService.getIssuesCount().subscribe(x => this.count = x);
     }
 
-    public changePagePending(event: IPagenator) {
-        this.pendingSkip = event.first;
+    public changePagePending(event: PageEvent) {
+        this.pendingSkip = event.pageSize * event.pageIndex++;
         this.getPending();
     }
 
-    public changePageInProg(event: IPagenator) {
-        this.inProgressSkip = event.first;
+    public changePageInProg(event: PageEvent) {
+        this.inProgressSkip = event.pageSize * event.pageIndex++;
         this.getInProg();
     }
 
-    public changePageResolved(event: IPagenator) {
-        this.resolvedSkip = event.first;
+    public changePageResolved(event: PageEvent) {
+        this.resolvedSkip = event.pageSize * event.pageIndex++;
         this.getResolved();
     }
 

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

@@ -26,94 +26,17 @@
         <td mat-cell *matCellDef="let element"> {{element.userReported.userAlias}} </td>
     </ng-container>
 
-    <!-- <ng-container matColumnDef="requestedUser.requestedBy">
-        <th mat-header-cell *matHeaderCellDef> {{'Requests.RequestedBy' | translate}} </th>
-        <td mat-cell *matCellDef="let element"> {{element.requestedUser?.userAlias}} </td>
-    </ng-container>
-
-
-    <ng-container matColumnDef="requestedDate">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header disableClear> {{ 'Requests.RequestDate' | translate}} </th>
-        <td mat-cell *matCellDef="let element"> {{element.requestedDate | amLocal | amDateFormat: 'LL'}} </td>
-    </ng-container>
-
-    <ng-container matColumnDef="status">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header disableClear> {{ 'Requests.Status' | translate}} </th>
-        <td mat-cell *matCellDef="let element"> {{element.status}} </td>
-    </ng-container>
-
-
-    <ng-container matColumnDef="requestStatus">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header disableClear> {{ 'Requests.RequestStatus' | translate}} </th>
-        <td mat-cell *matCellDef="let element"> {{element.requestStatus | translate}} </td>
-    </ng-container>-->
-
     <ng-container matColumnDef="actions">
         <th mat-header-cell *matHeaderCellDef> </th>
         <td mat-cell *matCellDef="let element">
             <button *ngIf="element.requestType === 1" mat-raised-button color="accent" [routerLink]="'/details/movie/' + element.providerId">{{ 'Issues.Details' | translate}}</button>
             <button *ngIf="element.requestType === 0" mat-raised-button color="accent" [routerLink]="'/details/tv/' + element.providerId">{{ 'Issues.Details' | translate}}</button>
             <button *ngIf="element.requestType === 2" mat-raised-button color="accent" [routerLink]="'/details/artist/request/' + element.providerId">{{ 'Issues.Details' | translate}}</button>
-            <!-- <button mat-raised-button color="warn" (click)="openOptions(element)" *ngIf="isAdmin"> {{ 'Requests.Options' | translate}}</button> -->
-        </td>
+         </td>
     </ng-container>
 
     <tr mat-header-row *matHeaderRowDef="displayedColumns; sticky: true"></tr>
     <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
 </table>
 
-<!-- <table class="table table-striped table-hover table-responsive table-condensed">
-        <thead>
-            <tr>
-                <th (click)="setOrder('title', $event)">
-                    <a [translate]="'Issues.ColumnTitle'"></a>
-                    <span *ngIf="order === 'title'">
-                        <span [hidden]="reverse"><i class="fa fa-arrow-down" aria-hidden="true"></i></span><span [hidden]="!reverse"><i class="fa fa-arrow-up" aria-hidden="true"></i></span>
-                    </span>
-                </th>
-                <th (click)="setOrder('issueCategory.value', $event)">
-                    <a [translate]="'Issues.Category'"></a>
-                    <span *ngIf="order === 'issueCategory.value'">
-                            <span [hidden]="reverse"><i class="fa fa-arrow-down" aria-hidden="true"></i></span><span [hidden]="!reverse"><i class="fa fa-arrow-up" aria-hidden="true"></i></span>
-                    </span>
-                </th>
-                <th (click)="setOrder('status', $event)">
-                    <a [translate]="'Issues.Status'"></a>
-                    <span *ngIf="order === 'status'">
-                            <span [hidden]="reverse"><i class="fa fa-arrow-down" aria-hidden="true"></i></span><span [hidden]="!reverse"><i class="fa fa-arrow-up" aria-hidden="true"></i></span>
-                    </span>
-                </th>
-                <th (click)="setOrder('reportedUser', $event)">
-                    <a [translate]="'Issues.ReportedBy'"></a>
-                    <span *ngIf="order === 'reportedUser'">
-                            <span [hidden]="reverse"><i class="fa fa-arrow-down" aria-hidden="true"></i></span><span [hidden]="!reverse"><i class="fa fa-arrow-up" aria-hidden="true"></i></span>
-                    </span>
-                </th>
-                <th>
-                </th>
-            </tr>
-        </thead>
-        <tbody>
-            <tr *ngFor="let issue of issues | orderBy: order : reverse : 'case-insensitive'">
-                <td>
-                    {{issue.title}}
-                </td>
-                <td>
-                    {{issue.issueCategory.value}}
-                </td>
-                <td>
-                    {{IssueStatus[issue.status] | humanize}}
-                </td>
-                <td *ngIf="issue.userReported?.alias">
-                    {{issue.userReported.alias}}
-                </td>
-                <td *ngIf="!issue.userReported?.alias">
-                    {{issue.userReported.userName}}
-                </td>
-                <td>
-                        <a [routerLink]="['/issues/' + issue.id]" class="btn btn-sm btn-info-outline" [translate]="'Issues.Details'"></a>
-                </td>
-            </tr>
-        </tbody>
-    </table>
-    <p-paginator [rows]="rowCount" [totalRecords]="totalRecords" (onPageChange)="paginate($event)"></p-paginator> -->
+<mat-paginator (page)="paginate($event)" [length]="totalRecords"></mat-paginator>

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

@@ -14,7 +14,9 @@ export class IssuesTableComponent  {
     @Output() public changePage = new EventEmitter<IPagenator>();
 
     public displayedColumns = ["title", "category", "subject", "status", "reportedBy", "actions"]
-    public IssueStatus = IssueStatus;
+    public IssueStatus = IssueStatus; 
+    public resultsLength: number;
+    public gridCount: string = "15";
 
     public order: string = "id";
     public reverse = false;
@@ -44,11 +46,6 @@ export class IssuesTableComponent  {
       }
 
       public paginate(event: IPagenator) {
-        //event.first = Index of the first record (current index)
-        //event.rows = Number of rows to display in new page
-        //event.page = Index of the new page
-        //event.pageCount = Total number of pages
-
         this.changePage.emit(event);
     }
 

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

@@ -19,7 +19,7 @@ <H1 *ngIf="!customizationSettings.logo" class="login_logo">OMBI</H1>
                             {{'Login.UsernamePlaceholder' | translate}} is <strong>required</strong></mat-error>
                     </mat-form-field>
 
-                    <mat-form-field class="full-width" appearance="outline">
+                    <mat-form-field *ngIf="!authenticationSettings.allowNoPassword" class="full-width" appearance="outline">
                         <mat-label>{{'Login.PasswordPlaceholder' | translate}}</mat-label>
                         <input id="password-field" color="black" type="password" matInput formControlName="password" />
                     </mat-form-field>

src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html

@@ -22,6 +22,7 @@
             [isAdmin]="isAdmin"
             [canRequestOnBehalf]="!hasRequest && !movie.available"
             [canShowAdvanced]="showAdvanced && movieRequest"
+            [type]="requestType"
             (openTrailer)="openDialog()"
             (onRequestBehalf)="openRequestOnBehalf()"
             (onAdvancedOptions)="openAdvancedOptions()"
@@ -103,7 +104,7 @@
             <div class="row">
                 <div class="col-12 col-md-2">
                     <mat-card class="mat-elevation-z8">
-                        <mat-card-content class="medium-font">
+                        <mat-card-content>
                             <movie-information-panel [movie]="movie" [request]="movieRequest" [advancedOptions]="showAdvanced"></movie-information-panel>
                         </mat-card-content>
                     </mat-card>

src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.ts

@@ -27,6 +27,9 @@ export class MovieDetailsComponent {
     public advancedOptions: IAdvancedData;
     public showAdvanced: boolean; // Set on the UI
 
+    public requestType = RequestType.movie;
+
+
     private theMovidDbId: number;
     private imdbId: string;
 

src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html

@@ -1,21 +1,23 @@
-<div *ngIf="movie">
-    <span *ngIf="movie.voteAverage"
-        matTooltip="{{'MediaDetails.Votes' | translate }}  {{movie.voteCount | thousandShort: 1}}">
-        <img class="rating-small" src="{{baseUrl}}/images/tmdb-logo.svg"> {{movie.voteAverage | number:'1.0-1'}}/10
-    </span>
-    <span *ngIf="ratings?.critics_rating && ratings?.critics_score">
-        <img class="rating-small"
-            src="{{baseUrl}}/images/{{ratings.critics_rating === 'Rotten' ? 'rotten-rotten.svg' : 'rotten-fresh.svg'}}">
-        {{ratings.critics_score}}%
-    </span>
-    <span *ngIf="ratings?.audience_rating && ratings?.audience_score">
-        <img class="rating-small"
-            src="{{baseUrl}}/images/{{ratings.audience_rating === 'Upright' ? 'rotten-audience-fresh.svg' : 'rotten-audience-rotten.svg'}}">
-        {{ratings.audience_score}}%
-    </span>
-    <div *ngIf="streams?.length > 0">
+<div *ngIf="movie" class="left-panel-details">
+    <div class="rating medium-font">
+        <span *ngIf="movie.voteAverage"
+            matTooltip="{{'MediaDetails.Votes' | translate }}  {{movie.voteCount | thousandShort: 1}}">
+            <img class="rating-small" src="{{baseUrl}}/images/tmdb-logo.svg"> {{movie.voteAverage | number:'1.0-1'}}/10
+        </span>
+        <span *ngIf="ratings?.critics_rating && ratings?.critics_score">
+            <img class="rating-small"
+                src="{{baseUrl}}/images/{{ratings.critics_rating === 'Rotten' ? 'rotten-rotten.svg' : 'rotten-fresh.svg'}}">
+            {{ratings.critics_score}}%
+        </span>
+        <span *ngIf="ratings?.audience_rating && ratings?.audience_score">
+            <img class="rating-small"
+                src="{{baseUrl}}/images/{{ratings.audience_rating === 'Upright' ? 'rotten-audience-fresh.svg' : 'rotten-audience-rotten.svg'}}">
+            {{ratings.audience_score}}%
+        </span>
+    </div>
+    <div *ngIf="streams?.length > 0" class="streaming-on">
         <hr>
-        <strong>{{'MediaDetails.StreamingOn' | translate }}:</strong>
+        <span class="label">{{'MediaDetails.StreamingOn' | translate }}:</span>
         <div>
         <span *ngFor="let stream of streams">
             <img class="stream-small" [matTooltip]="stream.streamingProvider" src="https://image.tmdb.org/t/p/original{{stream.logo}}">
@@ -24,18 +26,16 @@
     </div>
     <hr>
     <div>
-        <strong>{{'MediaDetails.Status' | translate }}:</strong>
+        <span class="label">{{'MediaDetails.Status' | translate }}:</span>
         {{movie.status}}
     </div>
     <div>
-        <strong>{{'MediaDetails.Availability' | translate }}:</strong>
+        <span class="label">{{'MediaDetails.Availability' | translate }}:</span>
         <span *ngIf="movie.available"> {{'Common.Available' | translate}}</span>
         <span *ngIf="!movie.available"> {{'Common.NotAvailable' | translate}}</span>
-
     </div>
-
     <div *ngIf="!movie.available">
-        <strong>{{'MediaDetails.RequestStatus' | translate }}</strong>
+        <span class="label">{{'MediaDetails.RequestStatus' | translate }}</span>
         <div *ngIf="movie.approved && !movie.available">{{'Common.ProcessingRequest' | translate}}</div>
         <div *ngIf="movie.requested && !movie.approved && !movie.available">{{'Common.PendingApproval' | translate}}
         </div>
@@ -44,62 +44,62 @@
     </div>
 
     <div *ngIf="request">
-        <strong>{{'Requests.RequestedBy' | translate }}:</strong>
+        <span class="label">{{'Requests.RequestedBy' | translate }}:</span>
         {{request.requestedUser.userAlias}}
     </div>
 
     <div *ngIf="request">
-        <strong>{{'Requests.RequestDate' | translate }}:</strong>
+        <span class="label">{{'Requests.RequestDate' | translate }}:</span>
         {{request.requestedDate | date}}
     </div>
 
 
     <div *ngIf="movie.quality">
-        <strong>{{'MediaDetails.Quality' | translate }}:</strong>
+        <span class="label">{{'MediaDetails.Quality' | translate }}:</span>
         <div>{{movie.quality | quality}}</div>
     </div>
 
     <div *ngIf="advancedOptions && request && request.rootPathOverrideTitle">
-        <strong>{{'MediaDetails.RootFolderOverride' | translate }}</strong>
+        <span class="label">{{'MediaDetails.RootFolderOverride' | translate }}</span>
         <div>{{request.rootPathOverrideTitle}}</div>
     </div>
     <div *ngIf="advancedOptions && request && request.qualityOverrideTitle">
-        <strong>{{'MediaDetails.QualityOverride' | translate }}</strong>
+        <span class="label">{{'MediaDetails.QualityOverride' | translate }}</span>
         <div>{{request.qualityOverrideTitle}}</div>
     </div>
 
 
 
     <hr>
 
-    <strong>{{'MediaDetails.TheatricalRelease' | translate }}:</strong>
+    <span class="label">{{'MediaDetails.TheatricalRelease' | translate }}:</span>
     {{movie.releaseDate | date: 'mediumDate'}}
 
     <div *ngIf="movie.digitalReleaseDate">
-        <strong>{{'MediaDetails.DigitalRelease' | translate }}:</strong>
+        <span class="label">{{'MediaDetails.DigitalRelease' | translate }}:</span>
         {{movie.digitalReleaseDate | date: 'mediumDate'}}
     </div>
 
     <div *ngIf="movie.voteCount">
-        <strong>{{'MediaDetails.Votes' | translate }}:</strong>
+        <span class="label">{{'MediaDetails.Votes' | translate }}:</span>
         {{movie.voteCount | thousandShort: 1}}
     </div>
     <div>
-        <strong>{{'MediaDetails.Runtime' | translate }}:</strong>
+        <span class="label">{{'MediaDetails.Runtime' | translate }}:</span>
         {{'MediaDetails.Minutes' | translate:{runtime: movie.runtime} }}
     </div>
     <div *ngIf="movie.revenue">
-        <strong>{{'MediaDetails.Revenue' | translate }}:</strong>
+        <span class="label">{{'MediaDetails.Revenue' | translate }}:</span>
         {{movie.revenue | currency: 'USD'}}
     </div>
     <div *ngIf="movie.budget">
-        <strong>{{'MediaDetails.Budget' | translate }}:</strong>
+        <span class="label">{{'MediaDetails.Budget' | translate }}:</span>
         {{movie.budget | currency: 'USD'}}
     </div>
 
     <hr />
     <div class="genre-button-container" *ngIf="movie.genres">
-        <strong>{{'MediaDetails.Genres' | translate }}:</strong>
+        <span class="label">{{'MediaDetails.Genres' | translate }}:</span>
         <div>
             <mat-chip-list>
                 <mat-chip selected *ngFor="let genre of movie.genres">
@@ -111,7 +111,7 @@
 
     <hr />
     <div class="keyword-button-container" *ngIf="movie?.keywords?.keywordsValue?.length > 0">
-        <strong>{{'MediaDetails.Keywords' | translate }}:</strong>
+        <span class="label">{{'MediaDetails.Keywords' | translate }}:</span>
         <mat-chip-list>
             <mat-chip selected *ngFor="let keyword of movie.keywords.keywordsValue">
                 {{keyword.name}}

src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.html

@@ -35,7 +35,8 @@
         </button>
         <button mat-menu-item [disabled]="!canShowAdvanced" (click)="openAdvancedOptions()">
             <mat-icon>movie_filter</mat-icon>
-            <span>{{'MediaDetails.RadarrConfiguration' | translate}}</span>
+            <span *ngIf="type === RequestType.movie">{{'MediaDetails.RadarrConfiguration' | translate}}</span>
+            <span *ngIf="type === RequestType.tvShow">{{'MediaDetails.SonarrConfiguration' | translate}}</span>
         </button>
     </mat-menu>
 </div>