feat: enhance cancellable request functionality with unique keys

Author: iib0011

mobile/slices/asset.ts

@@ -169,7 +169,7 @@ export const reducer = slice.reducer;
 export const getAssets =
   (criteria: SearchCriteria): AppThunk =>
   async (dispatch) => {
-    const { signal } = createCancellableRequest();
+    const { signal } = createCancellableRequest('getAssets');
     try {
       dispatch(slice.actions.setLoadingGet({ loading: true }));
       const assets = await api.post<Page<AssetDTO>>(
@@ -188,7 +188,7 @@ export const getAssets =
 export const getMoreAssets =
   (criteria: SearchCriteria, pageNum: number): AppThunk =>
   async (dispatch) => {
-    const { signal } = createCancellableRequest();
+    const { signal } = createCancellableRequest('getMoreAssets');
     criteria = { ...criteria, pageNum };
     try {
       dispatch(slice.actions.setLoadingGet({ loading: true }));
@@ -208,7 +208,7 @@ export const getMoreAssets =
 export const getAssetsMini =
   (locationId?: number | null): AppThunk =>
   async (dispatch) => {
-    const { signal } = createCancellableRequest();
+    const { signal } = createCancellableRequest('getAssetsMini');
     try {
       dispatch(slice.actions.setLoadingGet({ loading: true }));
       const assets = await api.get<AssetMiniDTO[]>(

mobile/slices/location.ts

@@ -145,7 +145,7 @@ export const reducer = slice.reducer;
 export const getLocations =
   (criteria: SearchCriteria): AppThunk =>
   async (dispatch) => {
-    const { signal } = createCancellableRequest();
+    const { signal } = createCancellableRequest('getLocations');
     try {
       dispatch(slice.actions.setLoadingGet({ loading: true }));
       const locations = await api.post<Page<Location>>(
@@ -164,7 +164,7 @@ export const getLocations =
 export const getMoreLocations =
   (criteria: SearchCriteria, pageNum: number): AppThunk =>
   async (dispatch) => {
-    const { signal } = createCancellableRequest();
+    const { signal } = createCancellableRequest('getMoreLocations');
     criteria = { ...criteria, pageNum };
     try {
       dispatch(slice.actions.setLoadingGet({ loading: true }));
@@ -195,7 +195,7 @@ export const getLocationDetails =
     dispatch(slice.actions.setLoadingGet({ loading: false }));
   };
 export const getLocationsMini = (): AppThunk => async (dispatch) => {
-  const { signal } = createCancellableRequest();
+  const { signal } = createCancellableRequest('getLocationsMini');
   try {
     dispatch(slice.actions.setLoadingGet({ loading: true }));
     const locations = await api.get<LocationMiniDTO[]>('locations/mini', {

mobile/utils/cancellableRequest.ts

@@ -8,27 +8,23 @@ interface CancellableRequest {
   signal: AbortSignal | null;
 }
 
-let currentController: AbortController | null = null;
-
 /**
  * Creates a new cancellable request, aborting any previous request.
  * @returns CancellableRequest object with abort function and signal
  */
-export function createCancellableRequest(): CancellableRequest {
-  // Abort previous request if it exists
-  if (currentController) {
-    currentController.abort();
-  }
+const controllers = new Map<string, AbortController>();
+
+export function createCancellableRequest(key: string): CancellableRequest {
+  controllers.get(key)?.abort();
 
-  // Create new controller
-  currentController = new AbortController();
+  const controller = new AbortController();
+  controllers.set(key, controller);
 
   return {
-    abort: () => currentController?.abort(),
-    signal: currentController.signal
+    abort: () => controller.abort(),
+    signal: controller.signal
   };
 }
-
 /**
  * Checks if an error is an AbortError (request was cancelled).
  */