diff --git a/packages/cubejs-client-react/src/hooks/cube-fetch.js b/packages/cubejs-client-react/src/hooks/cube-fetch.js index 9ba4eda4844f9..d4a53a841fd2e 100644 --- a/packages/cubejs-client-react/src/hooks/cube-fetch.js +++ b/packages/cubejs-client-react/src/hooks/cube-fetch.js @@ -3,10 +3,8 @@ import { isQueryPresent } from '@cubejs-client/core'; import CubeContext from '../CubeContext'; import useDeepCompareMemoize from './deep-compare-memoize'; -import { useIsMounted } from './is-mounted'; export function useCubeFetch(method, options = {}) { - const isMounted = useIsMounted(); const context = useContext(CubeContext); const mutexRef = useRef({}); @@ -22,7 +20,8 @@ export function useCubeFetch(method, options = {}) { const cubeApi = options.cubeApi || context?.cubeApi; const query = loadOptions.query || options.query; - const queryCondition = method === 'meta' ? true : query && isQueryPresent(query); + const queryCondition = + method === 'meta' ? true : query && isQueryPresent(query); if (cubeApi && (ignoreSkip || !skip) && queryCondition) { setError(null); @@ -40,20 +39,16 @@ export function useCubeFetch(method, options = {}) { try { const response = await cubeApi[method](...args); - if (isMounted()) { - setResponse({ - response, - isLoading: false, - }); - } + setResponse({ + response, + isLoading: false, + }); } catch (error) { - if (isMounted()) { - setError(error); - setResponse({ - isLoading: false, - response: null, - }); - } + setError(error); + setResponse({ + isLoading: false, + response: null, + }); } } } diff --git a/packages/cubejs-client-react/src/hooks/cube-query.js b/packages/cubejs-client-react/src/hooks/cube-query.js index f0efee6159946..c2f60ae9bcf27 100644 --- a/packages/cubejs-client-react/src/hooks/cube-query.js +++ b/packages/cubejs-client-react/src/hooks/cube-query.js @@ -3,11 +3,9 @@ import { isQueryPresent, areQueriesEqual } from '@cubejs-client/core'; import CubeContext from '../CubeContext'; import useDeepCompareMemoize from './deep-compare-memoize'; -import { useIsMounted } from './is-mounted'; export function useCubeQuery(query, options = {}) { const mutexRef = useRef({}); - const isMounted = useIsMounted(); const [currentQuery, setCurrentQuery] = useState(null); const [isLoading, setLoading] = useState(!options.skip); const [resultSet, setResultSet] = useState(null); @@ -42,21 +40,15 @@ export function useCubeQuery(query, options = {}) { castNumerics: Boolean(typeof options.castNumerics === 'boolean' ? options.castNumerics : context?.options?.castNumerics) }); - if (isMounted()) { - setResultSet(response); - setProgress(null); - } + setResultSet(response); + setProgress(null); } catch (error) { - if (isMounted()) { - setError(error); - setResultSet(null); - setProgress(null); - } + setError(error); + setResultSet(null); + setProgress(null); } - if (isMounted()) { - setLoading(false); - } + setLoading(false); } useEffect(() => { @@ -95,27 +87,23 @@ export function useCubeQuery(query, options = {}) { progressCallback, }, (e, result) => { - if (isMounted()) { - if (e) { - setError(e); - } else { - setResultSet(result); - } - setLoading(false); - setProgress(null); + if (e) { + setError(e); + } else { + setResultSet(result); } + setLoading(false); + setProgress(null); } ); } else { await fetch(); } } catch (e) { - if (isMounted()) { - setError(e); - setResultSet(null); - setLoading(false); - setProgress(null); - } + setError(e); + setResultSet(null); + setLoading(false); + setProgress(null); } } } diff --git a/packages/cubejs-client-react/src/hooks/is-mounted.js b/packages/cubejs-client-react/src/hooks/is-mounted.js deleted file mode 100644 index 0bb54c022950c..0000000000000 --- a/packages/cubejs-client-react/src/hooks/is-mounted.js +++ /dev/null @@ -1,15 +0,0 @@ -import { useEffect, useRef } from 'react'; - -export function useIsMounted() { - const isMounted = useRef(false); - - useEffect(() => { - isMounted.current = true; - - return () => { - isMounted.current = false; - }; - }, []); - - return () => isMounted.current; -}