From fd8dd5631a1c52d8b59e57796d77b61c82f64a3c Mon Sep 17 00:00:00 2001
From: Andrei Nenashev <anenashev90@gmail.com>
Date: Thu, 26 Oct 2023 18:52:48 +0200
Subject: [PATCH] dependencies: upgrade react-query from 4 to 5

---
 odd-platform-ui/package.json                  |  2 +-
 odd-platform-ui/pnpm-lock.yaml                | 19 +++++++-------
 .../DatasetStructureCompare.tsx               |  6 ++++-
 .../DatasetFieldInternalNameForm.tsx          |  2 +-
 .../AssignFieldTermForm.tsx                   |  4 +--
 .../EditLinkForm/EditLinkForm.tsx             |  4 +--
 .../SaveFilesForm/SaveFilesForm.tsx           |  6 ++---
 .../SaveLinksForm/SaveLinksForm.tsx           |  4 +--
 .../OverviewEntityGroupItems.tsx              |  2 +-
 .../DataSourceList/DataSourceList.tsx         |  6 ++++-
 .../Directory/Directory/Directory.tsx         |  6 ++++-
 .../Directory/Entities/Entities.tsx           |  4 +--
 .../Entities/EntitiesList/EntitiesList.tsx    |  4 +--
 .../elements/AppErrorPage/AppErrorPage.tsx    |  3 +--
 .../StatusSettingsForm/StatusSettingsForm.tsx |  2 +-
 odd-platform-ui/src/index.tsx                 | 10 +++----
 .../src/lib/hooks/api/dataEntity.ts           | 26 ++++++++++++++-----
 .../dataEntityAttachments/dataEntityFiles.ts  |  6 ++---
 .../dataEntityAttachments/dataEntityLinks.ts  |  6 ++---
 .../src/lib/hooks/api/datasetField.ts         |  6 ++---
 .../src/lib/hooks/api/directory.ts            | 13 +++++++---
 odd-platform-ui/src/lib/hooks/api/terms.ts    |  7 ++---
 odd-platform-ui/src/lib/interfaces/shared.ts  |  2 +-
 .../src/redux/lib/handleResponseThunk.ts      |  2 +-
 24 files changed, 90 insertions(+), 62 deletions(-)

diff --git a/odd-platform-ui/package.json b/odd-platform-ui/package.json
index 319f9dffb..97169df38 100644
--- a/odd-platform-ui/package.json
+++ b/odd-platform-ui/package.json
@@ -45,7 +45,7 @@
     "@mui/system": "^5.14.4",
     "@mui/x-date-pickers": "^5.0.20",
     "@reduxjs/toolkit": "^1.9.5",
-    "@tanstack/react-query": "^4.32.6",
+    "@tanstack/react-query": "^5.0.5",
     "@tanstack/react-virtual": "3.0.0-beta.60",
     "@uiw/react-md-editor": "^3.23.5",
     "@visx/curve": "^3.3.0",
diff --git a/odd-platform-ui/pnpm-lock.yaml b/odd-platform-ui/pnpm-lock.yaml
index bae85e1d3..a6c541b58 100644
--- a/odd-platform-ui/pnpm-lock.yaml
+++ b/odd-platform-ui/pnpm-lock.yaml
@@ -28,8 +28,8 @@ dependencies:
     specifier: ^1.9.5
     version: 1.9.5(react-redux@8.1.2)(react@18.2.0)
   '@tanstack/react-query':
-    specifier: ^4.32.6
-    version: 4.32.6(react-dom@18.2.0)(react@18.2.0)
+    specifier: ^5.0.5
+    version: 5.0.5(react-dom@18.2.0)(react@18.2.0)
   '@tanstack/react-virtual':
     specifier: 3.0.0-beta.60
     version: 3.0.0-beta.60(react@18.2.0)
@@ -1449,15 +1449,15 @@ packages:
     resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==}
     dev: true
 
-  /@tanstack/query-core@4.32.6:
-    resolution: {integrity: sha512-YVB+mVWENQwPyv+40qO7flMgKZ0uI41Ph7qXC2Zf1ft5AIGfnXnMZyifB2ghhZ27u+5wm5mlzO4Y6lwwadzxCA==}
+  /@tanstack/query-core@5.0.5:
+    resolution: {integrity: sha512-MThCETMkHDHTnFZHp71L+SqTtD5d6XHftFCVR1xRJdWM3qGrlQ2VCXaj0SKVcyJej2e1Opa2c7iknu1llxCDNQ==}
     dev: false
 
-  /@tanstack/react-query@4.32.6(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-AITu/IKJJJXsHHeXNBy5bclu12t08usMCY0vFC2dh9SP/w6JAk5U9GwfjOIPj3p+ATADZvxQPe8UiCtMLNeQbg==}
+  /@tanstack/react-query@5.0.5(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-ZG0Q4HZ0iuI8mWiZ2/MdVYPHbrmAVhMn7+gLOkxJh6zLIgCL4luSZlohzN5Xt4MjxfxxWioO1nemwpudaTsmQg==}
     peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react: ^18.0.0
+      react-dom: ^18.0.0
       react-native: '*'
     peerDependenciesMeta:
       react-dom:
@@ -1465,10 +1465,9 @@ packages:
       react-native:
         optional: true
     dependencies:
-      '@tanstack/query-core': 4.32.6
+      '@tanstack/query-core': 5.0.5
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      use-sync-external-store: 1.2.0(react@18.2.0)
     dev: false
 
   /@tanstack/react-virtual@3.0.0-beta.60(react@18.2.0):
diff --git a/odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureCompare/DatasetStructureCompare.tsx b/odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureCompare/DatasetStructureCompare.tsx
index ac3b7dfeb..9c3586a5b 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureCompare/DatasetStructureCompare.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureCompare/DatasetStructureCompare.tsx
@@ -43,7 +43,11 @@ const DatasetStructureCompare: FC = () => {
         />
       )}
       {isLoading && <AppLoadingPage />}
-      <AppErrorPage showError={isError} offsetTop={210} error={error as ErrorState} />
+      <AppErrorPage
+        showError={isError}
+        offsetTop={210}
+        error={error as unknown as ErrorState}
+      />
       <EmptyContentPlaceholder
         isContentLoaded={isSuccess}
         isContentEmpty={!data?.structureDiffList.length}
diff --git a/odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureOverview/DatasetStructureView/DatasetFieldOverview/DatasetFieldHeader/DatasetFieldInternalNameForm/DatasetFieldInternalNameForm.tsx b/odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureOverview/DatasetStructureView/DatasetFieldOverview/DatasetFieldHeader/DatasetFieldInternalNameForm/DatasetFieldInternalNameForm.tsx
index dcad351bb..4f478b518 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureOverview/DatasetStructureView/DatasetFieldOverview/DatasetFieldHeader/DatasetFieldInternalNameForm/DatasetFieldInternalNameForm.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureOverview/DatasetStructureView/DatasetFieldOverview/DatasetFieldHeader/DatasetFieldInternalNameForm/DatasetFieldInternalNameForm.tsx
@@ -21,7 +21,7 @@ const DatasetFieldInternalNameForm = ({
   const formId = 'datasetField-internal-name';
   const {
     mutateAsync: updateName,
-    isLoading: isInternalNameUpdating,
+    isPending: isInternalNameUpdating,
     isSuccess: isInternalNameUpdated,
   } = useUpdateDatasetFieldInternalName();
 
diff --git a/odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureOverview/DatasetStructureView/DatasetFieldOverview/DatasetFieldTerms/AssignFieldTermForm/AssignFieldTermForm.tsx b/odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureOverview/DatasetStructureView/DatasetFieldOverview/DatasetFieldTerms/AssignFieldTermForm/AssignFieldTermForm.tsx
index ca857a619..ff007b5b0 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureOverview/DatasetStructureView/DatasetFieldOverview/DatasetFieldTerms/AssignFieldTermForm/AssignFieldTermForm.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureOverview/DatasetStructureView/DatasetFieldOverview/DatasetFieldTerms/AssignFieldTermForm/AssignFieldTermForm.tsx
@@ -14,7 +14,7 @@ const AssignFieldTermForm: FC<AssignFieldTermFormProps> = ({
   datasetFieldId,
   handleAddTerm,
 }) => {
-  const { isLoading, isSuccess, mutateAsync: addTerm } = useAddDatasetFieldTerm();
+  const { isPending, isSuccess, mutateAsync: addTerm } = useAddDatasetFieldTerm();
 
   const onSubmit = useCallback(
     (clearState: () => void) =>
@@ -32,7 +32,7 @@ const AssignFieldTermForm: FC<AssignFieldTermFormProps> = ({
       onSubmit={onSubmit}
       openBtnEl={openBtnEl}
       handleCloseSubmittedForm={isSuccess}
-      isLoading={isLoading}
+      isLoading={isPending}
     />
   );
 };
diff --git a/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewAttachments/EditLinkForm/EditLinkForm.tsx b/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewAttachments/EditLinkForm/EditLinkForm.tsx
index f99bb634e..5e77e04a2 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewAttachments/EditLinkForm/EditLinkForm.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewAttachments/EditLinkForm/EditLinkForm.tsx
@@ -18,7 +18,7 @@ const EditLinkForm: FC<EditLinkFormProps> = ({ openBtn, linkId, name, url }) =>
   const { t } = useTranslation();
   const { dataEntityId } = useAppParams();
 
-  const { mutate: updateLink, isLoading, isSuccess } = useUpdateDataEntityLink();
+  const { mutate: updateLink, isPending, isSuccess } = useUpdateDataEntityLink();
 
   const { reset, formState, handleSubmit, control } = useForm<DataEntityLinkFormData>({
     defaultValues: { name, url },
@@ -90,7 +90,7 @@ const EditLinkForm: FC<EditLinkFormProps> = ({ openBtn, linkId, name, url }) =>
       renderContent={formContent}
       renderActions={formActionButtons}
       handleCloseSubmittedForm={isSuccess}
-      isLoading={isLoading}
+      isLoading={isPending}
       clearState={clearState}
     />
   );
diff --git a/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewAttachments/SaveFilesForm/SaveFilesForm.tsx b/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewAttachments/SaveFilesForm/SaveFilesForm.tsx
index 24345fe0d..eaff1cd0d 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewAttachments/SaveFilesForm/SaveFilesForm.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewAttachments/SaveFilesForm/SaveFilesForm.tsx
@@ -18,7 +18,7 @@ const SaveFilesForm: FC<SaveFilesFormProps> = ({ openBtn, maxSize }) => {
   const formId = 'save-files-form';
   const { dataEntityId } = useAppParams();
 
-  const { mutate: saveFile, isLoading, isSuccess } = useSaveDataEntityFile();
+  const { mutate: saveFile, isPending, isSuccess } = useSaveDataEntityFile();
 
   const [uploadedFile, setUploadedFile] = useState<Blob | undefined>(undefined);
   const { reset, handleSubmit, control } = useForm<FormData>({
@@ -92,7 +92,7 @@ const SaveFilesForm: FC<SaveFilesFormProps> = ({ openBtn, maxSize }) => {
       type='submit'
       form={formId}
       fullWidth
-      disabled={!uploadedFile || isLoading}
+      disabled={!uploadedFile || isPending}
     />
   );
 
@@ -106,7 +106,7 @@ const SaveFilesForm: FC<SaveFilesFormProps> = ({ openBtn, maxSize }) => {
       renderContent={formContent}
       renderActions={formActionButtons}
       handleCloseSubmittedForm={isSuccess}
-      isLoading={isLoading}
+      isLoading={isPending}
       clearState={clearState}
       confirmOnClose
     />
diff --git a/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewAttachments/SaveLinksForm/SaveLinksForm.tsx b/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewAttachments/SaveLinksForm/SaveLinksForm.tsx
index 74e19897f..9f0b86dd8 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewAttachments/SaveLinksForm/SaveLinksForm.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewAttachments/SaveLinksForm/SaveLinksForm.tsx
@@ -15,7 +15,7 @@ const SaveLinksForm: FC<SaveLinksFormProps> = ({ openBtn }) => {
   const formId = 'save-links-form';
   const { dataEntityId } = useAppParams();
 
-  const { mutate: saveLinks, isLoading, isSuccess } = useSaveDataEntityLinks();
+  const { mutate: saveLinks, isPending, isSuccess } = useSaveDataEntityLinks();
 
   const methods = useForm<DataEntityLinkListFormData>({
     defaultValues: { items: [{ name: '', url: '' }] },
@@ -87,7 +87,7 @@ const SaveLinksForm: FC<SaveLinksFormProps> = ({ openBtn }) => {
       renderContent={formContent}
       renderActions={formActionButtons}
       handleCloseSubmittedForm={isSuccess}
-      isLoading={isLoading}
+      isLoading={isPending}
       clearState={clearState}
     />
   );
diff --git a/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewStats/OverviewEntityGroupItems/OverviewEntityGroupItems.tsx b/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewStats/OverviewEntityGroupItems/OverviewEntityGroupItems.tsx
index 30d3ba4f7..ac31ca7a9 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewStats/OverviewEntityGroupItems/OverviewEntityGroupItems.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewStats/OverviewEntityGroupItems/OverviewEntityGroupItems.tsx
@@ -106,7 +106,7 @@ const OverviewEntityGroupItems: FC = () => {
                 scrollableTarget='entity-group-items-list'
                 dataLength={entities.length}
                 next={fetchNextPage}
-                hasMore={!!hasNextPage}
+                hasMore={hasNextPage}
                 loader={
                   <Grid container justifyContent='center' mt={3}>
                     <AppCircularProgress size={30} background='transparent' />
diff --git a/odd-platform-ui/src/components/Directory/DataSourceList/DataSourceList.tsx b/odd-platform-ui/src/components/Directory/DataSourceList/DataSourceList.tsx
index d381b0083..41f7a779f 100644
--- a/odd-platform-ui/src/components/Directory/DataSourceList/DataSourceList.tsx
+++ b/odd-platform-ui/src/components/Directory/DataSourceList/DataSourceList.tsx
@@ -106,7 +106,11 @@ const DataSourceList: FC = () => {
   return (
     <>
       {isLoading && <AppLoadingPage />}
-      <AppErrorPage showError={isError} offsetTop={210} error={error as ErrorState} />
+      <AppErrorPage
+        showError={isError}
+        offsetTop={210}
+        error={error as unknown as ErrorState}
+      />
       {dataSourceList && (
         <S.Container>
           <DirectoryBreadCrumbs />
diff --git a/odd-platform-ui/src/components/Directory/Directory/Directory.tsx b/odd-platform-ui/src/components/Directory/Directory/Directory.tsx
index 19adb4da0..063c05b9b 100644
--- a/odd-platform-ui/src/components/Directory/Directory/Directory.tsx
+++ b/odd-platform-ui/src/components/Directory/Directory/Directory.tsx
@@ -27,7 +27,11 @@ const Directory: FC = () => {
         <Typography variant='h0'>{t('Directories')}</Typography>
       </Grid>
       {isLoading && <AppLoadingPage />}
-      <AppErrorPage showError={isError} offsetTop={210} error={error as ErrorState} />
+      <AppErrorPage
+        showError={isError}
+        offsetTop={210}
+        error={error as unknown as ErrorState}
+      />
       {dataSourceTypes && (
         <ScrollableContainer $offsetY={70}>
           <Grid container mt={3} columnGap={1} rowGap={3}>
diff --git a/odd-platform-ui/src/components/Directory/Entities/Entities.tsx b/odd-platform-ui/src/components/Directory/Entities/Entities.tsx
index db1ba14cc..245a607d8 100644
--- a/odd-platform-ui/src/components/Directory/Entities/Entities.tsx
+++ b/odd-platform-ui/src/components/Directory/Entities/Entities.tsx
@@ -60,7 +60,7 @@ const Entities: FC = () => {
       <AppErrorPage
         showError={isTypesError || isEntitiesError}
         offsetTop={210}
-        error={(typesError || entitiesError) as ErrorState}
+        error={(typesError ?? entitiesError) as ErrorState}
       />
       <S.Container>
         <DirectoryBreadCrumbs dataSourceName={dataSourceName} />
@@ -80,7 +80,7 @@ const Entities: FC = () => {
         {types && <EntitiesTabs types={types} />}
         <EntitiesList
           entities={entities}
-          hasNextPage={!!hasNextPage}
+          hasNextPage={hasNextPage}
           isEntitiesLoaded={isEntitiesLoaded}
           isContentEmpty={!total}
           fetchNextPage={fetchNextPage}
diff --git a/odd-platform-ui/src/components/Directory/Entities/EntitiesList/EntitiesList.tsx b/odd-platform-ui/src/components/Directory/Entities/EntitiesList/EntitiesList.tsx
index 676c13c77..ab1f1c387 100644
--- a/odd-platform-ui/src/components/Directory/Entities/EntitiesList/EntitiesList.tsx
+++ b/odd-platform-ui/src/components/Directory/Entities/EntitiesList/EntitiesList.tsx
@@ -1,7 +1,7 @@
 import React, { type FC } from 'react';
 import InfiniteScroll from 'react-infinite-scroll-component';
 import { Grid } from '@mui/material';
-import type { InfiniteQueryObserverResult } from '@tanstack/react-query';
+import type { InfiniteData, InfiniteQueryObserverResult } from '@tanstack/react-query';
 import {
   AppCircularProgress,
   EmptyContentPlaceholder,
@@ -19,7 +19,7 @@ interface EntitiesResultsListProps {
   isEntitiesLoaded: boolean;
   isContentEmpty: boolean;
   fetchNextPage: () => Promise<
-    InfiniteQueryObserverResult<DataSourceEntityList, ErrorState>
+    InfiniteQueryObserverResult<InfiniteData<DataSourceEntityList>, ErrorState>
   >;
 }
 
diff --git a/odd-platform-ui/src/components/shared/elements/AppErrorPage/AppErrorPage.tsx b/odd-platform-ui/src/components/shared/elements/AppErrorPage/AppErrorPage.tsx
index 269529e9c..aa2e5f42b 100644
--- a/odd-platform-ui/src/components/shared/elements/AppErrorPage/AppErrorPage.tsx
+++ b/odd-platform-ui/src/components/shared/elements/AppErrorPage/AppErrorPage.tsx
@@ -10,7 +10,6 @@ interface AppErrorPageProps {
   error?: ErrorState;
   offsetTop?: number;
 }
-
 const AppErrorPage: React.FC<AppErrorPageProps> = ({
   showError,
   error,
@@ -27,7 +26,7 @@ const AppErrorPage: React.FC<AppErrorPageProps> = ({
           </Typography>
         </Grid>
         <Grid item alignItems='center'>
-          <Typography variant='h1'>{error?.statusText || t('Unknown Error')}</Typography>
+          <Typography variant='h1'>{error?.statusText ?? t('Unknown Error')}</Typography>
           <Grid container alignItems='center'>
             <Typography variant='body1'>{t('Return to the')}</Typography>
             <Button text={t('Home Page')} to='/' buttonType='tertiary-m' />
diff --git a/odd-platform-ui/src/components/shared/elements/EntityStatus/StatusSettingsForm/StatusSettingsForm.tsx b/odd-platform-ui/src/components/shared/elements/EntityStatus/StatusSettingsForm/StatusSettingsForm.tsx
index 300938678..144835fee 100644
--- a/odd-platform-ui/src/components/shared/elements/EntityStatus/StatusSettingsForm/StatusSettingsForm.tsx
+++ b/odd-platform-ui/src/components/shared/elements/EntityStatus/StatusSettingsForm/StatusSettingsForm.tsx
@@ -42,7 +42,7 @@ const StatusSettingsForm: FC<StatusSettingsFormProps> = ({
   const { add } = useAppDateTime();
   const {
     mutateAsync: updateStatus,
-    isLoading: isStatusUpdating,
+    isPending: isStatusUpdating,
     isSuccess: isStatusUpdated,
   } = useUpdateDataEntityStatus();
 
diff --git a/odd-platform-ui/src/index.tsx b/odd-platform-ui/src/index.tsx
index caefa02e8..10cb22150 100644
--- a/odd-platform-ui/src/index.tsx
+++ b/odd-platform-ui/src/index.tsx
@@ -29,11 +29,11 @@ declare module 'styled-components' {
 
 const queryClient = new QueryClient({
   queryCache: new QueryCache({
-    onError: async e => {
-      if ((e as Error).message === '401') {
+    onError: (e: unknown) => {
+      if (e instanceof Error && e.message === '401') {
         window.location.reload();
       }
-      await showServerErrorToast(e as Response);
+      showServerErrorToast(e as Response);
     },
   }),
   defaultOptions: {
@@ -42,9 +42,7 @@ const queryClient = new QueryClient({
       refetchOnWindowFocus: false,
     },
     mutations: {
-      async onError(e) {
-        await showServerErrorToast(e as Response);
-      },
+      onError: async (e: unknown) => await showServerErrorToast(e as Response),
     },
   },
 });
diff --git a/odd-platform-ui/src/lib/hooks/api/dataEntity.ts b/odd-platform-ui/src/lib/hooks/api/dataEntity.ts
index 89d77a7c7..041e3c0d9 100644
--- a/odd-platform-ui/src/lib/hooks/api/dataEntity.ts
+++ b/odd-platform-ui/src/lib/hooks/api/dataEntity.ts
@@ -1,4 +1,9 @@
-import { useInfiniteQuery, useMutation, useQuery } from '@tanstack/react-query';
+import {
+  type InfiniteData,
+  useInfiniteQuery,
+  useMutation,
+  useQuery,
+} from '@tanstack/react-query';
 import { dataEntityApi } from 'lib/api';
 import { showServerErrorToast, showSuccessToast } from 'lib/errorHandling';
 import type {
@@ -26,7 +31,7 @@ export function useDataEntityMetrics({
     queryKey: ['dataEntityMetrics', dataEntityId],
     queryFn: async () =>
       dataEntityApi.getDataEntityMetrics({ dataEntityId }).catch(err => {
-        showServerErrorToast(err as Response, {
+        showServerErrorToast(err, {
           additionalMessage: 'while loading metrics',
         });
       }),
@@ -41,7 +46,7 @@ export function useDataEntityGroupLineage({ dataEntityId }: { dataEntityId: numb
     queryKey: ['dataEntityGroupLineage', dataEntityId],
     queryFn: () =>
       dataEntityApi.getDataEntityGroupsLineage({ dataEntityGroupId: dataEntityId }),
-    cacheTime: 0,
+    gcTime: 0,
     select: (data): DataEntityGroupLineage =>
       data.items.reduce(
         (memo, lineage) => {
@@ -115,9 +120,15 @@ export function useGetDataEntityGroupItems({
   size,
   query,
 }: UseGetDataEntityGroupItems) {
-  return useInfiniteQuery<DataEntityGroupList, ErrorState, DataEntityGroupList>({
+  return useInfiniteQuery<
+    DataEntityGroupList,
+    ErrorState,
+    InfiniteData<DataEntityGroupList>,
+    ['dataEntityGroupItems', UseGetDataEntityGroupItems],
+    number
+  >({
     queryKey: ['dataEntityGroupItems', { dataEntityGroupId, size, query }],
-    queryFn: async ({ pageParam = 1 }) => {
+    queryFn: async ({ pageParam }) => {
       const response = await dataEntityApi.getDataEntityGroupsItems({
         dataEntityGroupId,
         size,
@@ -127,10 +138,10 @@ export function useGetDataEntityGroupItems({
 
       const totalItems = response.pageInfo.total;
       const totalPageCount = Math.ceil(totalItems / size);
-      let nextPage = pageParam;
+      let nextPage;
 
       if (pageParam < totalPageCount) {
-        nextPage += 1;
+        nextPage = pageParam + 1;
       }
 
       return {
@@ -138,6 +149,7 @@ export function useGetDataEntityGroupItems({
         pageInfo: { ...response.pageInfo, nextPage },
       };
     },
+    initialPageParam: 1,
     getNextPageParam: lastPage => lastPage.pageInfo.nextPage,
   });
 }
diff --git a/odd-platform-ui/src/lib/hooks/api/dataEntityAttachments/dataEntityFiles.ts b/odd-platform-ui/src/lib/hooks/api/dataEntityAttachments/dataEntityFiles.ts
index cc3507b2c..a239ed614 100644
--- a/odd-platform-ui/src/lib/hooks/api/dataEntityAttachments/dataEntityFiles.ts
+++ b/odd-platform-ui/src/lib/hooks/api/dataEntityAttachments/dataEntityFiles.ts
@@ -74,9 +74,9 @@ export function useSaveDataEntityFile() {
         uploadId,
       });
     },
-    onSuccess: async () => {
+    onSuccess: () => {
       showSuccessToast({ message: 'File successfully saved!' });
-      await client.invalidateQueries(['dataEntityAttachments']);
+      client.invalidateQueries({ queryKey: ['dataEntityAttachments'] });
     },
   });
 }
@@ -100,7 +100,7 @@ export function useDeleteDataEntityFile() {
       dataEntityAttachmentApi.deleteFile(params),
     onSuccess: async () => {
       showSuccessToast({ message: 'File successfully deleted!' });
-      await client.invalidateQueries(['dataEntityAttachments']);
+      await client.invalidateQueries({ queryKey: ['dataEntityAttachments'] });
     },
   });
 }
diff --git a/odd-platform-ui/src/lib/hooks/api/dataEntityAttachments/dataEntityLinks.ts b/odd-platform-ui/src/lib/hooks/api/dataEntityAttachments/dataEntityLinks.ts
index 3056fb348..ee064ccb5 100644
--- a/odd-platform-ui/src/lib/hooks/api/dataEntityAttachments/dataEntityLinks.ts
+++ b/odd-platform-ui/src/lib/hooks/api/dataEntityAttachments/dataEntityLinks.ts
@@ -34,7 +34,7 @@ export function useSaveDataEntityLinks() {
       await dataEntityAttachmentApi.saveLinks(params),
     onSuccess: async () => {
       showSuccessToast({ message: 'Links successfully saved!' });
-      await client.invalidateQueries(['dataEntityAttachments']);
+      await client.invalidateQueries({ queryKey: ['dataEntityAttachments'] });
     },
   });
 }
@@ -47,7 +47,7 @@ export function useUpdateDataEntityLink() {
       await dataEntityAttachmentApi.updateLink(params),
     onSuccess: async () => {
       showSuccessToast({ message: 'Link successfully updated!' });
-      await client.invalidateQueries(['dataEntityAttachments']);
+      await client.invalidateQueries({ queryKey: ['dataEntityAttachments'] });
     },
   });
 }
@@ -60,7 +60,7 @@ export function useDeleteDataEntityLink() {
       dataEntityAttachmentApi.deleteLink(params),
     onSuccess: async () => {
       showSuccessToast({ message: 'Link successfully deleted!' });
-      await client.invalidateQueries(['dataEntityAttachments']);
+      await client.invalidateQueries({ queryKey: ['dataEntityAttachments'] });
     },
   });
 }
diff --git a/odd-platform-ui/src/lib/hooks/api/datasetField.ts b/odd-platform-ui/src/lib/hooks/api/datasetField.ts
index 64c0406fa..826b4e03b 100644
--- a/odd-platform-ui/src/lib/hooks/api/datasetField.ts
+++ b/odd-platform-ui/src/lib/hooks/api/datasetField.ts
@@ -16,9 +16,9 @@ export function useDataSetFieldMetrics({ datasetFieldId }: UseDataEntityMetricsP
     queryFn: async () =>
       datasetFieldApiClient
         .getDatasetFieldMetrics({ datasetFieldId })
-        .catch((err: Response) => {
-          showServerErrorToast(err, { additionalMessage: 'while loading field metrics' });
-        }),
+        .catch(err =>
+          showServerErrorToast(err, { additionalMessage: 'while loading field metrics' })
+        ),
     retry: false,
     refetchOnWindowFocus: false,
   });
diff --git a/odd-platform-ui/src/lib/hooks/api/directory.ts b/odd-platform-ui/src/lib/hooks/api/directory.ts
index 8ba238c96..04bcb97b8 100644
--- a/odd-platform-ui/src/lib/hooks/api/directory.ts
+++ b/odd-platform-ui/src/lib/hooks/api/directory.ts
@@ -1,4 +1,4 @@
-import { useInfiniteQuery, useQuery } from '@tanstack/react-query';
+import { type InfiniteData, useInfiniteQuery, useQuery } from '@tanstack/react-query';
 import { directoryApi } from 'lib/api';
 import type {
   DirectoryApiGetDatasourceEntitiesRequest,
@@ -47,9 +47,15 @@ export function useGetDataSourceEntities({
   typeId,
   enabled,
 }: UseGetDataSourceEntities) {
-  return useInfiniteQuery<DataSourceEntityList, ErrorState, DataSourceEntityList>({
+  return useInfiniteQuery<
+    DataSourceEntityList,
+    ErrorState,
+    InfiniteData<DataSourceEntityList>,
+    ['directoryDataSourceEntities', Omit<UseGetDataSourceEntities, 'enabled'>],
+    number
+  >({
     queryKey: ['directoryDataSourceEntities', { dataSourceId, size, typeId }],
-    queryFn: async ({ pageParam = 1 }) => {
+    queryFn: async ({ pageParam }) => {
       const response = await directoryApi.getDatasourceEntities({
         dataSourceId,
         size,
@@ -73,6 +79,7 @@ export function useGetDataSourceEntities({
         },
       };
     },
+    initialPageParam: 1,
     getNextPageParam: lastPage => lastPage.entities.pageInfo.nextPage,
     enabled,
   });
diff --git a/odd-platform-ui/src/lib/hooks/api/terms.ts b/odd-platform-ui/src/lib/hooks/api/terms.ts
index 66f1b26f8..36f38ae7e 100644
--- a/odd-platform-ui/src/lib/hooks/api/terms.ts
+++ b/odd-platform-ui/src/lib/hooks/api/terms.ts
@@ -11,9 +11,10 @@ export function useGetTermByNamespaceAndName() {
 
   return async ({ namespaceName, termName }: TermApiGetTermByNamespaceAndNameRequest) => {
     try {
-      return await queryClient.fetchQuery(['terms', namespaceName, termName], () =>
-        termApi.getTermByNamespaceAndName({ namespaceName, termName })
-      );
+      return await queryClient.fetchQuery({
+        queryKey: ['terms', namespaceName, termName],
+        queryFn: () => termApi.getTermByNamespaceAndName({ namespaceName, termName }),
+      });
     } catch (error) {
       return error as AppError;
     }
diff --git a/odd-platform-ui/src/lib/interfaces/shared.ts b/odd-platform-ui/src/lib/interfaces/shared.ts
index 50e7467b8..4d5afa3f7 100644
--- a/odd-platform-ui/src/lib/interfaces/shared.ts
+++ b/odd-platform-ui/src/lib/interfaces/shared.ts
@@ -11,7 +11,7 @@ export interface DataSetVersionDiff extends GeneratedDataSetVersionDiff {
 
 export interface InfiniteQueryPageInfo {
   total: number;
-  nextPage: number;
+  nextPage?: number;
 }
 
 export type Lang = keyof typeof LANGUAGES_MAP;
diff --git a/odd-platform-ui/src/redux/lib/handleResponseThunk.ts b/odd-platform-ui/src/redux/lib/handleResponseThunk.ts
index 69cd49223..249cc9843 100644
--- a/odd-platform-ui/src/redux/lib/handleResponseThunk.ts
+++ b/odd-platform-ui/src/redux/lib/handleResponseThunk.ts
@@ -26,7 +26,7 @@ export const handleResponseAsyncThunk = <Returned, ThunkArg = void>(
     try {
       const response = (await thunk(arg, thunkAPI)) as Returned;
 
-      if (options && options.setSuccessOptions) {
+      if (options?.setSuccessOptions) {
         const { id, message } = options.setSuccessOptions(arg);
         showSuccessToast({ id, message });
       }