diff --git a/app/package-lock.json b/app/package-lock.json
index c4d471cb76..e490c72df6 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -12,7 +12,7 @@
"@formatjs/intl-pluralrules": "1.3.9",
"@formatjs/intl-relativetimeformat": "4.5.1",
"@formatjs/intl-utils": "1.6.0",
- "@reportportal/ui-kit": "^0.0.1-alpha.34",
+ "@reportportal/ui-kit": "^0.0.1-alpha.35",
"axios": "1.6.4",
"c3": "0.7.20",
"chart.js": "2.9.4",
@@ -3677,9 +3677,9 @@
"integrity": "sha512-/RVXdLvJxLg4QKvMoM5WlwNR9ViO9z8B/qPcc+C0Sa/teJY7QG7kJ441DwzOjMYEY7GmU4dj5EcGHIkKZiQZCA=="
},
"node_modules/@reportportal/ui-kit": {
- "version": "0.0.1-alpha.34",
- "resolved": "https://registry.npmjs.org/@reportportal/ui-kit/-/ui-kit-0.0.1-alpha.34.tgz",
- "integrity": "sha512-VQfwBAeZ9otmrYTpERBOoGhYMkncnA4Upchw1LH7AflFP26YGlN8Z/nSnTcB5kbqnRDGAFn8/UF2Z7G3/Q09WQ==",
+ "version": "0.0.1-alpha.35",
+ "resolved": "https://registry.npmjs.org/@reportportal/ui-kit/-/ui-kit-0.0.1-alpha.35.tgz",
+ "integrity": "sha512-Ru2VkZfy3KAP62JC4sU1uYYA3EORL6JcaUPFVnNks6Fn+ezPEIdKfI9AAQn0/d1PKVxZT8qx7jvlL+IkNjA5Pg==",
"dependencies": {
"@floating-ui/react": "^0.26.16",
"@floating-ui/react-dom": "^2.0.1",
diff --git a/app/package.json b/app/package.json
index 37b89eed27..7aebfdbde6 100644
--- a/app/package.json
+++ b/app/package.json
@@ -25,7 +25,7 @@
"@formatjs/intl-pluralrules": "1.3.9",
"@formatjs/intl-relativetimeformat": "4.5.1",
"@formatjs/intl-utils": "1.6.0",
- "@reportportal/ui-kit": "^0.0.1-alpha.34",
+ "@reportportal/ui-kit": "^0.0.1-alpha.35",
"axios": "1.6.4",
"c3": "0.7.20",
"chart.js": "2.9.4",
diff --git a/app/src/common/img/newIcons/filter-filled-inline.svg b/app/src/common/img/newIcons/filter-filled-inline.svg
deleted file mode 100644
index 16871d0ff7..0000000000
--- a/app/src/common/img/newIcons/filter-filled-inline.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/app/src/common/img/newIcons/filters-outline-inline.svg b/app/src/common/img/newIcons/filters-outline-inline.svg
deleted file mode 100644
index d0cb45fbdc..0000000000
--- a/app/src/common/img/newIcons/filters-outline-inline.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/app/src/components/main/filterButton/filterButton.jsx b/app/src/components/main/filterButton/filterButton.jsx
index 2bbc115040..92c8b34cc1 100644
--- a/app/src/components/main/filterButton/filterButton.jsx
+++ b/app/src/components/main/filterButton/filterButton.jsx
@@ -17,10 +17,7 @@
import { useEffect, useState } from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames/bind';
-import { Popover } from '@reportportal/ui-kit';
-import Parser from 'html-react-parser';
-import filterIcon from 'common/img/newIcons/filters-outline-inline.svg';
-import filterFilledIcon from 'common/img/newIcons/filter-filled-inline.svg';
+import { Popover, FilterOutlineIcon, FilterFilledIcon } from '@reportportal/ui-kit';
import { FilterContent } from './filterContent';
import styles from './filterButton.scss';
@@ -92,7 +89,7 @@ export const FilterButton = ({
tabIndex={0}
>
- {appliedFiltersCount ? Parser(filterFilledIcon) : Parser(filterIcon)}
+ {appliedFiltersCount ? : }
{appliedFiltersCount ? (
{appliedFiltersCount}
diff --git a/app/src/controllers/pages/selectors.js b/app/src/controllers/pages/selectors.js
index bef6de15cb..94578e6d00 100644
--- a/app/src/controllers/pages/selectors.js
+++ b/app/src/controllers/pages/selectors.js
@@ -161,15 +161,18 @@ export const createFilterQuerySelector = ({
namespace,
} = {}) =>
createSelector(
- createQueryParametersSelector({
+ createAlternativeQueryParametersSelector({
defaultPagination,
defaultSorting,
sortingKey,
namespace,
}),
- ({ [SIZE_KEY]: limit, [SORTING_ORDER_KEY]: sort, [PAGE_KEY]: pageNumber, ...rest }) => {
+ ({ limit, sort, offset, order, ...rest }) => {
return {
- ...getAlternativePaginationAndSortParams(sort, limit, pageNumber),
+ limit,
+ sort,
+ offset,
+ order,
search_criteria: getAppliedFilters(rest)?.search_criterias,
};
},
diff --git a/app/src/pages/organization/projectTeamPage/projectTeamPageHeader/projectTeamPageHeader.jsx b/app/src/pages/organization/projectTeamPage/projectTeamPageHeader/projectTeamPageHeader.jsx
index f943909ce2..a5c3b96ed4 100644
--- a/app/src/pages/organization/projectTeamPage/projectTeamPageHeader/projectTeamPageHeader.jsx
+++ b/app/src/pages/organization/projectTeamPage/projectTeamPageHeader/projectTeamPageHeader.jsx
@@ -17,15 +17,13 @@
import React from 'react';
import { useSelector } from 'react-redux';
import PropTypes from 'prop-types';
-import Parser from 'html-react-parser';
import classNames from 'classnames/bind';
-import { Button } from '@reportportal/ui-kit';
+import { Button, FilterOutlineIcon } from '@reportportal/ui-kit';
import { useIntl } from 'react-intl';
import { projectMembersSelector } from 'controllers/project';
import { SearchField } from 'components/fields/searchField';
import { NAMESPACE, SEARCH_KEY } from 'controllers/members/constants';
import { withFilter } from 'controllers/filter';
-import filterIcon from 'common/img/newIcons/filters-outline-inline.svg';
import { PROJECT_PAGE_EVENTS } from 'components/main/analytics/events/ga4Events/projectPageEvents';
import { messages } from '../../common/membersPage/membersPageHeader/messages';
import { MembersPageHeader } from '../../common/membersPage/membersPageHeader';
@@ -61,7 +59,9 @@ export const ProjectTeamPageHeader = ({
placeholder={formatMessage(messages.searchPlaceholder)}
event={PROJECT_PAGE_EVENTS.SEARCH_PROJECT_TEAM_FIELD}
/>
- {Parser(filterIcon)}
+
+
+
{hasPermission && (