Merge pull request #4051 from dlabrecq/pagination

Fix pagination "per page" toggle
project-koku · Oct 5, 2024 · 9c8e8d0 · 9c8e8d0
2 parents be720d3 + 5876c14
commit 9c8e8d0
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 28 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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',