Skip to content

Commit

Permalink
[frontend] Fix user context error for publicDashboards (#8996)
Browse files Browse the repository at this point in the history
  • Loading branch information
marieflorescontact authored Nov 14, 2024
1 parent 28da644 commit a2f1e62
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,13 @@ export const getAvailableOperatorForFilter = (
};

export const useFetchFilterKeysSchema = () => {
const { filterKeysSchema } = useAuth().schema;
let filterKeysSchema: Map<string, Map<string, FilterDefinition>>;

try {
filterKeysSchema = useAuth().schema.filterKeysSchema;
} catch (e) {
filterKeysSchema = new Map();
}
return filterKeysSchema;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down Expand Up @@ -262,7 +261,9 @@ export const usePaginationLocalStorage = <U>(
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);

Expand Down

0 comments on commit a2f1e62

Please sign in to comment.