chore: Bump Axios (#2374)

theopensystemslab · Nov 3, 2023 · 115259b · 115259b
1 parent cde4cd5
commit 115259b
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/editor.planx.uk/package.json b/editor.planx.uk/package.json
@@ -39,7 +39,7 @@
     "@turf/buffer": "^6.5.0",
     "@turf/helpers": "^6.5.0",
     "array-move": "^4.0.0",
-    "axios": "0.27.2",
+    "axios": "^1.6.0",
     "bowser": "^2.11.0",
     "camelcase-keys": "^9.0.0",
     "classnames": "^2.3.2",

diff --git a/editor.planx.uk/pnpm-lock.yaml b/editor.planx.uk/pnpm-lock.yaml
diff --git a/editor.planx.uk/src/@planx/components/DrawBoundary/Public/index.tsx b/editor.planx.uk/src/@planx/components/DrawBoundary/Public/index.tsx
@@ -107,9 +107,9 @@ export default function Component(props: Props) {
             <MapContainer environment={environment} size="large">
               <p style={visuallyHidden}>
                 An interactive map centred on your address, with a red pointer
-                to draw your property boundary. Click to place points and connect the
-                lines to make your site. Once you've closed the site shape,
-                click and drag the lines to modify it.
+                to draw your property boundary. Click to place points and
+                connect the lines to make your site. Once you've closed the site
+                shape, click and drag the lines to modify it.
               </p>
               {!props.hideFileUpload && (
                 <p style={visuallyHidden}>

diff --git a/editor.planx.uk/src/@planx/components/Send/Public.test.tsx b/editor.planx.uk/src/@planx/components/Send/Public.test.tsx
@@ -1,12 +1,15 @@
-import * as axios from "axios";
+import Axios from "axios";
 import React from "react";
 import { axe, setup } from "testUtils";
 
 import hasuraEventsResponseMock from "./mocks/hasuraEventsResponseMock";
 import { Destination } from "./model";
 import SendComponent from "./Public";
 
-jest.spyOn(axios, "default").mockImplementation((url: any) => {
+jest.mock("axios");
+const mockAxios = Axios as jest.Mocked<typeof Axios>;
+
+mockAxios.post.mockImplementation((url: any) => {
   return {
     value: url()?.startsWith(
       `${process.env.REACT_APP_API_URL}/create-send-events/`,

diff --git a/editor.planx.uk/src/api/upload.ts b/editor.planx.uk/src/api/upload.ts
@@ -47,7 +47,7 @@ function handleUpload(
       "Content-Type": "multipart/form-data",
     },
     onUploadProgress: ({ loaded, total }) => {
-      if (onProgress) {
+      if (onProgress && total) {
         onProgress(loaded / total);
       }
     },