EPMRPP-91556 || Code Review fix - 2

reportportal · Dec 10, 2024 · c4cfe63 · c4cfe63
1 parent 2f5cb38
commit c4cfe63
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 23 deletions.
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git 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
diff --git a/app/src/common/img/newIcons/filters-outline-inline.svg b/app/src/common/img/newIcons/filters-outline-inline.svg
diff --git 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}
       >
         <i className={cx('filter-icon')}>
-          {appliedFiltersCount ? Parser(filterFilledIcon) : Parser(filterIcon)}
+          {appliedFiltersCount ? <FilterFilledIcon /> : <FilterOutlineIcon />}
         </i>
         {appliedFiltersCount ? (
           <span className={cx('filters-count')}>{appliedFiltersCount}</span>

diff --git 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
@@ -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}
               />
-              <i className={cx('filters-icon')}>{Parser(filterIcon)}</i>
+              <i className={cx('filters-icon')}>
+                <FilterOutlineIcon />
+              </i>
             </div>
             {hasPermission && (
               <Button variant={'ghost'} onClick={onInvite}>