diff --git a/packages/datagateway-common/package.json b/packages/datagateway-common/package.json index 052fcc2ca..453640c0a 100644 --- a/packages/datagateway-common/package.json +++ b/packages/datagateway-common/package.json @@ -12,7 +12,7 @@ "@emotion/styled": "11.11.0", "@mui/x-date-pickers": "6.11.2", "@types/lodash.debounce": "4.0.6", - "axios": "0.27.2", + "axios": "1.6.0", "connected-react-router": "6.9.1", "date-fns": "2.30.0", "hex-to-rgba": "2.0.1", @@ -102,6 +102,9 @@ ] }, "jest": { + "transformIgnorePatterns": [ + "node_modules/(?!axios)" + ], "collectCoverageFrom": [ "src/**/*.{tsx,ts,js,jsx}", "!src/index.tsx", diff --git a/packages/datagateway-common/src/api/datafiles.tsx b/packages/datagateway-common/src/api/datafiles.tsx index 6c6e93f5f..4c5f694af 100644 --- a/packages/datagateway-common/src/api/datafiles.tsx +++ b/packages/datagateway-common/src/api/datafiles.tsx @@ -1,4 +1,4 @@ -import axios, { AxiosError } from 'axios'; +import axios, { AxiosError, AxiosProgressEvent } from 'axios'; import { getApiParams, parseSearchToQuery } from '.'; import { readSciGatewayToken } from '../parseTokens'; import { useSelector } from 'react-redux'; @@ -262,7 +262,7 @@ const downloadDatafileToMemory = ({ }: { idsUrl: string; datafileId: Datafile['id']; - onDownloadProgress?: (progressEvent: ProgressEvent) => void; + onDownloadProgress?: (progressEvent: AxiosProgressEvent) => void; }): Promise => axios .get(`${idsUrl}/getData`, { @@ -289,7 +289,7 @@ export const useDatafileContent = ({ ...queryOptions }: { datafileId: Datafile['id']; - onDownloadProgress: (progressEvent: ProgressEvent) => void; + onDownloadProgress: (progressEvent: AxiosProgressEvent) => void; } & UseQueryOptions< Blob, AxiosError, diff --git a/packages/datagateway-common/src/api/lucene.test.tsx b/packages/datagateway-common/src/api/lucene.test.tsx index 9d40a1e0c..855c11216 100644 --- a/packages/datagateway-common/src/api/lucene.test.tsx +++ b/packages/datagateway-common/src/api/lucene.test.tsx @@ -38,9 +38,9 @@ describe('Lucene actions', () => { const params = { sessionId: null, - query: { + query: JSON.stringify({ target: 'Investigation', - }, + }), maxCount: 300, }; expect(axios.get).toHaveBeenCalledWith( @@ -79,12 +79,12 @@ describe('Lucene actions', () => { const params = { sessionId: null, - query: { + query: JSON.stringify({ target: 'Datafile', - text: 'test', lower: '200001010000', upper: '202012312359', - }, + text: 'test', + }), maxCount: 100, }; expect(axios.get).toHaveBeenCalledWith( @@ -123,12 +123,12 @@ describe('Lucene actions', () => { const params = { sessionId: null, - query: { + query: JSON.stringify({ target: 'Datafile', - text: 'test', lower: '200001010000', upper: '9000012312359', - }, + text: 'test', + }), maxCount: 100, }; expect(axios.get).toHaveBeenCalledWith( @@ -158,8 +158,13 @@ describe('Lucene actions', () => { await endDateTest.waitFor(() => endDateTest.result.current.isSuccess); + params.query = JSON.parse(params.query); + params.query.upper = '202012312359'; params.query.lower = '0000001010000'; + + params.query = JSON.stringify(params.query); + expect(axios.get).toHaveBeenCalledWith( 'https://example.com/icat/lucene/data', { diff --git a/packages/datagateway-common/src/api/lucene.tsx b/packages/datagateway-common/src/api/lucene.tsx index baabb5abc..3f5d29d38 100644 --- a/packages/datagateway-common/src/api/lucene.tsx +++ b/packages/datagateway-common/src/api/lucene.tsx @@ -70,7 +70,7 @@ export const fetchLuceneData = async ( // Query params. const queryParams = { sessionId: readSciGatewayToken().sessionId, - query: urlParamsBuilder(datasearchType, params), + query: JSON.stringify(urlParamsBuilder(datasearchType, params)), // Default maximum count is 300. maxCount: params.maxCount ? params.maxCount : 300, }; diff --git a/packages/datagateway-common/src/setupTests.tsx b/packages/datagateway-common/src/setupTests.tsx index 8a92f8061..27978c8c0 100644 --- a/packages/datagateway-common/src/setupTests.tsx +++ b/packages/datagateway-common/src/setupTests.tsx @@ -13,7 +13,7 @@ import thunk from 'redux-thunk'; import configureStore from 'redux-mock-store'; import { createMemoryHistory, History } from 'history'; -jest.setTimeout(15000); +jest.setTimeout(20000); if (typeof window.URL.createObjectURL === 'undefined') { // required as work-around for enzyme/jest environment not implementing window.URL.createObjectURL method diff --git a/packages/datagateway-dataview/package.json b/packages/datagateway-dataview/package.json index 11048b505..66569483c 100644 --- a/packages/datagateway-dataview/package.json +++ b/packages/datagateway-dataview/package.json @@ -19,7 +19,7 @@ "@types/react-router-dom": "5.3.3", "@types/react-virtualized": "9.21.10", "@types/redux-logger": "3.0.8", - "axios": "0.27.2", + "axios": "1.6.0", "connected-react-router": "6.9.1", "custom-event-polyfill": "1.0.7", "datagateway-common": "^1.1.2", @@ -83,6 +83,9 @@ ] }, "jest": { + "transformIgnorePatterns": [ + "node_modules/(?!axios)" + ], "collectCoverageFrom": [ "src/**/*.{tsx,ts,js,jsx}", "!src/index.tsx", diff --git a/packages/datagateway-dataview/src/page/idCheckFunctions.test.ts b/packages/datagateway-dataview/src/page/idCheckFunctions.test.ts index 5e32e114e..0fc679871 100644 --- a/packages/datagateway-dataview/src/page/idCheckFunctions.test.ts +++ b/packages/datagateway-dataview/src/page/idCheckFunctions.test.ts @@ -37,7 +37,7 @@ describe('ID check functions', () => { await checkInvestigationId(1, 2); expect(axios.get).toHaveBeenCalledWith('/datasets/findone', { params: { - where: { id: { eq: 2 } }, + where: JSON.stringify({ id: { eq: 2 } }), include: '"investigation"', }, headers: { Authorization: 'Bearer null' }, @@ -52,7 +52,7 @@ describe('ID check functions', () => { await checkInvestigationId(1, 2); expect(axios.get).toHaveBeenCalledWith('/test/datasets/findone', { params: { - where: { id: { eq: 2 } }, + where: JSON.stringify({ id: { eq: 2 } }), include: '"investigation"', }, headers: { Authorization: 'Bearer null' }, @@ -78,7 +78,7 @@ describe('ID check functions', () => { expect(result).toBe(true); expect(axios.get).toHaveBeenCalledWith('/datasets/findone', { params: { - where: { id: { eq: 2 } }, + where: JSON.stringify({ id: { eq: 2 } }), include: '"investigation"', }, headers: { Authorization: 'Bearer null' }, @@ -166,13 +166,13 @@ describe('ID check functions', () => { expect(result).toBe(true); expect(axios.get).toHaveBeenCalledWith('/investigations', { params: { - where: { + where: JSON.stringify({ id: { eq: 3 }, investigationInstrument: { instrument: { id: { eq: 1 } } }, investigationFacilityCycle: { facilityCycle: { id: { eq: 2 } }, }, - }, + }), }, headers: { Authorization: 'Bearer null' }, }); diff --git a/packages/datagateway-dataview/src/page/idCheckFunctions.ts b/packages/datagateway-dataview/src/page/idCheckFunctions.ts index 57d2c7a83..264780530 100644 --- a/packages/datagateway-dataview/src/page/idCheckFunctions.ts +++ b/packages/datagateway-dataview/src/page/idCheckFunctions.ts @@ -30,11 +30,11 @@ const unmemoizedCheckInvestigationId = ( return axios .get(`${apiUrl}/datasets/findone`, { params: { - where: { + where: JSON.stringify({ id: { eq: datasetId, }, - }, + }), include: '"investigation"', }, headers: { @@ -68,7 +68,7 @@ const unmemoizedCheckInstrumentAndFacilityCycleId = ( return axios .get(`${apiUrl}/investigations`, { params: { - where: { + where: JSON.stringify({ id: { eq: investigationId, }, @@ -76,7 +76,7 @@ const unmemoizedCheckInstrumentAndFacilityCycleId = ( investigationFacilityCycle: { facilityCycle: { id: { eq: facilityCycleId } }, }, - }, + }), }, headers: { Authorization: `Bearer ${readSciGatewayToken().sessionId}`, diff --git a/packages/datagateway-dataview/src/setupTests.ts b/packages/datagateway-dataview/src/setupTests.ts index ef0657630..314b188ae 100644 --- a/packages/datagateway-dataview/src/setupTests.ts +++ b/packages/datagateway-dataview/src/setupTests.ts @@ -9,7 +9,7 @@ import { initialState as dgDataViewInitialState } from './state/reducers/dgdatav import { dGCommonInitialState } from 'datagateway-common'; import { screen, within } from '@testing-library/react'; -jest.setTimeout(15000); +jest.setTimeout(20000); function noOp(): void { // required as work-around for enzyme/jest environment not implementing window.URL.createObjectURL method diff --git a/packages/datagateway-dataview/src/views/datafilePreview/datafilePreviewer.component.tsx b/packages/datagateway-dataview/src/views/datafilePreview/datafilePreviewer.component.tsx index faf955d52..70bb3ad8e 100644 --- a/packages/datagateway-dataview/src/views/datafilePreview/datafilePreviewer.component.tsx +++ b/packages/datagateway-dataview/src/views/datafilePreview/datafilePreviewer.component.tsx @@ -129,7 +129,7 @@ function DatafilePreviewer({ onDownloadProgress: (event) => { setStatus({ code: 'LOADING_CONTENT', - progress: (event.loaded / event.total) * 100, + progress: (event.loaded / (event.total ?? event.loaded)) * 100, }); }, }); diff --git a/packages/datagateway-download/package.json b/packages/datagateway-download/package.json index 1316a0248..2c05ae334 100644 --- a/packages/datagateway-download/package.json +++ b/packages/datagateway-download/package.json @@ -16,7 +16,7 @@ "@types/react-dom": "17.0.11", "@types/react-router-dom": "5.3.3", "@types/react-virtualized": "9.21.10", - "axios": "0.27.2", + "axios": "1.6.0", "datagateway-common": "^1.1.2", "date-fns": "2.30.0", "date-fns-tz": "2.0.0", @@ -103,6 +103,9 @@ ] }, "jest": { + "transformIgnorePatterns": [ + "node_modules/(?!axios)" + ], "snapshotSerializers": [ "enzyme-to-json/serializer" ], diff --git a/packages/datagateway-download/src/downloadApi.ts b/packages/datagateway-download/src/downloadApi.ts index 0da76c37b..bdbb4be80 100644 --- a/packages/datagateway-download/src/downloadApi.ts +++ b/packages/datagateway-download/src/downloadApi.ts @@ -336,11 +336,11 @@ export const getDatafileCount: ( return axios .get(`${settings.apiUrl}/datafiles/count`, { params: { - where: { + where: JSON.stringify({ 'dataset.investigation.id': { eq: entityId, }, - }, + }), }, headers: { Authorization: `Bearer ${readSciGatewayToken().sessionId}`, diff --git a/packages/datagateway-download/src/downloadApiHooks.test.tsx b/packages/datagateway-download/src/downloadApiHooks.test.tsx index 0b3ebfac0..bdcf03484 100644 --- a/packages/datagateway-download/src/downloadApiHooks.test.tsx +++ b/packages/datagateway-download/src/downloadApiHooks.test.tsx @@ -492,11 +492,11 @@ describe('Download Cart API react-query hooks test', () => { `${mockedSettings.apiUrl}/datafiles/count`, { params: { - where: { + where: JSON.stringify({ 'dataset.investigation.id': { eq: 2, }, - }, + }), }, headers: { Authorization: 'Bearer null', diff --git a/packages/datagateway-download/src/setupTests.ts b/packages/datagateway-download/src/setupTests.ts index 47066dac6..379d1619c 100644 --- a/packages/datagateway-download/src/setupTests.ts +++ b/packages/datagateway-download/src/setupTests.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-empty-function */ import '@testing-library/jest-dom'; -jest.setTimeout(15000); +jest.setTimeout(20000); function noOp(): void { // required as work-around for enzyme/jest environment not implementing window.URL.createObjectURL method diff --git a/packages/datagateway-search/package.json b/packages/datagateway-search/package.json index 41a31dfca..50103c29f 100644 --- a/packages/datagateway-search/package.json +++ b/packages/datagateway-search/package.json @@ -20,7 +20,7 @@ "@types/react-router-dom": "5.3.3", "@types/react-virtualized": "9.21.10", "@types/redux-logger": "3.0.8", - "axios": "0.27.2", + "axios": "1.6.0", "connected-react-router": "6.9.1", "custom-event-polyfill": "1.0.7", "datagateway-common": "^1.1.2", @@ -83,6 +83,9 @@ ] }, "jest": { + "transformIgnorePatterns": [ + "node_modules/(?!axios)" + ], "snapshotSerializers": [ "enzyme-to-json/serializer" ], diff --git a/packages/datagateway-search/src/searchPageContainer.component.test.tsx b/packages/datagateway-search/src/searchPageContainer.component.test.tsx index 40f6b839f..2f98427a8 100644 --- a/packages/datagateway-search/src/searchPageContainer.component.test.tsx +++ b/packages/datagateway-search/src/searchPageContainer.component.test.tsx @@ -484,10 +484,10 @@ describe('SearchPageContainer - Tests', () => { { params: { maxCount: 300, - query: { + query: JSON.stringify({ target: 'Investigation', text: 'hello', - }, + }), sessionId: null, }, } @@ -498,10 +498,10 @@ describe('SearchPageContainer - Tests', () => { { params: { maxCount: 300, - query: { + query: JSON.stringify({ target: 'Dataset', text: 'hello', - }, + }), sessionId: null, }, } @@ -512,10 +512,10 @@ describe('SearchPageContainer - Tests', () => { { params: { maxCount: 300, - query: { + query: JSON.stringify({ target: 'Datafile', text: 'hello', - }, + }), sessionId: null, }, } diff --git a/packages/datagateway-search/src/setupTests.ts b/packages/datagateway-search/src/setupTests.ts index f39931b30..690ce993c 100644 --- a/packages/datagateway-search/src/setupTests.ts +++ b/packages/datagateway-search/src/setupTests.ts @@ -8,7 +8,7 @@ import { dGCommonInitialState } from 'datagateway-common'; import { initialState as dgSearchInitialState } from './state/reducers/dgsearch.reducer'; import { screen, within } from '@testing-library/react'; -jest.setTimeout(15000); +jest.setTimeout(20000); // Unofficial React 17 Enzyme adapter Enzyme.configure({ adapter: new Adapter() }); diff --git a/yarn.lock b/yarn.lock index fbc5cee99..f78b44f65 100644 --- a/yarn.lock +++ b/yarn.lock @@ -42,16 +42,7 @@ __metadata: languageName: node linkType: hard -"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.0, @babel/code-frame@npm:^7.18.6, @babel/code-frame@npm:^7.8.3": - version: 7.18.6 - resolution: "@babel/code-frame@npm:7.18.6" - dependencies: - "@babel/highlight": ^7.18.6 - checksum: 195e2be3172d7684bf95cff69ae3b7a15a9841ea9d27d3c843662d50cdd7d6470fd9c8e64be84d031117e4a4083486effba39f9aef6bbb2c89f7f21bcfba33ba - languageName: node - linkType: hard - -"@babel/code-frame@npm:^7.22.13": +"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.0, @babel/code-frame@npm:^7.18.6, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.8.3": version: 7.22.13 resolution: "@babel/code-frame@npm:7.22.13" dependencies: @@ -105,18 +96,7 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:^7.20.7, @babel/generator@npm:^7.7.2": - version: 7.20.14 - resolution: "@babel/generator@npm:7.20.14" - dependencies: - "@babel/types": ^7.20.7 - "@jridgewell/gen-mapping": ^0.3.2 - jsesc: ^2.5.1 - checksum: 5f6aa2d86af26e76d276923a5c34191124a119b16ee9ccc34aef654a7dec84fbd7d2daed2e6458a6a06bf87f3661deb77c9fea59b8f67faff5c90793c96d76d6 - languageName: node - linkType: hard - -"@babel/generator@npm:^7.23.0": +"@babel/generator@npm:^7.20.7, @babel/generator@npm:^7.23.0, @babel/generator@npm:^7.7.2": version: 7.23.0 resolution: "@babel/generator@npm:7.23.0" dependencies: @@ -208,14 +188,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-environment-visitor@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/helper-environment-visitor@npm:7.18.9" - checksum: b25101f6162ddca2d12da73942c08ad203d7668e06663df685634a8fde54a98bc015f6f62938e8554457a592a024108d45b8f3e651fd6dcdb877275b73cc4420 - languageName: node - linkType: hard - -"@babel/helper-environment-visitor@npm:^7.22.20": +"@babel/helper-environment-visitor@npm:^7.18.9, @babel/helper-environment-visitor@npm:^7.22.20": version: 7.22.20 resolution: "@babel/helper-environment-visitor@npm:7.22.20" checksum: d80ee98ff66f41e233f36ca1921774c37e88a803b2f7dca3db7c057a5fea0473804db9fb6729e5dbfd07f4bed722d60f7852035c2c739382e84c335661590b69 @@ -231,17 +204,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-function-name@npm:^7.18.9, @babel/helper-function-name@npm:^7.19.0": - version: 7.19.0 - resolution: "@babel/helper-function-name@npm:7.19.0" - dependencies: - "@babel/template": ^7.18.10 - "@babel/types": ^7.19.0 - checksum: eac1f5db428ba546270c2b8d750c24eb528b8fcfe50c81de2e0bdebf0e20f24bec688d4331533b782e4a907fad435244621ca2193cfcf80a86731299840e0f6e - languageName: node - linkType: hard - -"@babel/helper-function-name@npm:^7.23.0": +"@babel/helper-function-name@npm:^7.18.9, @babel/helper-function-name@npm:^7.19.0, @babel/helper-function-name@npm:^7.23.0": version: 7.23.0 resolution: "@babel/helper-function-name@npm:7.23.0" dependencies: @@ -251,16 +214,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-hoist-variables@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helper-hoist-variables@npm:7.18.6" - dependencies: - "@babel/types": ^7.18.6 - checksum: fd9c35bb435fda802bf9ff7b6f2df06308a21277c6dec2120a35b09f9de68f68a33972e2c15505c1a1a04b36ec64c9ace97d4a9e26d6097b76b4396b7c5fa20f - languageName: node - linkType: hard - -"@babel/helper-hoist-variables@npm:^7.22.5": +"@babel/helper-hoist-variables@npm:^7.18.6, @babel/helper-hoist-variables@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-hoist-variables@npm:7.22.5" dependencies: @@ -365,16 +319,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-split-export-declaration@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helper-split-export-declaration@npm:7.18.6" - dependencies: - "@babel/types": ^7.18.6 - checksum: c6d3dede53878f6be1d869e03e9ffbbb36f4897c7cc1527dc96c56d127d834ffe4520a6f7e467f5b6f3c2843ea0e81a7819d66ae02f707f6ac057f3d57943a2b - languageName: node - linkType: hard - -"@babel/helper-split-export-declaration@npm:^7.22.6": +"@babel/helper-split-export-declaration@npm:^7.18.6, @babel/helper-split-export-declaration@npm:^7.22.6": version: 7.22.6 resolution: "@babel/helper-split-export-declaration@npm:7.22.6" dependencies: @@ -383,13 +328,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-string-parser@npm:^7.19.4": - version: 7.19.4 - resolution: "@babel/helper-string-parser@npm:7.19.4" - checksum: b2f8a3920b30dfac81ec282ac4ad9598ea170648f8254b10f475abe6d944808fb006aab325d3eb5a8ad3bea8dfa888cfa6ef471050dae5748497c110ec060943 - languageName: node - linkType: hard - "@babel/helper-string-parser@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-string-parser@npm:7.22.5" @@ -397,14 +335,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-validator-identifier@npm:^7.18.6, @babel/helper-validator-identifier@npm:^7.19.1": - version: 7.19.1 - resolution: "@babel/helper-validator-identifier@npm:7.19.1" - checksum: 0eca5e86a729162af569b46c6c41a63e18b43dbe09fda1d2a3c8924f7d617116af39cac5e4cd5d431bb760b4dca3c0970e0c444789b1db42bcf1fa41fbad0a3a - languageName: node - linkType: hard - -"@babel/helper-validator-identifier@npm:^7.22.20": +"@babel/helper-validator-identifier@npm:^7.19.1, @babel/helper-validator-identifier@npm:^7.22.20": version: 7.22.20 resolution: "@babel/helper-validator-identifier@npm:7.22.20" checksum: 136412784d9428266bcdd4d91c32bcf9ff0e8d25534a9d94b044f77fe76bc50f941a90319b05aafd1ec04f7d127cd57a179a3716009ff7f3412ef835ada95bdc @@ -441,17 +372,6 @@ __metadata: languageName: node linkType: hard -"@babel/highlight@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/highlight@npm:7.18.6" - dependencies: - "@babel/helper-validator-identifier": ^7.18.6 - chalk: ^2.0.0 - js-tokens: ^4.0.0 - checksum: 92d8ee61549de5ff5120e945e774728e5ccd57fd3b2ed6eace020ec744823d4a98e242be1453d21764a30a14769ecd62170fba28539b211799bbaf232bbb2789 - languageName: node - linkType: hard - "@babel/highlight@npm:^7.22.13": version: 7.22.20 resolution: "@babel/highlight@npm:7.22.20" @@ -463,16 +383,7 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7": - version: 7.20.13 - resolution: "@babel/parser@npm:7.20.13" - bin: - parser: ./bin/babel-parser.js - checksum: 7eb2e3d9d9ad5e24b087c88d137f5701d94f049e28b9dce9f3f5c6d4d9b06a0d7c43b9106f1c02df8a204226200e0517de4bc81a339768a4ebd4c59107ea93a4 - languageName: node - linkType: hard - -"@babel/parser@npm:^7.22.15, @babel/parser@npm:^7.23.0": +"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.23.0": version: 7.23.0 resolution: "@babel/parser@npm:7.23.0" bin: @@ -1558,18 +1469,7 @@ __metadata: languageName: node linkType: hard -"@babel/template@npm:^7.18.10, @babel/template@npm:^7.20.7, @babel/template@npm:^7.3.3": - version: 7.20.7 - resolution: "@babel/template@npm:7.20.7" - dependencies: - "@babel/code-frame": ^7.18.6 - "@babel/parser": ^7.20.7 - "@babel/types": ^7.20.7 - checksum: 2eb1a0ab8d415078776bceb3473d07ab746e6bb4c2f6ca46ee70efb284d75c4a32bb0cd6f4f4946dec9711f9c0780e8e5d64b743208deac6f8e9858afadc349e - languageName: node - linkType: hard - -"@babel/template@npm:^7.22.15": +"@babel/template@npm:^7.18.10, @babel/template@npm:^7.20.7, @babel/template@npm:^7.22.15, @babel/template@npm:^7.3.3": version: 7.22.15 resolution: "@babel/template@npm:7.22.15" dependencies: @@ -1598,18 +1498,7 @@ __metadata: languageName: node linkType: hard -"@babel/types@npm:^7.0.0, @babel/types@npm:^7.12.6, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.19.0, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.2, @babel/types@npm:^7.20.5, @babel/types@npm:^7.20.7, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": - version: 7.20.7 - resolution: "@babel/types@npm:7.20.7" - dependencies: - "@babel/helper-string-parser": ^7.19.4 - "@babel/helper-validator-identifier": ^7.19.1 - to-fast-properties: ^2.0.0 - checksum: b39af241f0b72bba67fd6d0d23914f6faec8c0eba8015c181cbd5ea92e59fc91a52a1ab490d3520c7dbd19ddb9ebb76c476308f6388764f16d8201e37fae6811 - languageName: node - linkType: hard - -"@babel/types@npm:^7.22.15, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0": +"@babel/types@npm:^7.0.0, @babel/types@npm:^7.12.6, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.2, @babel/types@npm:^7.20.5, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": version: 7.23.0 resolution: "@babel/types@npm:7.23.0" dependencies: @@ -2452,14 +2341,7 @@ __metadata: languageName: node linkType: hard -"@jridgewell/resolve-uri@npm:3.1.0, @jridgewell/resolve-uri@npm:^3.0.3": - version: 3.1.0 - resolution: "@jridgewell/resolve-uri@npm:3.1.0" - checksum: b5ceaaf9a110fcb2780d1d8f8d4a0bfd216702f31c988d8042e5f8fbe353c55d9b0f55a1733afdc64806f8e79c485d2464680ac48a0d9fcadb9548ee6b81d267 - languageName: node - linkType: hard - -"@jridgewell/resolve-uri@npm:^3.1.0": +"@jridgewell/resolve-uri@npm:^3.0.3, @jridgewell/resolve-uri@npm:^3.1.0": version: 3.1.1 resolution: "@jridgewell/resolve-uri@npm:3.1.1" checksum: f5b441fe7900eab4f9155b3b93f9800a916257f4e8563afbcd3b5a5337b55e52bd8ae6735453b1b745457d9f6cdb16d74cd6220bbdd98cf153239e13f6cbb653 @@ -2483,14 +2365,7 @@ __metadata: languageName: node linkType: hard -"@jridgewell/sourcemap-codec@npm:1.4.14, @jridgewell/sourcemap-codec@npm:^1.4.10": - version: 1.4.14 - resolution: "@jridgewell/sourcemap-codec@npm:1.4.14" - checksum: 61100637b6d173d3ba786a5dff019e1a74b1f394f323c1fee337ff390239f053b87266c7a948777f4b1ee68c01a8ad0ab61e5ff4abb5a012a0b091bec391ab97 - languageName: node - linkType: hard - -"@jridgewell/sourcemap-codec@npm:^1.4.14": +"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14": version: 1.4.15 resolution: "@jridgewell/sourcemap-codec@npm:1.4.15" checksum: b881c7e503db3fc7f3c1f35a1dd2655a188cc51a3612d76efc8a6eb74728bef5606e6758ee77423e564092b4a518aba569bbb21c9bac5ab7a35b0c6ae7e344c8 @@ -2507,17 +2382,7 @@ __metadata: languageName: node linkType: hard -"@jridgewell/trace-mapping@npm:^0.3.14, @jridgewell/trace-mapping@npm:^0.3.9": - version: 0.3.17 - resolution: "@jridgewell/trace-mapping@npm:0.3.17" - dependencies: - "@jridgewell/resolve-uri": 3.1.0 - "@jridgewell/sourcemap-codec": 1.4.14 - checksum: 9d703b859cff5cd83b7308fd457a431387db5db96bd781a63bf48e183418dd9d3d44e76b9e4ae13237f6abeeb25d739ec9215c1d5bfdd08f66f750a50074a339 - languageName: node - linkType: hard - -"@jridgewell/trace-mapping@npm:^0.3.17": +"@jridgewell/trace-mapping@npm:^0.3.14, @jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.9": version: 0.3.20 resolution: "@jridgewell/trace-mapping@npm:0.3.20" dependencies: @@ -4883,7 +4748,18 @@ __metadata: languageName: node linkType: hard -"axios@npm:0.27.2, axios@npm:^0.27.2": +"axios@npm:1.6.0": + version: 1.6.0 + resolution: "axios@npm:1.6.0" + dependencies: + follow-redirects: ^1.15.0 + form-data: ^4.0.0 + proxy-from-env: ^1.1.0 + checksum: c7c9f2ae9e0b9bad7d6f9a4dff030930b12ee667dedf54c3c776714f91681feb743c509ac0796ae5c01e12c4ab4a2bee74905068dd200fbc1ab86f9814578fb0 + languageName: node + linkType: hard + +"axios@npm:^0.27.2": version: 0.27.2 resolution: "axios@npm:0.27.2" dependencies: @@ -5510,7 +5386,7 @@ __metadata: languageName: node linkType: hard -"chalk@npm:^2.0.0, chalk@npm:^2.3.0, chalk@npm:^2.4.1, chalk@npm:^2.4.2": +"chalk@npm:^2.3.0, chalk@npm:^2.4.1, chalk@npm:^2.4.2": version: 2.4.2 resolution: "chalk@npm:2.4.2" dependencies: @@ -6572,7 +6448,7 @@ __metadata: "@types/react-virtualized": 9.21.10 "@typescript-eslint/eslint-plugin": 5.61.0 "@typescript-eslint/parser": 5.61.0 - axios: 0.27.2 + axios: 1.6.0 connected-react-router: 6.9.1 date-fns: 2.30.0 eslint: 8.44.0 @@ -6643,7 +6519,7 @@ __metadata: "@typescript-eslint/eslint-plugin": 5.61.0 "@typescript-eslint/parser": 5.61.0 "@welldone-software/why-did-you-render": 7.0.1 - axios: 0.27.2 + axios: 1.6.0 blob-polyfill: 7.0.20220408 connected-react-router: 6.9.1 cross-env: 7.0.3 @@ -6714,7 +6590,7 @@ __metadata: "@types/react-virtualized": 9.21.10 "@typescript-eslint/eslint-plugin": 5.61.0 "@typescript-eslint/parser": 5.61.0 - axios: 0.27.2 + axios: 1.6.0 cross-env: 7.0.3 cypress: 11.2.0 cypress-failed-log: 2.10.0 @@ -6783,7 +6659,7 @@ __metadata: "@typescript-eslint/eslint-plugin": 5.61.0 "@typescript-eslint/parser": 5.61.0 "@wojtekmaj/enzyme-adapter-react-17": 0.6.6 - axios: 0.27.2 + axios: 1.6.0 connected-react-router: 6.9.1 cross-env: 7.0.3 custom-event-polyfill: 1.0.7 @@ -8589,13 +8465,13 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.9": - version: 1.15.2 - resolution: "follow-redirects@npm:1.15.2" +"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.0": + version: 1.15.3 + resolution: "follow-redirects@npm:1.15.3" peerDependenciesMeta: debug: optional: true - checksum: faa66059b66358ba65c234c2f2a37fcec029dc22775f35d9ad6abac56003268baf41e55f9ee645957b32c7d9f62baf1f0b906e68267276f54ec4b4c597c2b190 + checksum: 584da22ec5420c837bd096559ebfb8fe69d82512d5585004e36a3b4a6ef6d5905780e0c74508c7b72f907d1fa2b7bd339e613859e9c304d0dc96af2027fd0231 languageName: node linkType: hard @@ -13531,6 +13407,13 @@ __metadata: languageName: node linkType: hard +"proxy-from-env@npm:^1.1.0": + version: 1.1.0 + resolution: "proxy-from-env@npm:1.1.0" + checksum: ed7fcc2ba0a33404958e34d95d18638249a68c430e30fcb6c478497d72739ba64ce9810a24f53a7d921d0c065e5b78e3822759800698167256b04659366ca4d4 + languageName: node + linkType: hard + "ps-tree@npm:1.2.0": version: 1.2.0 resolution: "ps-tree@npm:1.2.0"