move FilterCompare type to model

jpinsonneau · jpinsonneau · commit 526601863d0a · 2025-07-23T11:05:41.000+02:00
diff --git a/web/locales/en/plugin__netobserv-plugin.json b/web/locales/en/plugin__netobserv-plugin.json
@@ -362,11 +362,6 @@
   "Expand": "Expand",
   "Default filters": "Default filters",
   "Some filters have been automatically disabled": "Some filters have been automatically disabled",
-  "Contains": "Contains",
-  "Not contains": "Not contains",
-  "Not equals": "Not equals",
-  "More than": "More than",
-  "Equals": "Equals",
   "Learn more": "Learn more",
   "Filter already exists": "Filter already exists",
   "More than operator is not allowed with `{{searchValue}}`. Use equals or contains operators instead.": "More than operator is not allowed with `{{searchValue}}`. Use equals or contains operators instead.",
@@ -418,6 +413,11 @@
   "Columns": "Columns",
   "Export view": "Export view",
   "Observe": "Observe",
+  "Contains": "Contains",
+  "Not contains": "Not contains",
+  "Not equals": "Not equals",
+  "More than": "More than",
+  "Equals": "Equals",
   "External": "External",
   "Last 5 minutes": "Last 5 minutes",
   "Last 15 minutes": "Last 15 minutes",
diff --git a/web/src/components/__tests-data__/filters.ts b/web/src/components/__tests-data__/filters.ts
@@ -1,7 +1,6 @@
 /* eslint-disable max-len */
-import { Filter, FilterId, FilterValue } from '../../model/filters';
+import { Filter, FilterCompare, FilterId, FilterValue } from '../../model/filters';
 import { findFilter, getFilterDefinitions } from '../../utils/filter-definitions';
-import { FilterCompare } from '../toolbar/filters/compare-filter';
 import { ColumnConfigSampleDefs } from './columns';
 
 export const FilterConfigSampleDefs = [
diff --git a/web/src/components/drawer/element/__tests__/element-panel.spec.tsx b/web/src/components/drawer/element/__tests__/element-panel.spec.tsx
@@ -4,9 +4,8 @@ import { waitFor } from '@testing-library/react';
 import { mount, shallow } from 'enzyme';
 import * as React from 'react';
 import { TopologyMetrics } from '../../../../api/loki';
-import { FilterCompare } from '../../../../components/toolbar/filters/compare-filter';
 import { actOn, waitForRender } from '../../../../components/__tests__/common.spec';
-import { Filters } from '../../../../model/filters';
+import { FilterCompare, Filters } from '../../../../model/filters';
 import { FlowScope, MetricType } from '../../../../model/flow-query';
 import { NodeData } from '../../../../model/topology';
 import { createPeer } from '../../../../utils/metrics';
diff --git a/web/src/components/drawer/record/record-panel.tsx b/web/src/components/drawer/record/record-panel.tsx
@@ -25,10 +25,10 @@ import _ from 'lodash';
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { FlowDirection, getDirectionDisplayString, Record } from '../../../api/ipfix';
-import { FilterCompare } from '../../../components/toolbar/filters/compare-filter';
 import {
   doesIncludeFilter,
   Filter,
+  FilterCompare,
   FilterDefinition,
   findFromFilters,
   removeFromFilters
diff --git a/web/src/components/netflow-traffic-tab.tsx b/web/src/components/netflow-traffic-tab.tsx
@@ -12,13 +12,12 @@ import _ from 'lodash';
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { Config, defaultConfig } from '../model/config';
-import { Filters } from '../model/filters';
+import { FilterCompare, Filters } from '../model/filters';
 import { loadConfig } from '../utils/config';
 import { findFilter, getFilterDefinitions } from '../utils/filter-definitions';
 import { usePrevious } from '../utils/previous-hook';
 import Error from './messages/error';
 import NetflowTrafficParent from './netflow-traffic-parent';
-import { FilterCompare } from './toolbar/filters/compare-filter';
 
 type NetflowTrafficTabProps<R extends K8sResourceCommon = K8sResourceCommon> = {
   match?: {
diff --git a/web/src/components/toolbar/filters-toolbar.tsx b/web/src/components/toolbar/filters-toolbar.tsx
@@ -3,15 +3,14 @@ import { CompressIcon, ExpandIcon } from '@patternfly/react-icons';
 import * as _ from 'lodash';
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
-import { Filter, FilterDefinition, Filters } from '../../model/filters';
+import { Filter, FilterCompare, FilterDefinition, Filters } from '../../model/filters';
 import { QuickFilter } from '../../model/quick-filters';
 import { autoCompleteCache } from '../../utils/autocomplete-cache';
 import { findFilter, matcher } from '../../utils/filter-definitions';
 import { Indicator } from '../../utils/filters-helper';
 import { localStorageShowFiltersKey, useLocalStorage } from '../../utils/local-storage-hook';
 import { QueryOptionsDropdown, QueryOptionsProps } from '../dropdowns/query-options-dropdown';
 import './filters-toolbar.css';
-import { FilterCompare } from './filters/compare-filter';
 import { FilterSearchInput } from './filters/filter-search-input';
 import { FiltersChips } from './filters/filters-chips';
 import { QuickFilters } from './filters/quick-filters';
diff --git a/web/src/components/toolbar/filters/__tests__/compare-filter.spec.tsx b/web/src/components/toolbar/filters/__tests__/compare-filter.spec.tsx
@@ -1,7 +1,8 @@
 import { mount, shallow } from 'enzyme';
 import * as React from 'react';
 import { actOn, waitForRender } from '../../../../components/__tests__/common.spec';
-import CompareFilter, { CompareFilterProps, FilterCompare } from '../compare-filter';
+import { FilterCompare } from '../../../../model/filters';
+import CompareFilter, { CompareFilterProps } from '../compare-filter';
 
 describe('<CompareFilter />', () => {
   const props: CompareFilterProps = {
diff --git a/web/src/components/toolbar/filters/__tests__/filter-search-input.spec.tsx b/web/src/components/toolbar/filters/__tests__/filter-search-input.spec.tsx
@@ -1,9 +1,9 @@
 import { SearchInput } from '@patternfly/react-core';
 import { mount } from 'enzyme';
 import * as React from 'react';
+import { FilterCompare } from '../../../../model/filters';
 import { FilterDefinitionSample } from '../../../__tests-data__/filters';
 import { actOn } from '../../../__tests__/common.spec';
-import { FilterCompare } from '../compare-filter';
 import FilterSearchInput, { FilterSearchInputProps } from '../filter-search-input';
 
 describe('<FilterSearchInput />', () => {
diff --git a/web/src/components/toolbar/filters/compare-filter.tsx b/web/src/components/toolbar/filters/compare-filter.tsx
@@ -1,33 +1,9 @@
 import { Badge, Dropdown, DropdownItem, MenuToggle, MenuToggleElement } from '@patternfly/react-core';
 import * as React from 'react';
-import { TFunction, useTranslation } from 'react-i18next';
-import { FilterComponent } from '../../../model/filters';
+import { useTranslation } from 'react-i18next';
+import { FilterCompare, FilterComponent, getCompareText } from '../../../model/filters';
 import { usePrevious } from '../../../utils/previous-hook';
 
-export enum FilterCompare {
-  match = '~',
-  notMatch = '!~',
-  equal = '=',
-  notEqual = '!=',
-  moreThanOrEqual = '>='
-}
-
-export const getCompareText = (v: FilterCompare, t: TFunction) => {
-  switch (v) {
-    case FilterCompare.match:
-      return t('Contains');
-    case FilterCompare.notMatch:
-      return t('Not contains');
-    case FilterCompare.notEqual:
-      return t('Not equals');
-    case FilterCompare.moreThanOrEqual:
-      return t('More than');
-    case FilterCompare.equal:
-    default:
-      return t('Equals');
-  }
-};
-
 export interface CompareFilterProps {
   value: FilterCompare;
   setValue: (newState: FilterCompare) => void;
diff --git a/web/src/components/toolbar/filters/filter-search-input.tsx b/web/src/components/toolbar/filters/filter-search-input.tsx
@@ -17,15 +17,23 @@ import {
 import _ from 'lodash';
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
-import { FilterDefinition, FilterOption, Filters, FilterValue, findFromFilters } from '../../../model/filters';
+import {
+  FilterCompare,
+  FilterDefinition,
+  FilterOption,
+  Filters,
+  FilterValue,
+  findFromFilters,
+  getCompareText
+} from '../../../model/filters';
 import { getHTTPErrorDetails } from '../../../utils/errors';
 import { matcher } from '../../../utils/filter-definitions';
 import { Indicator, setTargeteableFilters } from '../../../utils/filters-helper';
 import { useOutsideClickEvent } from '../../../utils/outside-hook';
 import { usePrevious } from '../../../utils/previous-hook';
 import { Direction } from '../filters-toolbar';
 import AutocompleteFilter from './autocomplete-filter';
-import CompareFilter, { FilterCompare, getCompareText } from './compare-filter';
+import CompareFilter from './compare-filter';
 import { FilterHints } from './filter-hints';
 import './filter-search-input.css';
 import FiltersDropdown from './filters-dropdown';
diff --git a/web/src/components/toolbar/filters/filters-chips.tsx b/web/src/components/toolbar/filters/filters-chips.tsx
@@ -30,6 +30,7 @@ import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import {
   Filter,
+  FilterCompare,
   FilterDefinition,
   Filters,
   filtersEqual,
@@ -52,7 +53,6 @@ import { getPathWithParams, netflowTrafficPath } from '../../../utils/url';
 import { MatchDropdown } from '../../dropdowns/match-dropdown';
 import { navigate } from '../../dynamic-loader/dynamic-loader';
 import { LinksOverflow } from '../links-overflow';
-import { FilterCompare } from './compare-filter';
 import './filters-chips.css';
 
 export interface FiltersChipsProps {
diff --git a/web/src/model/__tests__/filters.spec.ts b/web/src/model/__tests__/filters.spec.ts
@@ -1,7 +1,6 @@
-import { FilterCompare } from '../../components/toolbar/filters/compare-filter';
 import { FilterDefinitionSample } from '../../components/__tests-data__/filters';
 import { findFilter } from '../../utils/filter-definitions';
-import { doesIncludeFilter, Filter, filtersEqual } from '../filters';
+import { doesIncludeFilter, Filter, FilterCompare, filtersEqual } from '../filters';
 import { filtersToString } from '../flow-query';
 
 describe('doesIncludeFilter', () => {
diff --git a/web/src/model/filters.ts b/web/src/model/filters.ts
@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { FilterCompare } from '../components/toolbar/filters/compare-filter';
+import { TFunction } from 'react-i18next';
 import { isEqual } from '../utils/base-compare';
 import { undefinedValue } from '../utils/filter-definitions';
 import { Match } from './flow-query';
@@ -10,6 +10,30 @@ export type FilterComponent = 'autocomplete' | 'text' | 'number';
 
 export type FilterCategory = 'source' | 'destination' | 'targeteable';
 
+export enum FilterCompare {
+  match = '~',
+  notMatch = '!~',
+  equal = '=',
+  notEqual = '!=',
+  moreThanOrEqual = '>='
+}
+
+export const getCompareText = (v: FilterCompare, t: TFunction) => {
+  switch (v) {
+    case FilterCompare.match:
+      return t('Contains');
+    case FilterCompare.notMatch:
+      return t('Not contains');
+    case FilterCompare.notEqual:
+      return t('Not equals');
+    case FilterCompare.moreThanOrEqual:
+      return t('More than');
+    case FilterCompare.equal:
+    default:
+      return t('Equals');
+  }
+};
+
 export type TargetedFilterId =
   | 'zone'
   | 'namespace'
diff --git a/web/src/model/quick-filters.ts b/web/src/model/quick-filters.ts
@@ -1,6 +1,5 @@
-import { FilterCompare } from '../components/toolbar/filters/compare-filter';
 import { findFilter } from '../utils/filter-definitions';
-import { Filter, FilterDefinition, fromFilterKey } from './filters';
+import { Filter, FilterCompare, FilterDefinition, fromFilterKey } from './filters';
 
 export type RawQuickFilter = {
   name: string;
diff --git a/web/src/model/topology.ts b/web/src/model/topology.ts
@@ -17,8 +17,7 @@ import { TFunction } from 'i18next';
 import _ from 'lodash';
 import { MetricStats, TopologyMetricPeer, TopologyMetrics } from '../api/loki';
 import { TruncateLength } from '../components/dropdowns/truncate-dropdown';
-import { FilterCompare } from '../components/toolbar/filters/compare-filter';
-import { Filter, FilterDefinition, FilterId, Filters, findFromFilters } from '../model/filters';
+import { Filter, FilterCompare, FilterDefinition, FilterId, Filters, findFromFilters } from '../model/filters';
 import { ContextSingleton } from '../utils/context';
 import { findFilter } from '../utils/filter-definitions';
 import { getTopologyEdgeId } from '../utils/ids';
diff --git a/web/src/utils/__tests__/back-and-forth.spec.ts b/web/src/utils/__tests__/back-and-forth.spec.ts
@@ -1,9 +1,8 @@
 import { FlowMetricsResult, RawTopologyMetrics } from '../../api/loki';
 import { getFlowMetrics, getFlowRecords } from '../../api/routes';
-import { FilterCompare } from '../../components/toolbar/filters/compare-filter';
 import { FilterDefinitionSample } from '../../components/__tests-data__/filters';
 import { ScopeDefSample } from '../../components/__tests-data__/scopes';
-import { Filter, FilterId, Filters, FilterValue } from '../../model/filters';
+import { Filter, FilterCompare, FilterId, Filters, FilterValue } from '../../model/filters';
 import { filtersToString } from '../../model/flow-query';
 import { getFetchFunctions, mergeMetricsBNF } from '../back-and-forth';
 import { ContextSingleton } from '../context';
diff --git a/web/src/utils/__tests__/router.spec.ts b/web/src/utils/__tests__/router.spec.ts
@@ -1,7 +1,6 @@
 import { setNavFunction } from '../../components/dynamic-loader/dynamic-loader';
-import { FilterCompare } from '../../components/toolbar/filters/compare-filter';
 import { FilterDefinitionSample } from '../../components/__tests-data__/filters';
-import { Filters } from '../../model/filters';
+import { FilterCompare, Filters } from '../../model/filters';
 import { findFilter } from '../filter-definitions';
 import { getFiltersFromURL, setURLFilters } from '../router';
 
diff --git a/web/src/utils/filter-definitions.ts b/web/src/utils/filter-definitions.ts
@@ -1,10 +1,10 @@
 import { TFunction } from 'i18next';
 import * as _ from 'lodash';
 import { Field } from '../api/ipfix';
-import { FilterCompare } from '../components/toolbar/filters/compare-filter';
 import { Config } from '../model/config';
 import {
   FilterCategory,
+  FilterCompare,
   FilterComponent,
   FilterConfigDef,
   FilterDefinition,
diff --git a/web/src/utils/router.ts b/web/src/utils/router.ts
@@ -1,5 +1,12 @@
-import { FilterCompare } from '../components/toolbar/filters/compare-filter';
-import { createFilterValue, DisabledFilters, Filter, FilterDefinition, Filters, fromFilterKey } from '../model/filters';
+import {
+  createFilterValue,
+  DisabledFilters,
+  Filter,
+  FilterCompare,
+  FilterDefinition,
+  Filters,
+  fromFilterKey
+} from '../model/filters';
 import { DataSource, Match, MetricType, PacketLoss, RecordType, StatFunction } from '../model/flow-query';
 import { TimeRange } from './datetime';
 import { findFilter } from './filter-definitions';
