diff --git a/opencti-platform/opencti-front/src/utils/filters/filtersUtils.tsx b/opencti-platform/opencti-front/src/utils/filters/filtersUtils.tsx index b9acd2b1e231..e57ef8688d73 100644 --- a/opencti-platform/opencti-front/src/utils/filters/filtersUtils.tsx +++ b/opencti-platform/opencti-front/src/utils/filters/filtersUtils.tsx @@ -651,7 +651,13 @@ export const getAvailableOperatorForFilter = ( }; export const useFetchFilterKeysSchema = () => { - const { filterKeysSchema } = useAuth().schema; + let filterKeysSchema: Map>; + + try { + filterKeysSchema = useAuth().schema.filterKeysSchema; + } catch (e) { + filterKeysSchema = new Map(); + } return filterKeysSchema; }; diff --git a/opencti-platform/opencti-front/src/utils/hooks/useLocalStorage.ts b/opencti-platform/opencti-front/src/utils/hooks/useLocalStorage.ts index 42fd6a878858..08e076bd7a29 100644 --- a/opencti-platform/opencti-front/src/utils/hooks/useLocalStorage.ts +++ b/opencti-platform/opencti-front/src/utils/hooks/useLocalStorage.ts @@ -2,7 +2,7 @@ import * as R from 'ramda'; import { Dispatch, SetStateAction, SyntheticEvent, useCallback, useState } from 'react'; import { v4 as uuid } from 'uuid'; import { OrderMode, PaginationOptions } from '../../components/list_lines'; -import { emptyFilterGroup, findFilterFromKey, isFilterGroupNotEmpty, isUniqFilter } from '../filters/filtersUtils'; +import { emptyFilterGroup, findFilterFromKey, isFilterGroupNotEmpty, isUniqFilter, useFetchFilterKeysSchema } from '../filters/filtersUtils'; import { isEmptyField, isNotEmptyField, removeEmptyFields } from '../utils'; import { MESSAGING$ } from '../../relay/environment'; import { @@ -17,7 +17,6 @@ import { } from '../filters/filtersManageStateUtil'; import { LocalStorage } from './useLocalStorageModel'; import useBus from './useBus'; -import useAuth from './useAuth'; import { Filter, FilterGroup, FilterValue, handleFilterHelpers } from '../filters/filtersHelpers-types'; export interface NumberOfElements { @@ -262,7 +261,9 @@ export const usePaginationLocalStorage = ( count: viewStorage.pageSize ? Number.parseInt(viewStorage.pageSize, 10) : 25, ...viewStorage, }); - const { filterKeysSchema } = useAuth().schema; + + const filterKeysSchema = useFetchFilterKeysSchema(); + const [storedSortBy, setStoredSortBy] = useState(viewStorage.sortBy); const [storedOrderAsc, setStoredOrderAsc] = useState(viewStorage.orderAsc);