From c0189dad478ea375beda61ba3bee3f029a39b8e5 Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Wed, 16 Feb 2022 16:30:42 +0000
Subject: [PATCH] fix(requests): :bug: Fixed the approve 4k option on the
 requests list not working as expected

---
 .../ClientApp/src/app/interfaces/IRequestModel.ts    |  1 +
 .../components/movies-grid/movies-grid.component.ts  | 12 +++++++++++-
 .../options/request-options.component.html           |  4 ++--
 .../components/options/request-options.component.ts  |  2 ++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/Ombi/ClientApp/src/app/interfaces/IRequestModel.ts b/src/Ombi/ClientApp/src/app/interfaces/IRequestModel.ts
index 1ccbd355b..130a97c1c 100644
--- a/src/Ombi/ClientApp/src/app/interfaces/IRequestModel.ts
+++ b/src/Ombi/ClientApp/src/app/interfaces/IRequestModel.ts
@@ -22,6 +22,7 @@ export interface IMovieRequests extends IFullBaseRequest {
   denied4K: boolean;
   deniedReason4K: string;
   requestedDate4k: Date;
+  requestedDate: Date;
 
   // For the UI
   rootPathOverrideTitle: string;
diff --git a/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.ts b/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.ts
index b3283bb73..984994016 100644
--- a/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.ts
+++ b/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.ts
@@ -142,10 +142,20 @@ export class MoviesGridComponent implements OnInit, AfterViewInit {
             this.ref.detectChanges();
         };
 
-        const data = { request: request, filter: filter, onChange: onChange, manageOwnRequests: this.manageOwnRequests, isAdmin: this.isAdmin, has4kRequest: request.has4KRequest };
+        const data = { request: request, filter: filter, onChange: onChange, manageOwnRequests: this.manageOwnRequests, isAdmin: this.isAdmin, has4kRequest: request.has4KRequest, hasRegularRequest: this.checkDate(request.requestedDate) };
         this.onOpenOptions.emit(data);
     }
 
+    private checkDate(date: Date|string): boolean {
+        if (date instanceof String) {
+          return new Date(date).getFullYear() > 1;
+        }
+        if (date instanceof Date) {
+          return date.getFullYear() > 1;
+        }
+        return false;
+      }
+
     public switchFilter(type: RequestFilterType) {
         this.currentFilter = type;
         this.ngAfterViewInit();
diff --git a/src/Ombi/ClientApp/src/app/requests-list/components/options/request-options.component.html b/src/Ombi/ClientApp/src/app/requests-list/components/options/request-options.component.html
index b584cc0c5..72c0cdce3 100644
--- a/src/Ombi/ClientApp/src/app/requests-list/components/options/request-options.component.html
+++ b/src/Ombi/ClientApp/src/app/requests-list/components/options/request-options.component.html
@@ -2,10 +2,10 @@
   <a id="requestDelete" *ngIf="data.isAdmin || data.manageOwnRequests" (click)="delete()" mat-list-item>
     <span mat-line>{{'Requests.RequestPanel.Delete' | translate}}</span>
   </a>
-  <a id="requestApprove" *ngIf="data.canApprove && data.isAdmin" (click)="approve()" mat-list-item>
+  <a id="requestApprove" *ngIf="data.canApprove && data.hasRegularRequest && data.isAdmin" (click)="approve()" mat-list-item>
     <span mat-line>{{'Requests.RequestPanel.Approve' | translate}}</span>
   </a>
-  <a id="requestApprove4k" *ngIf="data.canApprove && data.isAdmin && data.has4kRequest" (click)="approve4k()" mat-list-item>
+  <a id="requestApprove4k" *ngIf="data.canApprove && data.isAdmin && data.has4kRequest ?? false" (click)="approve4K()" mat-list-item>
     <span mat-line>{{'Requests.RequestPanel.Approve4K' | translate}}</span>
   </a>
   <a id="requestChangeAvailability" *ngIf="data.type !== RequestType.tvShow && data.isAdmin" (click)="changeAvailability()" mat-list-item>
diff --git a/src/Ombi/ClientApp/src/app/requests-list/components/options/request-options.component.ts b/src/Ombi/ClientApp/src/app/requests-list/components/options/request-options.component.ts
index a37680bc2..673f978e7 100644
--- a/src/Ombi/ClientApp/src/app/requests-list/components/options/request-options.component.ts
+++ b/src/Ombi/ClientApp/src/app/requests-list/components/options/request-options.component.ts
@@ -63,6 +63,8 @@ export class RequestOptionsComponent {
     }
 
     await firstValueFrom(this.requestService.approveMovie({id: this.data.id, is4K: true}));
+    this.bottomSheetRef.dismiss({type: UpdateType.Approve});
+    return;
   }
 
   public async changeAvailability() {