Skip to content

Commit

Permalink
refactor: fix the failing test by moving QuickFilters types to types.tsx
Browse files Browse the repository at this point in the history
  • Loading branch information
ahmadshaheer committed Jan 28, 2025
1 parent c5512d2 commit c5b2d8b
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 48 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import cx from 'classnames';
import {
IQuickFiltersConfig,
QuickFiltersSource,
} from 'components/QuickFilters/QuickFilters';
} from 'components/QuickFilters/types';
import { OPERATORS } from 'constants/queryBuilder';
import { DEBOUNCE_DELAY } from 'constants/queryBuilderFilterConfig';
import { getOperatorValue } from 'container/QueryBuilder/filters/QueryBuilderSearch/utils';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import './Slider.styles.scss';

import { IQuickFiltersConfig } from 'components/QuickFilters/QuickFilters';
import { IQuickFiltersConfig } from 'components/QuickFilters/types';

interface ISliderProps {
filter: IQuickFiltersConfig;
Expand Down
42 changes: 1 addition & 41 deletions frontend/src/components/QuickFilters/QuickFilters.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,51 +8,11 @@ import {
import { Tooltip, Typography } from 'antd';
import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
import { cloneDeep, isFunction } from 'lodash-es';
import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';
import { Query } from 'types/api/queryBuilder/queryBuilderData';
import { DataSource } from 'types/common/queryBuilder';

import Checkbox from './FilterRenderers/Checkbox/Checkbox';
import Slider from './FilterRenderers/Slider/Slider';

export enum FiltersType {
SLIDER = 'SLIDER',
CHECKBOX = 'CHECKBOX',
}

export enum MinMax {
MIN = 'MIN',
MAX = 'MAX',
}

export enum SpecficFilterOperations {
ALL = 'ALL',
ONLY = 'ONLY',
}

export interface IQuickFiltersConfig {
type: FiltersType;
title: string;
attributeKey: BaseAutocompleteData;
aggregateOperator?: string;
aggregateAttribute?: string;
dataSource?: DataSource;
customRendererForValue?: (value: string) => JSX.Element;
defaultOpen: boolean;
}

export enum QuickFiltersSource {
LOGS_EXPLORER = 'logs-explorer',
INFRA_MONITORING = 'infra-monitoring',
TRACES_EXPLORER = 'traces-explorer',
}

interface IQuickFiltersProps {
config: IQuickFiltersConfig[];
handleFilterVisibilityChange: () => void;
source: QuickFiltersSource;
onFilterChange?: (query: Query) => void;
}
import { FiltersType, IQuickFiltersProps, QuickFiltersSource } from './types';

export default function QuickFilters(props: IQuickFiltersProps): JSX.Element {
const { config, handleFilterVisibilityChange, source, onFilterChange } = props;
Expand Down
42 changes: 42 additions & 0 deletions frontend/src/components/QuickFilters/types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';
import { Query } from 'types/api/queryBuilder/queryBuilderData';
import { DataSource } from 'types/common/queryBuilder';

export enum FiltersType {
SLIDER = 'SLIDER',
CHECKBOX = 'CHECKBOX',
}

export enum MinMax {
MIN = 'MIN',
MAX = 'MAX',
}

export enum SpecficFilterOperations {
ALL = 'ALL',
ONLY = 'ONLY',
}

export interface IQuickFiltersConfig {
type: FiltersType;
title: string;
attributeKey: BaseAutocompleteData;
aggregateOperator?: string;
aggregateAttribute?: string;
dataSource?: DataSource;
customRendererForValue?: (value: string) => JSX.Element;
defaultOpen: boolean;
}

export interface IQuickFiltersProps {
config: IQuickFiltersConfig[];
handleFilterVisibilityChange: () => void;
source: QuickFiltersSource;
onFilterChange?: (query: Query) => void;
}

export enum QuickFiltersSource {
LOGS_EXPLORER = 'logs-explorer',
INFRA_MONITORING = 'infra-monitoring',
TRACES_EXPLORER = 'traces-explorer',
}
2 changes: 1 addition & 1 deletion frontend/src/container/InfraMonitoringK8s/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import {
FiltersType,
IQuickFiltersConfig,
} from 'components/QuickFilters/QuickFilters';
} from 'components/QuickFilters/types';
import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
import { DataSource } from 'types/common/queryBuilder';

Expand Down
5 changes: 2 additions & 3 deletions frontend/src/pages/LogsExplorer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ import getLocalStorageKey from 'api/browser/localstorage/get';
import setLocalStorageApi from 'api/browser/localstorage/set';
import cx from 'classnames';
import ExplorerCard from 'components/ExplorerCard/ExplorerCard';
import QuickFilters, {
QuickFiltersSource,
} from 'components/QuickFilters/QuickFilters';
import QuickFilters from 'components/QuickFilters/QuickFilters';
import { QuickFiltersSource } from 'components/QuickFilters/types';
import { LOCALSTORAGE } from 'constants/localStorage';
import LogExplorerQuerySection from 'container/LogExplorerQuerySection';
import LogsExplorerViews from 'container/LogsExplorerViews';
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/LogsExplorer/utils.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
FiltersType,
IQuickFiltersConfig,
} from 'components/QuickFilters/QuickFilters';
} from 'components/QuickFilters/types';
import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
import { Query } from 'types/api/queryBuilder/queryBuilderData';

Expand Down

0 comments on commit c5b2d8b

Please sign in to comment.