Remove console.log from FilterItem merge method
Remove debug console.log statements Remove console.log from FilterItem merge method
This commit is contained in:
parent
7c40851dcb
commit
8769f8c94c
4 changed files with 10 additions and 15 deletions
|
|
@ -189,8 +189,6 @@ function FilterSeries(props: Props) {
|
||||||
observeChanges();
|
observeChanges();
|
||||||
};
|
};
|
||||||
|
|
||||||
console.log('series', series);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
{canExclude && <ExcludeFilters filter={series.filter} />}
|
{canExclude && <ExcludeFilters filter={series.filter} />}
|
||||||
|
|
|
||||||
|
|
@ -10,11 +10,11 @@ import FilterSource from '../FilterSource';
|
||||||
import { useStore } from '@/mstore';
|
import { useStore } from '@/mstore';
|
||||||
import { getIconForFilter } from 'Shared/Filters/FilterModal/FilterModal';
|
import { getIconForFilter } from 'Shared/Filters/FilterModal/FilterModal';
|
||||||
import { Filter, getOperatorsByType } from '@/mstore/types/filterConstants';
|
import { Filter, getOperatorsByType } from '@/mstore/types/filterConstants';
|
||||||
import { FilterItemData } from '@/mstore/types/filterItem';
|
import { IFilter } from '@/mstore/types/filterItem';
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
filterIndex?: number;
|
filterIndex?: number;
|
||||||
filter: FilterItemData;
|
filter: IFilter;
|
||||||
onUpdate: (filter: any) => void;
|
onUpdate: (filter: any) => void;
|
||||||
onRemoveFilter: () => void;
|
onRemoveFilter: () => void;
|
||||||
isFilter?: boolean;
|
isFilter?: boolean;
|
||||||
|
|
@ -141,16 +141,12 @@ function FilterItem(props: Props) {
|
||||||
return () => {
|
return () => {
|
||||||
isMounted = false; // Cleanup on unmount
|
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]); //
|
}, [filter.name, filter.isEvent, isSubItem, filterStore]); //
|
||||||
|
|
||||||
console.log('filter...', filter);
|
// const isUserEvent = useMemo(
|
||||||
|
// () => filter.isEvent && !filter.autoCaptured,
|
||||||
const isUserEvent = useMemo(
|
// [filter.isEvent, filter.autoCaptured],
|
||||||
() => filter.isEvent && !filter.autoCaptured,
|
// );
|
||||||
[filter.isEvent, filter.autoCaptured],
|
|
||||||
);
|
|
||||||
|
|
||||||
const canShowValues = useMemo(
|
const canShowValues = useMemo(
|
||||||
() =>
|
() =>
|
||||||
|
|
|
||||||
|
|
@ -255,7 +255,7 @@ export const OPERATORS = {
|
||||||
|
|
||||||
export const COMMON_FILTERS: Filter[] = [];
|
export const COMMON_FILTERS: Filter[] = [];
|
||||||
|
|
||||||
export const getOperatorsByType = (type: string): Operator[] => {
|
export const getOperatorsByType = (type?: string): Operator[] => {
|
||||||
let operators: Operator[] = [];
|
let operators: Operator[] = [];
|
||||||
|
|
||||||
switch (type?.toLowerCase()) {
|
switch (type?.toLowerCase()) {
|
||||||
|
|
|
||||||
|
|
@ -25,11 +25,13 @@ export interface IFilter {
|
||||||
propertyOrder?: string;
|
propertyOrder?: string;
|
||||||
filters?: IFilter[];
|
filters?: IFilter[];
|
||||||
autoOpen?: boolean;
|
autoOpen?: boolean;
|
||||||
|
|
||||||
|
[key: string]: any;
|
||||||
}
|
}
|
||||||
|
|
||||||
type FilterItemKeys = keyof IFilter;
|
type FilterItemKeys = keyof IFilter;
|
||||||
|
|
||||||
export default class FilterItem {
|
export default class FilterItem implements IFilter {
|
||||||
id: string = '';
|
id: string = '';
|
||||||
name: string = '';
|
name: string = '';
|
||||||
displayName?: string = '';
|
displayName?: string = '';
|
||||||
|
|
@ -80,7 +82,6 @@ export default class FilterItem {
|
||||||
}
|
}
|
||||||
|
|
||||||
merge(data: IFilter): void {
|
merge(data: IFilter): void {
|
||||||
console.log('Object.entries(data)', Object.entries(data));
|
|
||||||
Object.entries(data).forEach(([key, value]) => {
|
Object.entries(data).forEach(([key, value]) => {
|
||||||
if (key in this && value !== undefined) {
|
if (key in this && value !== undefined) {
|
||||||
(this as any)[key] = value;
|
(this as any)[key] = value;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue