fix: [DHIS2] Type generic T = QueryResult to useDataQuery (#1297)

* fix: added generic T = QueryResult

* fix: changed to correct import

* fix: prettier

* fix: changed name of T

* fix: prettier

services/data/src/react/hooks/useDataQuery.ts

@@ -1,6 +1,11 @@
 import { useState, useRef, useCallback, useDebugValue } from 'react'
 import { useQuery, setLogger } from 'react-query'
-import type { Query, QueryOptions, QueryVariables } from '../../engine'
+import type {
+    Query,
+    QueryOptions,
+    QueryResult,
+    QueryVariables,
+} from '../../engine'
 import type { FetchError } from '../../engine/types/FetchError'
 import type { QueryRenderInput, QueryRefetchFunction } from '../../types'
 import { mergeAndCompareVariables } from './mergeAndCompareVariables'
@@ -28,15 +33,15 @@ type QueryState = {
     refetchCallback?: (data: any) => void
 }
 
-export const useDataQuery = (
+export const useDataQuery = <TQueryResult = QueryResult>(
     query: Query,
     {
         onComplete: userOnSuccess,
         onError: userOnError,
         variables: initialVariables = {},
         lazy: initialLazy = false,
     }: QueryOptions = {}
-): QueryRenderInput => {
+): QueryRenderInput<TQueryResult> => {
     const [staticQuery] = useStaticInput<Query>(query, {
         warn: true,
         name: 'query',

services/data/src/types.ts

@@ -40,15 +40,16 @@ export interface ExecuteHookResult<ReturnType> {
     data?: ReturnType
 }
 
-export interface QueryState {
+export interface QueryState<TQueryResult> {
     called: boolean
     loading: boolean
     fetching: boolean
     error?: FetchError
-    data?: QueryResult
+    data?: TQueryResult
 }
 
-export interface QueryRenderInput extends QueryState {
+export interface QueryRenderInput<TQueryResult = QueryResult>
+    extends QueryState<TQueryResult> {
     engine: DataEngine
     refetch: QueryRefetchFunction
 }