diff --git a/frontend/app/components/Dashboard/components/FilterSeries/FilterSeries.tsx b/frontend/app/components/Dashboard/components/FilterSeries/FilterSeries.tsx index 4c602bfac..b9fc281ec 100644 --- a/frontend/app/components/Dashboard/components/FilterSeries/FilterSeries.tsx +++ b/frontend/app/components/Dashboard/components/FilterSeries/FilterSeries.tsx @@ -189,8 +189,6 @@ function FilterSeries(props: Props) { observeChanges(); }; - console.log('series', series); - return (
{canExclude && } diff --git a/frontend/app/components/shared/Filters/FilterItem/FilterItem.tsx b/frontend/app/components/shared/Filters/FilterItem/FilterItem.tsx index 0d551c928..2c390243c 100644 --- a/frontend/app/components/shared/Filters/FilterItem/FilterItem.tsx +++ b/frontend/app/components/shared/Filters/FilterItem/FilterItem.tsx @@ -10,11 +10,11 @@ import FilterSource from '../FilterSource'; import { useStore } from '@/mstore'; import { getIconForFilter } from 'Shared/Filters/FilterModal/FilterModal'; import { Filter, getOperatorsByType } from '@/mstore/types/filterConstants'; -import { FilterItemData } from '@/mstore/types/filterItem'; +import { IFilter } from '@/mstore/types/filterItem'; interface Props { filterIndex?: number; - filter: FilterItemData; + filter: IFilter; onUpdate: (filter: any) => void; onRemoveFilter: () => void; isFilter?: boolean; @@ -141,16 +141,12 @@ function FilterItem(props: Props) { return () => { isMounted = false; // Cleanup on unmount }; - // Dependencies should be the minimal primitive values or stable references - // that determine *if* and *what* to fetch. }, [filter.name, filter.isEvent, isSubItem, filterStore]); // - console.log('filter...', filter); - - const isUserEvent = useMemo( - () => filter.isEvent && !filter.autoCaptured, - [filter.isEvent, filter.autoCaptured], - ); + // const isUserEvent = useMemo( + // () => filter.isEvent && !filter.autoCaptured, + // [filter.isEvent, filter.autoCaptured], + // ); const canShowValues = useMemo( () => diff --git a/frontend/app/mstore/types/filterConstants.ts b/frontend/app/mstore/types/filterConstants.ts index d374333d9..753a350eb 100644 --- a/frontend/app/mstore/types/filterConstants.ts +++ b/frontend/app/mstore/types/filterConstants.ts @@ -255,7 +255,7 @@ export const OPERATORS = { export const COMMON_FILTERS: Filter[] = []; -export const getOperatorsByType = (type: string): Operator[] => { +export const getOperatorsByType = (type?: string): Operator[] => { let operators: Operator[] = []; switch (type?.toLowerCase()) { diff --git a/frontend/app/mstore/types/filterItem.ts b/frontend/app/mstore/types/filterItem.ts index f00026ddb..1d8226d55 100644 --- a/frontend/app/mstore/types/filterItem.ts +++ b/frontend/app/mstore/types/filterItem.ts @@ -25,11 +25,13 @@ export interface IFilter { propertyOrder?: string; filters?: IFilter[]; autoOpen?: boolean; + + [key: string]: any; } type FilterItemKeys = keyof IFilter; -export default class FilterItem { +export default class FilterItem implements IFilter { id: string = ''; name: string = ''; displayName?: string = ''; @@ -80,7 +82,6 @@ export default class FilterItem { } merge(data: IFilter): void { - console.log('Object.entries(data)', Object.entries(data)); Object.entries(data).forEach(([key, value]) => { if (key in this && value !== undefined) { (this as any)[key] = value;