cleanup fireRequests and remove axios

package.json

@@ -62,7 +62,6 @@
     "@sentry/browser": "^7.57.0",
     "@storybook/builder-vite": "^7.0.26",
     "@yaireo/ui-range": "^2.1.15",
-    "axios": "^1.4.0",
     "browser-image-compression": "^2.0.2",
     "cross-env": "^7.0.3",
     "date-fns": "^2.30.0",

src/App.tsx

@@ -11,7 +11,6 @@ import { IConfig } from "./Common/hooks/useConfig";
 import { LocalStorageKeys } from "./Common/constants";
 import Plausible from "./Components/Common/Plausible";
 import SessionRouter from "./Router/SessionRouter";
-import axios from "axios";
 import loadable from "@loadable/component";
 
 const Loading = loadable(() => import("./Components/Common/Loading"));
@@ -40,23 +39,21 @@ const App: React.FC = () => {
 
   const updateRefreshToken = () => {
     const refresh = localStorage.getItem(LocalStorageKeys.refreshToken);
-    // const access = localStorage.getItem(LocalStorageKeys.accessToken);
-    // if (!access && refresh) {
-    //   localStorage.removeItem(LocalStorageKeys.refreshToken);
-    //   document.location.reload();
-    //   return;
-    // }
-    if (!refresh) {
-      return;
-    }
-    axios
-      .post("/api/v1/auth/token/refresh/", {
-        refresh,
+    if (refresh) {
+      fetch("/api/v1/auth/token/refresh/", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Accept: "application/json",
+        },
+        body: JSON.stringify({ refresh }),
       })
-      .then((resp) => {
-        localStorage.setItem(LocalStorageKeys.accessToken, resp.data.access);
-        localStorage.setItem(LocalStorageKeys.refreshToken, resp.data.refresh);
-      });
+        .then((res) => res.json())
+        .then((resp) => {
+          localStorage.setItem(LocalStorageKeys.accessToken, resp.access);
+          localStorage.setItem(LocalStorageKeys.refreshToken, resp.refresh);
+        });
+    }
   };
   useEffect(() => {
     updateRefreshToken();

src/Common/hooks/useMSEplayer.ts

@@ -1,5 +1,4 @@
 import { useEffect, useRef } from "react";
-import axios from "axios";
 
 export interface IAsset {
   middlewareHostname: string;
@@ -59,10 +58,14 @@ const stopStream =
   (payload: { id: string }, options: IOptions) => {
     const { id } = payload;
     ws?.close();
-    axios
-      .post(`https://${middlewareHostname}/stop`, {
-        id,
-      })
+    fetch(`https://${middlewareHostname}/stop`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Accept: "application/json",
+      },
+      body: JSON.stringify({ id }),
+    })
       .then((res) => options?.onSuccess && options.onSuccess(res))
       .catch((err) => options.onError && options.onError(err));
   };

src/Components/Assets/AssetType/ONVIFCamera.tsx

@@ -8,7 +8,6 @@ import {
 } from "../../../Redux/actions";
 import * as Notification from "../../../Utils/Notifications.js";
 import { BedModel } from "../../Facility/models";
-import axios from "axios";
 import { getCameraConfig } from "../../../Utils/transformUtils";
 import CameraConfigure from "../configure/CameraConfigure";
 import Loading from "../../Common/Loading";
@@ -110,13 +109,15 @@ const ONVIFCamera = (props: ONVIFCameraProps) => {
     };
     try {
       setLoadingAddPreset(true);
-      const presetData = await axios.get(
-        `https://${facilityMiddlewareHostname}/status?hostname=${config.hostname}&port=${config.port}&username=${config.username}&password=${config.password}`
-      );
+      const preset = await fetch(
+        `https://${facilityMiddlewareHostname}/preset?hostname=${config.hostname}\
+        &port=${config.port}&username=${config.username}&password=${config.password}\
+        &preset_name=${newPreset}`
+      ).then((res) => res.json());
       const res: any = await Promise.resolve(
         dispatch(
           createAssetBed(
-            { meta: { ...data, ...presetData.data } },
+            { meta: { ...data, ...preset.data } },
             assetId,
             bed?.id as string
           )

src/Components/CriticalCareRecording/CriticalCare__API.tsx

@@ -1,12 +1,12 @@
-import { fireRequestV2 } from "../../Redux/fireRequest";
+import { legacyFireRequest } from "../../Redux/fireRequest";
 
 export const loadDailyRound = (
   consultationId: string,
   id: string,
   successCB: any = () => null,
   errorCB: any = () => null
 ) => {
-  fireRequestV2("getDailyReport", [], {}, successCB, errorCB, {
+  legacyFireRequest("getDailyReport", [], {}, successCB, errorCB, {
     consultationId,
     id,
   });
@@ -19,7 +19,7 @@ export const updateDailyRound = (
   successCB: any = () => null,
   errorCB: any = () => null
 ) => {
-  fireRequestV2("updateDailyRound", [], params, successCB, errorCB, {
+  legacyFireRequest("updateDailyRound", [], params, successCB, errorCB, {
     consultationId,
     id,
   });

src/Components/Facility/Consultations/LiveFeed.tsx

@@ -14,7 +14,6 @@ import {
 import { useFeedPTZ } from "../../../Common/hooks/useFeedPTZ";
 import * as Notification from "../../../Utils/Notifications.js";
 import { FeedCameraPTZHelpButton } from "./Feed";
-import { AxiosError } from "axios";
 import { BedSelect } from "../../Common/BedSelect";
 import { BedModel } from "../models";
 import useWindowDimensions from "../../../Common/hooks/useWindowDimensions";
@@ -93,10 +92,9 @@ const LiveFeed = (props: any) => {
         setPresets(resp);
       },
       onError: (resp) => {
-        resp instanceof AxiosError &&
-          Notification.Error({
-            msg: "Camera is offline",
-          });
+        Notification.Error({
+          msg: "Camera is offline",
+        });
       },
     });
 

src/Components/Facility/CoverImageEditModal.tsx

@@ -1,4 +1,3 @@
-import axios from "axios";
 import {
   ChangeEventHandler,
   useCallback,
@@ -110,17 +109,18 @@ const CoverImageEditModal = ({
 
     setIsUploading(true);
     try {
-      const response = await axios.post(
+      const response = await fetch(
         `/api/v1/facility/${facility.id}/cover_image/`,
-        formData,
         {
+          method: "POST",
           headers: {
             "Content-Type": "multipart/form-data",
             Authorization:
               "Bearer " + localStorage.getItem(LocalStorageKeys.accessToken),
           },
+          body: formData,
         }
-      );
+      )
       if (response.status === 200) {
         Success({ msg: "Cover image updated." });
         window.location.reload();

src/Components/Patient/FileUpload.tsx

@@ -1,4 +1,3 @@
-import axios from "axios";
 import CircularProgress from "../Common/components/CircularProgress";
 import loadable from "@loadable/component";
 import React, { useCallback, useState, useEffect, useRef } from "react";
@@ -32,6 +31,7 @@ import { NonReadOnlyUsers } from "../../Utils/AuthorizeFor";
 import AuthorizedChild from "../../CAREUI/misc/AuthorizedChild";
 import Page from "../Common/components/Page";
 import FilePreviewDialog from "../Common/FilePreviewDialog";
+import { uploadFile } from "../../Redux/fireRequest";
 
 const Loading = loadable(() => import("../Common/Loading"));
 
@@ -928,24 +928,10 @@ export const FileUpload = (props: FileUploadProps) => {
     if (!f) return;
     const newFile = new File([f], `${internal_name}`);
 
-    const config = {
-      headers: {
-        "Content-type": contentType,
-        "Content-disposition": "inline",
-      },
-      onUploadProgress: (progressEvent: any) => {
-        const percentCompleted = Math.round(
-          (progressEvent.loaded * 100) / progressEvent.total
-        );
-        setUploadPercent(percentCompleted);
-      },
-    };
     return new Promise<void>((resolve, reject) => {
-      axios
-        .put(url, newFile, config)
+      uploadFile(url, newFile, contentType, setUploadPercent)
         .then(() => {
           setUploadStarted(false);
-          // setUploadSuccess(true);
           setFile(null);
           setUploadFileName("");
           setReload(!reload);
@@ -1049,8 +1035,7 @@ export const FileUpload = (props: FileUploadProps) => {
       },
     };
 
-    axios
-      .put(url, newFile, config)
+    uploadFile(url, newFile, "audio/mpeg", setUploadPercent)
       .then(() => {
         setAudioUploadStarted(false);
         // setUploadSuccess(true);

src/Components/Patient/UpdateStatusDialog.tsx

@@ -1,5 +1,4 @@
 import React, { useEffect, useState, useReducer } from "react";
-import axios from "axios";
 import {
   SAMPLE_TEST_STATUS,
   SAMPLE_TEST_RESULT,
@@ -9,7 +8,7 @@ import { SampleTestModel } from "./models";
 import * as Notification from "../../Utils/Notifications.js";
 import { createUpload, editUpload } from "../../Redux/actions";
 import { useDispatch } from "react-redux";
-import { header_content_type, LinearProgressWithLabel } from "./FileUpload";
+import { FileUpload, header_content_type, LinearProgressWithLabel } from "./FileUpload";
 import { Submit } from "../Common/components/ButtonV2";
 import CareIcon from "../../CAREUI/icons/CareIcon";
 import ConfirmDialog from "../Common/ConfirmDialog";
@@ -18,6 +17,7 @@ import { FieldChangeEvent } from "../Form/FormFields/Utils";
 import TextFormField from "../Form/FormFields/TextFormField";
 import CheckBoxFormField from "../Form/FormFields/CheckBoxFormField";
 import { useTranslation } from "react-i18next";
+import { uploadFile } from "../../Redux/fireRequest";
 
 interface Props {
   sample: SampleTestModel;
@@ -105,38 +105,23 @@ const UpdateStatusDialog = (props: Props) => {
     if (f === undefined) return;
     const newFile = new File([f], `${internal_name}`);
 
-    const config = {
-      headers: {
-        "Content-type": contentType,
-        "Content-disposition": "inline",
-      },
-      onUploadProgress: (progressEvent: any) => {
-        const percentCompleted = Math.round(
-          (progressEvent.loaded * 100) / progressEvent.total
-        );
-        setUploadPercent(percentCompleted);
-      },
-    };
-    axios
-      .put(url, newFile, config)
-      .then(() => {
-        setUploadStarted(false);
-        setUploadDone(true);
-        redux_dispatch(
-          editUpload(
-            { upload_completed: true },
-            response.data.id,
-            "SAMPLE_MANAGEMENT",
-            sample.id?.toString() ?? ""
-          )
-        );
-        Notification.Success({
-          msg: "File Uploaded Successfully",
-        });
-      })
-      .catch(() => {
-        setUploadStarted(false);
+    uploadFile(url, newFile, contentType, setUploadPercent).then(() => {
+      setUploadStarted(false);
+      setUploadDone(true);
+      redux_dispatch(
+        editUpload(
+          { upload_completed: true },
+          response.data.id,
+          "SAMPLE_MANAGEMENT",
+          sample.id?.toString() ?? ""
+        )
+      );
+      Notification.Success({
+        msg: "File Uploaded Successfully",
       });
+    }).catch(() => {
+      setUploadStarted(false);
+    });
   };
 
   const onFileChange = (e: React.ChangeEvent<HTMLInputElement>): any => {