Skip to content

Remove Filter.fromTerm method #5438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
greenbonebot merged 1 commit into from
Jul 21, 2026
Merged

Remove Filter.fromTerm method #5438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 0 additions & 29 deletions src/gmp/models/__tests__/filter.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1184,35 +1184,6 @@ describe('Filter tests', () => {
});
});

describe('Filter fromTerm', () => {
test('should add FilterTerm to the Filter.fromElement', () => {
const term = new FilterTerm({
keyword: 'abc',
relation: '=',
value: '1',
});
const filter = Filter.fromTerm(term);

expect(filter.toFilterString()).toEqual('abc=1');
});

test('should add several FilterTerms to the Filter.fromElement', () => {
const term1 = new FilterTerm({
keyword: 'abc',
relation: '=',
value: '1',
});
const term2 = new FilterTerm({
keyword: 'def',
relation: '>',
value: '666',
});
const filter = Filter.fromTerm(term1, term2);

expect(filter.toFilterString()).toEqual('abc=1 def>666');
});
});

describe('Filter toFilterCriteriaString', () => {
test('should return string representation', () => {
const filter1 = createFilterWithTerms('foo=bar and lorem=ipsum');
Expand Down
13 changes: 0 additions & 13 deletions src/gmp/models/filter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,19 +183,6 @@ class Filter extends EntityModel implements FilterType {
return BaseFilter.fromString(filterString, filter);
}

/**
* Creates a new Filter from FilterTerms
*
* @deprecated Use `BaseFilter.fromTerm` instead.
*
* @param term FilterTerms to set for the new Filter
*
* @returns The new Filter
*/
static fromTerm(...term: FilterTerm[]) {
return BaseFilter.fromTerm(...term);
}

toFilterString(): string {
return this.filterTerms.toFilterString();
}
Expand Down
8 changes: 4 additions & 4 deletions src/web/components/dashboard/display/created/CreatedDisplay.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import React from 'react';
import Filter from 'gmp/models/filter';
import BaseFilter from 'gmp/models/filter/base-filter';
import FilterTerm from 'gmp/models/filter/filter-term';
import {isDefined} from 'gmp/utils/identity';
import LineChart, {lineDataPropType} from 'web/components/chart/base/Line';
Expand All @@ -30,7 +30,7 @@ class CreatedDisplay extends React.Component {
let {x: endDate} = end;
const dateFormat = 'YYYY-MM-DDTHH:mm';

let newFilter = isDefined(filter) ? filter.copy() : new Filter();
let newFilter = isDefined(filter) ? filter.copy() : new BaseFilter();

if (isDefined(startDate)) {
if (startDate.isSame(endDate)) {
Expand All @@ -43,7 +43,7 @@ class CreatedDisplay extends React.Component {
);

if (!newFilter.hasTerm(startTerm)) {
newFilter = newFilter.and(Filter.fromTerm(startTerm));
newFilter = newFilter.and(BaseFilter.fromTerm(startTerm));
}
}

Expand All @@ -53,7 +53,7 @@ class CreatedDisplay extends React.Component {
);

if (!newFilter.hasTerm(endTerm)) {
newFilter = newFilter.and(Filter.fromTerm(endTerm));
newFilter = newFilter.and(BaseFilter.fromTerm(endTerm));
}
}

Expand Down
8 changes: 5 additions & 3 deletions src/web/components/dashboard/display/cvss/CvssDisplay.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import React from 'react';
import Filter from 'gmp/models/filter';
import BaseFilter from 'gmp/models/filter/base-filter';
import FilterTerm from 'gmp/models/filter/filter-term';
import {isDefined} from 'gmp/utils/identity';
import BarChart from 'web/components/chart/Bar';
Expand Down Expand Up @@ -48,7 +48,9 @@ const CvssDisplay = ({
return;
}

statusFilter = Filter.fromTerm(startTerm).and(Filter.fromTerm(endTerm));
statusFilter = BaseFilter.fromTerm(startTerm).and(
BaseFilter.fromTerm(endTerm),
);
} else {
let statusTerm;

Expand All @@ -62,7 +64,7 @@ const CvssDisplay = ({
return;
}

statusFilter = Filter.fromTerm(statusTerm);
statusFilter = BaseFilter.fromTerm(statusTerm);
}

const newFilter = isDefined(filter)
Expand Down
9 changes: 6 additions & 3 deletions src/web/components/dashboard/display/severity/SeverityClassDisplay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

import Filter, {type FilterType} from 'gmp/models/filter';
import {type FilterType} from 'gmp/models/filter';
import BaseFilter from 'gmp/models/filter/base-filter';
import {isDefined} from 'gmp/utils/identity';
import DonutChart from 'web/components/chart/Donut';
import DataDisplay, {
Expand Down Expand Up @@ -71,13 +72,15 @@ const SeverityClassDisplay = ({
return;
}

severityFilter = Filter.fromTerm(startTerm).and(Filter.fromTerm(endTerm));
severityFilter = BaseFilter.fromTerm(startTerm).and(
BaseFilter.fromTerm(endTerm),
);
} else {
if (isDefined(filter) && filter.hasTerm(startTerm)) {
return;
}

severityFilter = Filter.fromTerm(startTerm);
severityFilter = BaseFilter.fromTerm(startTerm);
}

const newFilter = isDefined(filter)
Expand Down
4 changes: 2 additions & 2 deletions src/web/components/dashboard/display/status/StatusDisplay.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import React from 'react';
import Filter from 'gmp/models/filter';
import BaseFilter from 'gmp/models/filter/base-filter';
import FilterTerm from 'gmp/models/filter/filter-term';
import {isDefined} from 'gmp/utils/identity';
import DonutChart from 'web/components/chart/Donut';
Expand Down Expand Up @@ -32,7 +32,7 @@ class StatusDisplay extends React.Component {
return;
}

const statusFilter = Filter.fromTerm(statusTerm);
const statusFilter = BaseFilter.fromTerm(statusTerm);
const newFilter = isDefined(filter)
? filter.copy().and(statusFilter)
: statusFilter;
Expand Down
9 changes: 5 additions & 4 deletions src/web/pages/hosts/dashboard/ModifiedDisplay.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@

import React from 'react';
import {_, _l} from 'gmp/locale/lang';
import Filter, {HOSTS_FILTER_FILTER} from 'gmp/models/filter';
import {HOSTS_FILTER_FILTER} from 'gmp/models/filter';
import BaseFilter from 'gmp/models/filter/base-filter';
import FilterTerm from 'gmp/models/filter/filter-term';
import {parseInt, parseDate} from 'gmp/parser';
import {isDefined} from 'gmp/utils/identity';
Expand Down Expand Up @@ -57,7 +58,7 @@ export class HostsModifiedDisplay extends React.Component {
let {x: endDate} = end;
const dateFormat = 'YYYY-MM-DDTHH:mm';

let newFilter = isDefined(filter) ? filter.copy() : new Filter();
let newFilter = isDefined(filter) ? filter.copy() : new BaseFilter();

if (isDefined(startDate)) {
if (startDate.isSame(endDate)) {
Expand All @@ -70,7 +71,7 @@ export class HostsModifiedDisplay extends React.Component {
);

if (!newFilter.hasTerm(startTerm)) {
newFilter = newFilter.and(Filter.fromTerm(startTerm));
newFilter = newFilter.and(BaseFilter.fromTerm(startTerm));
}
}

Expand All @@ -80,7 +81,7 @@ export class HostsModifiedDisplay extends React.Component {
);

if (!newFilter.hasTerm(endTerm)) {
newFilter = newFilter.and(Filter.fromTerm(endTerm));
newFilter = newFilter.and(BaseFilter.fromTerm(endTerm));
}
}

Expand Down
9 changes: 5 additions & 4 deletions src/web/pages/hosts/dashboard/ModifiedHighDisplay.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@

import React from 'react';
import {_, _l} from 'gmp/locale/lang';
import Filter, {HOSTS_FILTER_FILTER} from 'gmp/models/filter';
import {HOSTS_FILTER_FILTER} from 'gmp/models/filter';
import BaseFilter from 'gmp/models/filter/base-filter';
import FilterTerm from 'gmp/models/filter/filter-term';
import {parseInt, parseDate} from 'gmp/parser';
import {isDefined} from 'gmp/utils/identity';
Expand Down Expand Up @@ -58,7 +59,7 @@ export class HostsModifiedHighDisplay extends React.Component {
let {x: endDate} = end;
const dateFormat = 'YYYY-MM-DDTHH:mm';

let newFilter = isDefined(filter) ? filter.copy() : new Filter();
let newFilter = isDefined(filter) ? filter.copy() : new BaseFilter();

if (isDefined(startDate)) {
if (startDate.isSame(endDate)) {
Expand All @@ -71,7 +72,7 @@ export class HostsModifiedHighDisplay extends React.Component {
);

if (!newFilter.hasTerm(startTerm)) {
newFilter = newFilter.and(Filter.fromTerm(startTerm));
newFilter = newFilter.and(BaseFilter.fromTerm(startTerm));
}
}

Expand All @@ -81,7 +82,7 @@ export class HostsModifiedHighDisplay extends React.Component {
);

if (!newFilter.hasTerm(endTerm)) {
newFilter = newFilter.and(Filter.fromTerm(endTerm));
newFilter = newFilter.and(BaseFilter.fromTerm(endTerm));
}
}

Expand Down
5 changes: 3 additions & 2 deletions src/web/pages/notes/dashboard/ActiveDaysDisplay.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@

import React from 'react';
import {_, _l} from 'gmp/locale/lang';
import Filter, {NOTES_FILTER_FILTER} from 'gmp/models/filter';
import {NOTES_FILTER_FILTER} from 'gmp/models/filter';
import BaseFilter from 'gmp/models/filter/base-filter';
import FilterTerm from 'gmp/models/filter/filter-term';
import {
NOTE_ACTIVE_UNLIMITED_VALUE,
Expand Down Expand Up @@ -116,7 +117,7 @@ export class NotesActiveDaysDisplay extends React.Component {
if (isDefined(filter) && filter.hasTerm(activeDaysTerm)) {
return;
}
const activeDaysFilter = Filter.fromTerm(activeDaysTerm);
const activeDaysFilter = BaseFilter.fromTerm(activeDaysTerm);

const newFilter = isDefined(filter)
? filter.copy().and(activeDaysFilter)
Expand Down
5 changes: 3 additions & 2 deletions src/web/pages/notes/dashboard/WordCloudDisplay.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@

import React from 'react';
import {_, _l} from 'gmp/locale/lang';
import Filter, {NOTES_FILTER_FILTER} from 'gmp/models/filter';
import {NOTES_FILTER_FILTER} from 'gmp/models/filter';
import BaseFilter from 'gmp/models/filter/base-filter';
import FilterTerm from 'gmp/models/filter/filter-term';
import {parseFloat} from 'gmp/parser';
import {isDefined} from 'gmp/utils/identity';
Expand Down Expand Up @@ -56,7 +57,7 @@ export class NotesWordCloudDisplay extends React.Component {
if (isDefined(filter) && filter.hasTerm(wordTerm)) {
return;
}
wordFilter = Filter.fromTerm(wordTerm);
wordFilter = BaseFilter.fromTerm(wordTerm);
}

const newFilter = isDefined(filter)
Expand Down
5 changes: 3 additions & 2 deletions src/web/pages/nvts/dashboard/FamilyDisplay.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@

import React from 'react';
import {_, _l} from 'gmp/locale/lang';
import Filter, {NVTS_FILTER_FILTER} from 'gmp/models/filter';
import {NVTS_FILTER_FILTER} from 'gmp/models/filter';
import BaseFilter from 'gmp/models/filter/base-filter';
import FilterTerm from 'gmp/models/filter/filter-term';
import {parseFloat, parseSeverity} from 'gmp/parser';
import {isDefined} from 'gmp/utils/identity';
Expand Down Expand Up @@ -85,7 +86,7 @@ export class NvtsFamilyDisplay extends React.Component {
if (isDefined(filter) && filter.hasTerm(familyTerm)) {
return;
}
familyFilter = Filter.fromTerm(familyTerm);
familyFilter = BaseFilter.fromTerm(familyTerm);
}

const newFilter = isDefined(filter)
Expand Down
5 changes: 3 additions & 2 deletions src/web/pages/nvts/dashboard/QodDisplay.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@

import React from 'react';
import {_, _l} from 'gmp/locale/lang';
import Filter, {NVTS_FILTER_FILTER} from 'gmp/models/filter';
import {NVTS_FILTER_FILTER} from 'gmp/models/filter';
import BaseFilter from 'gmp/models/filter/base-filter';
import FilterTerm from 'gmp/models/filter/filter-term';
import {parseFloat} from 'gmp/parser';
import {isDefined} from 'gmp/utils/identity';
Expand Down Expand Up @@ -66,7 +67,7 @@ export class NvtsQodDisplay extends React.Component {
if (isDefined(filter) && filter.hasTerm(qodTerm)) {
return;
}
const qodFilter = Filter.fromTerm(qodTerm);
const qodFilter = BaseFilter.fromTerm(qodTerm);

const newFilter = isDefined(filter)
? filter.copy().and(qodFilter)
Expand Down
5 changes: 3 additions & 2 deletions src/web/pages/nvts/dashboard/QodTypeDisplay.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@

import React from 'react';
import {_, _l} from 'gmp/locale/lang';
import Filter, {NVTS_FILTER_FILTER} from 'gmp/models/filter';
import {NVTS_FILTER_FILTER} from 'gmp/models/filter';
import BaseFilter from 'gmp/models/filter/base-filter';
import FilterTerm from 'gmp/models/filter/filter-term';
import {isDefined} from 'gmp/utils/identity';
import DonutChart from 'web/components/chart/Donut';
Expand Down Expand Up @@ -65,7 +66,7 @@ export class NvtsQodTypeDisplay extends React.Component {
if (isDefined(filter) && filter.hasTerm(qodTypeTerm)) {
return;
}
const qodTypeFilter = Filter.fromTerm(qodTypeTerm);
const qodTypeFilter = BaseFilter.fromTerm(qodTypeTerm);

const newFilter = isDefined(filter)
? filter.copy().and(qodTypeFilter)
Expand Down
5 changes: 3 additions & 2 deletions src/web/pages/overrides/dashboard/ActiveDaysDisplay.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@

import React from 'react';
import {_, _l} from 'gmp/locale/lang';
import Filter, {OVERRIDES_FILTER_FILTER} from 'gmp/models/filter';
import {OVERRIDES_FILTER_FILTER} from 'gmp/models/filter';
import BaseFilter from 'gmp/models/filter/base-filter';
import FilterTerm from 'gmp/models/filter/filter-term';
import {parseFloat} from 'gmp/parser';
import {isDefined} from 'gmp/utils/identity';
Expand Down Expand Up @@ -115,7 +116,7 @@ export class OverridesActiveDaysDisplay extends React.Component {
if (isDefined(filter) && filter.hasTerm(activeDaysTerm)) {
return;
}
const activeDaysFilter = Filter.fromTerm(activeDaysTerm);
const activeDaysFilter = BaseFilter.fromTerm(activeDaysTerm);

const newFilter = isDefined(filter)
? filter.copy().and(activeDaysFilter)
Expand Down
5 changes: 3 additions & 2 deletions src/web/pages/overrides/dashboard/WordCloudDisplay.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@

import React from 'react';
import {_, _l} from 'gmp/locale/lang';
import Filter, {OVERRIDES_FILTER_FILTER} from 'gmp/models/filter';
import {OVERRIDES_FILTER_FILTER} from 'gmp/models/filter';
import BaseFilter from 'gmp/models/filter/base-filter';
import FilterTerm from 'gmp/models/filter/filter-term';
import {parseFloat} from 'gmp/parser';
import {isDefined} from 'gmp/utils/identity';
Expand Down Expand Up @@ -56,7 +57,7 @@ export class OverridesWordCloudDisplay extends React.Component {
if (isDefined(filter) && filter.hasTerm(wordTerm)) {
return;
}
wordFilter = Filter.fromTerm(wordTerm);
wordFilter = BaseFilter.fromTerm(wordTerm);
}

const newFilter = isDefined(filter)
Expand Down
Loading
Loading