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] { 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) { 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.'); } });