From 5876c14e53495f8dbb4702c432bb6b69984663d9 Mon Sep 17 00:00:00 2001
From: Dan Labrecque <dlabrecq@redhat.com>
Date: Sat, 5 Oct 2024 15:12:19 -0400
Subject: [PATCH] Fix pagination "per page" toggle

https://issues.redhat.com/browse/COST-5563
---
 src/routes/details/awsDetails/awsDetails.tsx     | 6 ++----
 src/routes/details/azureDetails/azureDetails.tsx | 6 ++----
 src/routes/details/gcpDetails/gcpDetails.tsx     | 6 ++----
 src/routes/details/ibmDetails/ibmDetails.tsx     | 6 ++----
 src/routes/details/ociDetails/ociDetails.tsx     | 6 ++----
 src/routes/details/ocpDetails/ocpDetails.tsx     | 6 ++----
 src/routes/details/rhelDetails/rhelDetails.tsx   | 6 ++----
 7 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/src/routes/details/awsDetails/awsDetails.tsx b/src/routes/details/awsDetails/awsDetails.tsx
index e7f4fcd19..6a31c734e 100644
--- a/src/routes/details/awsDetails/awsDetails.tsx
+++ b/src/routes/details/awsDetails/awsDetails.tsx
@@ -485,11 +485,9 @@ const mapStateToProps = createMapStateToProps<AwsDetailsOwnProps, AwsDetailsStat
   const query: any = {
     ...baseQuery,
     ...queryFromRoute,
-    filter: {
-      ...queryFromRoute.filter,
-      time_scope_value: timeScopeValue,
-    },
   };
+  query.filter.time_scope_value = timeScopeValue; // Add time scope here for breakdown pages
+
   const reportQuery = {
     cost_type: costType,
     currency,
diff --git a/src/routes/details/azureDetails/azureDetails.tsx b/src/routes/details/azureDetails/azureDetails.tsx
index c3d598cd6..2d2f0ca4f 100644
--- a/src/routes/details/azureDetails/azureDetails.tsx
+++ b/src/routes/details/azureDetails/azureDetails.tsx
@@ -439,11 +439,9 @@ const mapStateToProps = createMapStateToProps<AzureDetailsOwnProps, AzureDetails
   const query: any = {
     ...baseQuery,
     ...queryFromRoute,
-    filter: {
-      ...queryFromRoute.filter,
-      time_scope_value: timeScopeValue,
-    },
   };
+  query.filter.time_scope_value = timeScopeValue; // Add time scope here for breakdown pages
+
   const reportQuery = {
     currency,
     delta: 'cost',
diff --git a/src/routes/details/gcpDetails/gcpDetails.tsx b/src/routes/details/gcpDetails/gcpDetails.tsx
index 1d3ad34a4..6de79c0f7 100644
--- a/src/routes/details/gcpDetails/gcpDetails.tsx
+++ b/src/routes/details/gcpDetails/gcpDetails.tsx
@@ -440,11 +440,9 @@ const mapStateToProps = createMapStateToProps<GcpDetailsOwnProps, GcpDetailsStat
   const query: any = {
     ...baseQuery,
     ...queryFromRoute,
-    filter: {
-      ...queryFromRoute.filter,
-      time_scope_value: timeScopeValue,
-    },
   };
+  query.filter.time_scope_value = timeScopeValue; // Add time scope here for breakdown pages
+
   const reportQuery = {
     currency,
     delta: 'cost',
diff --git a/src/routes/details/ibmDetails/ibmDetails.tsx b/src/routes/details/ibmDetails/ibmDetails.tsx
index c7ad8fc26..c7e1e31e4 100644
--- a/src/routes/details/ibmDetails/ibmDetails.tsx
+++ b/src/routes/details/ibmDetails/ibmDetails.tsx
@@ -442,11 +442,9 @@ const mapStateToProps = createMapStateToProps<IbmDetailsOwnProps, IbmDetailsStat
   const query: any = {
     ...baseQuery,
     ...queryFromRoute,
-    filter: {
-      ...queryFromRoute.filter,
-      time_scope_value: timeScopeValue,
-    },
   };
+  query.filter.time_scope_value = timeScopeValue; // Add time scope here for breakdown pages
+
   const reportQuery = {
     currency,
     delta: 'cost',
diff --git a/src/routes/details/ociDetails/ociDetails.tsx b/src/routes/details/ociDetails/ociDetails.tsx
index 5e1027978..f7c8476fa 100644
--- a/src/routes/details/ociDetails/ociDetails.tsx
+++ b/src/routes/details/ociDetails/ociDetails.tsx
@@ -441,11 +441,9 @@ const mapStateToProps = createMapStateToProps<OciDetailsOwnProps, OciDetailsStat
   const query: any = {
     ...baseQuery,
     ...queryFromRoute,
-    filter: {
-      ...queryFromRoute.filter,
-      time_scope_value: timeScopeValue,
-    },
   };
+  query.filter.time_scope_value = timeScopeValue; // Add time scope here for breakdown pages
+
   const reportQuery = {
     currency,
     delta: 'cost',
diff --git a/src/routes/details/ocpDetails/ocpDetails.tsx b/src/routes/details/ocpDetails/ocpDetails.tsx
index 91c5cd048..91d6bdcad 100644
--- a/src/routes/details/ocpDetails/ocpDetails.tsx
+++ b/src/routes/details/ocpDetails/ocpDetails.tsx
@@ -525,11 +525,9 @@ const mapStateToProps = createMapStateToProps<OcpDetailsOwnProps, OcpDetailsStat
       },
     }),
     ...queryFromRoute,
-    filter: {
-      ...queryFromRoute.filter,
-      time_scope_value: timeScopeValue,
-    },
   };
+  query.filter.time_scope_value = timeScopeValue; // Add time scope here for breakdown pages
+
   const reportQuery = {
     category: query.category,
     currency,
diff --git a/src/routes/details/rhelDetails/rhelDetails.tsx b/src/routes/details/rhelDetails/rhelDetails.tsx
index 98ad4ed78..e0bad5801 100644
--- a/src/routes/details/rhelDetails/rhelDetails.tsx
+++ b/src/routes/details/rhelDetails/rhelDetails.tsx
@@ -495,11 +495,9 @@ const mapStateToProps = createMapStateToProps<RhelDetailsOwnProps, RhelDetailsSt
   const query: any = {
     ...baseQuery,
     ...queryFromRoute,
-    filter: {
-      ...queryFromRoute.filter,
-      time_scope_value: timeScopeValue,
-    },
   };
+  query.filter.time_scope_value = timeScopeValue; // Add time scope here for breakdown pages
+
   const reportQuery = {
     currency,
     delta: 'cost',