From 4f8bc40f5bb80681075a373109ad97b3da53328c Mon Sep 17 00:00:00 2001
From: Ludwig <luixlive@gmail.com>
Date: Fri, 17 Jan 2025 16:01:47 -0600
Subject: [PATCH 1/3] ERA-11121: Fix report datetime styling issue

---
 src/ReportManager/DetailsSection/styles.module.scss | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/ReportManager/DetailsSection/styles.module.scss b/src/ReportManager/DetailsSection/styles.module.scss
index f1ce463c0..269f325f1 100644
--- a/src/ReportManager/DetailsSection/styles.module.scss
+++ b/src/ReportManager/DetailsSection/styles.module.scss
@@ -113,12 +113,14 @@
   }
 
   &.datePickerLabel {
-    width: unset;
+    flex: 5;
+    width: 0;
   }
 
   &.timePickerLabel {
-    margin-left: 0.5rem;
-    width: unset;
+    margin-left: 0.25rem;
+    flex: 4;
+    width: 0;
   }
 
   [class*=locationSelectionLabel] {

From 12efb7c76ed1cd8d1ff9c53d7403d8d33561231c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20L=C3=B3pez?=
 <gabodev@Gabriels-MacBook-Pro-2.local>
Date: Mon, 20 Jan 2025 15:34:28 -0600
Subject: [PATCH 2/3] Fixing unit tests for parallelPaginatedRequest function

---
 src/utils/parallelPaginatedRequest.test.js | 27 ++++++++++------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/utils/parallelPaginatedRequest.test.js b/src/utils/parallelPaginatedRequest.test.js
index dca1f66c4..831d7a15d 100644
--- a/src/utils/parallelPaginatedRequest.test.js
+++ b/src/utils/parallelPaginatedRequest.test.js
@@ -1,5 +1,5 @@
 import { setupServer } from 'msw/node';
-import { rest } from 'msw';
+import { http, HttpResponse } from 'msw';
 
 import parallelPaginatedRequest from './parallelPaginatedRequest';
 import { EVENTS_API_URL } from '../ducks/events';
@@ -14,14 +14,14 @@ const calculateMockResponseResults = (itemsPerPage) => {
 };
 
 const server = setupServer(
-  rest.get(EVENTS_API_URL, (req, res, ctx) => {
-    return res(ctx.json( {
+  http.get(EVENTS_API_URL, () => {
+    return HttpResponse.json({
       status: 200,
       data: {
         results: calculateMockResponseResults(150),
         count: 200,
       }
-    }));
+    });
   }),
 );
 
@@ -57,16 +57,14 @@ describe('parallelPaginatedRequest', () => {
     const results = calculateMockResponseResults(300);
 
     server.use(
-      rest.get(EVENTS_API_URL, (req, res, ctx) => {
-        return res(
-          ctx.json( {
-            status: 200,
-            data: {
-              results,
-              count: 1200,
-            }
-          })
-        );
+      http.get(EVENTS_API_URL, () => {
+        return HttpResponse.json({
+          status: 200,
+          data: {
+            results,
+            count: 1200,
+          }
+        });
       })
     );
 
@@ -87,7 +85,6 @@ describe('parallelPaginatedRequest', () => {
     try {
       await parallelPaginatedRequest(`${EVENTS_API_URL}/notAPage?`);
     } catch (e){
-      console.log(e.message);
       expect(e.message).toBe('Failed to fetch the first page. Aborting.');
     }
   });

From 6f1f49b96a52fb7addf01bd78a7431041b994226 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20L=C3=B3pez?=
 <gabodev@Gabriels-MacBook-Pro-2.local>
Date: Thu, 23 Jan 2025 10:53:54 -0600
Subject: [PATCH 3/3] Removing timouts from parallel request

---
 src/utils/parallelPaginatedRequest.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/utils/parallelPaginatedRequest.js b/src/utils/parallelPaginatedRequest.js
index f89a30801..188f9f914 100644
--- a/src/utils/parallelPaginatedRequest.js
+++ b/src/utils/parallelPaginatedRequest.js
@@ -10,7 +10,6 @@ async function fetchPage(apiUrl, requestConfig, page, pageSize, maxRetries) {
     try {
       const response = await axios.get(`${apiUrl}&page=${page}&page_size=${pageSize}`, {
         ...requestConfig,
-        timeout: 7500
       });
 
       if (response.status !== 200) {