From d43c3f359390f50a51e118763c44fe09f2216bba Mon Sep 17 00:00:00 2001
From: Dorian Maliszewski <dmaliszewski@scaleway.com>
Date: Tue, 26 Apr 2022 17:23:06 +0200
Subject: [PATCH] chore: improve needpolling type

---
 packages/use-dataloader/src/DataLoaderProvider.tsx | 6 +++---
 packages/use-dataloader/src/types.ts               | 4 ++--
 packages/use-dataloader/src/useDataLoader.ts       | 7 ++++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/use-dataloader/src/DataLoaderProvider.tsx b/packages/use-dataloader/src/DataLoaderProvider.tsx
index c63352b39..6c9a46793 100644
--- a/packages/use-dataloader/src/DataLoaderProvider.tsx
+++ b/packages/use-dataloader/src/DataLoaderProvider.tsx
@@ -43,10 +43,10 @@ type GetReloadsFn = {
 
 export interface IDataLoaderContext {
   addRequest: (key: string, args: UseDataLoaderInitializerArgs) => DataLoader
-  getOrAddRequest: (
+  getOrAddRequest: <T>(
     key: string,
-    args: UseDataLoaderInitializerArgs,
-  ) => DataLoader
+    args: UseDataLoaderInitializerArgs<T>,
+  ) => DataLoader<T>
   cacheKeyPrefix?: string
   onError?: (error: Error) => void | Promise<void>
   clearAllCachedData: () => void
diff --git a/packages/use-dataloader/src/types.ts b/packages/use-dataloader/src/types.ts
index 514b1aaa2..1e6691a36 100644
--- a/packages/use-dataloader/src/types.ts
+++ b/packages/use-dataloader/src/types.ts
@@ -30,7 +30,7 @@ export interface UseDataLoaderConfig<T = unknown> {
    * Max time before data from previous success is considered as outdated (in millisecond)
    */
   maxDataLifetime?: number
-  needPolling?: NeedPollingType
+  needPolling?: NeedPollingType<T>
 }
 
 /**
@@ -76,7 +76,7 @@ export type UsePaginatedDataLoaderConfig<T = unknown> = {
    * Max time before data from previous success is considered as outdated (in millisecond)
    */
   maxDataLifetime?: number
-  needPolling?: NeedPollingType
+  needPolling?: NeedPollingType<T>
   initialPage?: number
   perPage?: number
 }
diff --git a/packages/use-dataloader/src/useDataLoader.ts b/packages/use-dataloader/src/useDataLoader.ts
index 0ca8e4287..3de3b9e91 100644
--- a/packages/use-dataloader/src/useDataLoader.ts
+++ b/packages/use-dataloader/src/useDataLoader.ts
@@ -8,7 +8,6 @@ import {
 } from 'react'
 import { useDataLoaderContext } from './DataLoaderProvider'
 import { StatusEnum } from './constants'
-import DataLoader from './dataloader'
 import { PromiseType, UseDataLoaderConfig, UseDataLoaderResult } from './types'
 
 /**
@@ -52,7 +51,7 @@ const useDataLoader = <T>(
       method,
       needPolling,
       pollingInterval,
-    }) as DataLoader<T>
+    })
 
     unsubscribeRequestRef.current = () => newRequest.removeObserver(subscribeFn)
     newRequest.addObserver(subscribeFn)
@@ -82,7 +81,9 @@ const useDataLoader = <T>(
     }
   }, [onSuccess, onError, onErrorProvider, method, request])
 
-  const cancelMethodRef = useRef<(() => Promise<void>) | undefined>(request?.cancel)
+  const cancelMethodRef = useRef<(() => Promise<void>) | undefined>(
+    request?.cancel,
+  )
 
   const isLoading = useMemo(
     () =>