Replace all window.location.reload() with data refetch.

src/Components/Assets/AssetImportModal.tsx

@@ -22,9 +22,10 @@ interface Props {
   open: boolean;
   onClose: (() => void) | undefined;
   facility: FacilityModel;
+  onUpdate?: (() => void) | undefined;
 }
 
-const AssetImportModal = ({ open, onClose, facility }: Props) => {
+const AssetImportModal = ({ open, onClose, facility, onUpdate }: Props) => {
   const [isImporting, setIsImporting] = useState(false);
   const [selectedFile, setSelectedFile] = useState<any>();
   const [preview, setPreview] =
@@ -170,7 +171,7 @@ const AssetImportModal = ({ open, onClose, facility }: Props) => {
       Notification.Success({ msg: "Assets imported successfully" });
       await sleep(1000);
       setIsImporting(false);
-      window.location.reload();
+      onUpdate && onUpdate();
     } else {
       Notification.Error({ msg: "Error importing some assets" });
       await sleep(1000);

src/Components/Assets/AssetsList.tsx

@@ -69,7 +69,7 @@ const AssetsList = () => {
       qParams.warranty_amc_end_of_validity_after || "",
   };
 
-  const { loading } = useQuery(routes.listAssets, {
+  const { refetch: assetsFetch, loading } = useQuery(routes.listAssets, {
     query: params,
     onResponse: ({ res, data }) => {
       if (res?.status === 200 && data) {
@@ -79,16 +79,19 @@ const AssetsList = () => {
     },
   });
 
-  const { data: facilityObject } = useQuery(routes.getAnyFacility, {
-    pathParams: { id: qParams.facility },
-    onResponse: ({ res, data }) => {
-      if (res?.status === 200 && data) {
-        setFacility(data);
-        setSelectedFacility(data);
-      }
-    },
-    prefetch: !!qParams.facility,
-  });
+  const { data: facilityObject, refetch: facilityFetch } = useQuery(
+    routes.getAnyFacility,
+    {
+      pathParams: { id: qParams.facility },
+      onResponse: ({ res, data }) => {
+        if (res?.status === 200 && data) {
+          setFacility(data);
+          setSelectedFacility(data);
+        }
+      },
+      prefetch: !!qParams.facility,
+    }
+  );
 
   useEffect(() => {
     setAssetType(qParams.asset_type);
@@ -102,13 +105,16 @@ const AssetsList = () => {
     setAssetClass(qParams.asset_class);
   }, [qParams.asset_class]);
 
-  const { data: locationObject } = useQuery(routes.getFacilityAssetLocation, {
-    pathParams: {
-      facility_external_id: String(qParams.facility),
-      external_id: String(qParams.location),
-    },
-    prefetch: !!(qParams.facility && qParams.location),
-  });
+  const { data: locationObject, refetch: locationFetch } = useQuery(
+    routes.getFacilityAssetLocation,
+    {
+      pathParams: {
+        facility_external_id: String(qParams.facility),
+        external_id: String(qParams.location),
+      },
+      prefetch: !!(qParams.facility && qParams.location),
+    }
+  );
 
   const getAssetIdFromQR = async (assetUrl: string) => {
     try {
@@ -128,6 +134,12 @@ const AssetsList = () => {
     }
   };
 
+  const handleUpdate = () => {
+    assetsFetch();
+    facilityFetch();
+    locationFetch();
+  };
+
   const checkValidAssetId = async (assetId: string) => {
     const { data: assetData } = await request(routes.getAsset, {
       pathParams: { id: assetId },
@@ -436,6 +448,7 @@ const AssetsList = () => {
               return f;
             });
           }}
+          onUpdate={handleUpdate}
           facility={facility}
         />
       )}

src/Components/Common/UpdatableApp.tsx

@@ -11,6 +11,7 @@ const APP_UPDATED_KEY = "app-updated";
 interface UpdatableAppProps {
   children: ReactNode;
   silentlyAutoUpdate?: boolean;
+  onUpdateLocalStorage?: (() => void) | undefined;
 }
 
 export const checkForUpdate = async () => {
@@ -46,7 +47,11 @@ export const checkForUpdate = async () => {
   }
 };
 
-const UpdatableApp = ({ children, silentlyAutoUpdate }: UpdatableAppProps) => {
+const UpdatableApp = ({
+  children,
+  silentlyAutoUpdate,
+  onUpdateLocalStorage,
+}: UpdatableAppProps) => {
   const [newVersion, setNewVersion] = useState<string>();
   const [appUpdated, setAppUpdated] = useState(false);
 
@@ -77,7 +82,7 @@ const UpdatableApp = ({ children, silentlyAutoUpdate }: UpdatableAppProps) => {
     // A second of delay to appreciate the update animation.
     const updateLocalStorageAndReload = () => {
       localStorage.setItem(APP_UPDATED_KEY, "true");
-      window.location.reload();
+      onUpdateLocalStorage && onUpdateLocalStorage();
       localStorage.setItem(APP_VERSION_KEY, newVersion);
     };
 

src/Components/Facility/CoverImageEditModal.tsx

@@ -123,7 +123,6 @@ const CoverImageEditModal = ({
       );
       if (response.status === 200) {
         Success({ msg: "Cover image updated." });
-        window.location.reload();
       } else {
         Notification.Error({
           msg: "Something went wrong!",
@@ -148,7 +147,6 @@ const CoverImageEditModal = ({
     const res = await dispatch(deleteFacilityCoverImage(facility.id as any));
     if (res.statusCode === 204) {
       Success({ msg: "Cover image deleted" });
-      window.location.reload();
     }
 
     onDelete && onDelete();

src/Components/Facility/DischargeModal.tsx

@@ -52,7 +52,6 @@ const DischargeModal = ({
   consultationData,
   afterSubmit = () => {
     onClose();
-    window.location.reload();
   },
   discharge_reason = "",
   discharge_notes = "",

src/Components/Facility/FacilityHome.tsx

@@ -54,19 +54,20 @@ export const FacilityHome = (props: any) => {
 
   useMessageListener((data) => console.log(data));
 
-  const { data: facilityData, loading: isLoading } = useQuery(
-    routes.getPermittedFacility,
-    {
-      pathParams: {
-        id: facilityId,
-      },
-      onResponse: ({ res }) => {
-        if (!res?.ok) {
-          navigate("/not-found");
-        }
-      },
-    }
-  );
+  const {
+    data: facilityData,
+    loading: isLoading,
+    refetch: facilityFetch,
+  } = useQuery(routes.getPermittedFacility, {
+    pathParams: {
+      id: facilityId,
+    },
+    onResponse: ({ res }) => {
+      if (!res?.ok) {
+        navigate("/not-found");
+      }
+    },
+  });
 
   const handleDeleteClose = () => {
     setOpenDeleteDialog(false);
@@ -139,10 +140,10 @@ export const FacilityHome = (props: any) => {
         onSave={() =>
           facilityData?.read_cover_image_url
             ? setImageKey(Date.now())
-            : window.location.reload()
+            : facilityFetch()
         }
         onClose={() => setEditCoverImage(false)}
-        onDelete={() => window.location.reload()}
+        onDelete={() => facilityFetch()}
         facility={facilityData ?? ({} as FacilityModel)}
       />
       {hasCoverImage ? (

src/Components/Patient/PatientInfoCard.tsx

@@ -141,7 +141,11 @@ export default function PatientInfoCard(props: {
           />
           <DischargeModal
             show={openDischargeDialog}
-            onClose={() => setOpenDischargeDialog(false)}
+            onClose={() => {
+              setOpenDischargeDialog(false);
+              props.fetchPatientData &&
+                props.fetchPatientData({ aborted: false });
+            }}
             consultationData={consultation}
           />
         </>

src/Components/Users/UserProfile.tsx

@@ -164,12 +164,18 @@ export default function UserProfile() {
     },
   });
 
-  const { data: skillsView, loading: isSkillsLoading } = useQuery(
-    routes.userListSkill,
-    {
-      pathParams: { username: authUser.username },
-    }
-  );
+  const {
+    data: skillsView,
+    refetch: skillsFetch,
+    loading: isSkillsLoading,
+  } = useQuery(routes.userListSkill, {
+    pathParams: { username: authUser.username },
+  });
+
+  const onUpdateLocalStorage = () => {
+    skillsFetch();
+    refetchUserData();
+  };
 
   const validateForm = () => {
     const errors = { ...initError };
@@ -776,7 +782,10 @@ export default function UserProfile() {
             </div>
           </div>
           {updateStatus.isUpdateAvailable && (
-            <UpdatableApp silentlyAutoUpdate={false}>
+            <UpdatableApp
+              silentlyAutoUpdate={false}
+              onUpdateLocalStorage={onUpdateLocalStorage}
+            >
               <ButtonV2 disabled={true}>
                 <div className="flex items-center gap-4">
                   <CareIcon className="care-l-exclamation text-2xl" />