EPMRPP-92028 || Code Review fix - 1

reportportal · Sep 6, 2024 · 23a5c64 · 23a5c64
1 parent f8d13c8
commit 23a5c64
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/app/src/pages/inside/common/launchFiltersToolbar/filtersActionBar/filtersActionBar.jsx b/app/src/pages/inside/common/launchFiltersToolbar/filtersActionBar/filtersActionBar.jsx
@@ -41,12 +41,12 @@ export const FiltersActionBar = ({
   sortingString,
 }) => {
   const userRoles = useSelector(userRolesSelector);
-  const isWorkWithFilters = canWorkWithFilters(userRoles);
+  const hasFilterPermissions = canWorkWithFilters(userRoles);
 
   return (
     <div className={cx('filters-action-bar')}>
       <div className={cx('info-section')}>
-        {isWorkWithFilters && unsaved && (
+        {hasFilterPermissions && unsaved && (
           <div className={cx('unsaved-message')}>
             <span className={cx('asterisk')}>*</span>
             <FormattedMessage
@@ -58,7 +58,7 @@ export const FiltersActionBar = ({
       </div>
       <div className={cx('controls-section')}>
         <FiltersSorting filter={filter} sortingString={sortingString} onChange={onChangeSorting} />
-        {isWorkWithFilters && (
+        {hasFilterPermissions && (
           <FilterControls
             cloneDisabled={cloneDisabled}
             editDisabled={editDisabled}

diff --git a/app/src/pages/inside/common/launchFiltersToolbar/launchFiltersToolbar.jsx b/app/src/pages/inside/common/launchFiltersToolbar/launchFiltersToolbar.jsx
@@ -227,8 +227,8 @@ export class LaunchFiltersToolbar extends Component {
   isDiscardDisabled = () => !this.isFilterDirty();
   isEditDisabled = () => this.isFilterUnsaved() || this.isNewFilter();
 
-  getFilterMessage = (isWorkWithFilters) => {
-    if (isWorkWithFilters) {
+  getFilterMessage = (hasFilterPermissions) => {
+    if (hasFilterPermissions) {
       return <FormattedMessage id="LaunchFiltersToolbar.addFilter" defaultMessage="Add filter" />;
     }
 
@@ -239,8 +239,8 @@ export class LaunchFiltersToolbar extends Component {
     );
   };
 
-  getFilterIcon = (isWorkWithFilters) => {
-    if (isWorkWithFilters) {
+  getFilterIcon = (hasFilterPermissions) => {
+    if (hasFilterPermissions) {
       return AddFilterIcon;
     }
 
@@ -269,7 +269,7 @@ export class LaunchFiltersToolbar extends Component {
       intl,
     } = this.props;
 
-    const isWorkWithFilters = canWorkWithFilters(userRoles);
+    const hasFilterPermissions = canWorkWithFilters(userRoles);
 
     return (
       <div className={cx('launch-filters-toolbar')}>
@@ -285,13 +285,13 @@ export class LaunchFiltersToolbar extends Component {
           <div className={cx('separator')} />
           <div className={cx('add-filter-button')}>
             <GhostButton
-              icon={this.getFilterIcon(isWorkWithFilters)}
+              icon={this.getFilterIcon(hasFilterPermissions)}
               onClick={this.handleFilterCreate}
             >
-              {this.getFilterMessage(isWorkWithFilters)}
+              {this.getFilterMessage(hasFilterPermissions)}
             </GhostButton>
           </div>
-          {isWorkWithFilters && (
+          {hasFilterPermissions && (
             <div className={cx('filter-tickets-container')}>
               <FilterList
                 filters={filters}
@@ -311,7 +311,7 @@ export class LaunchFiltersToolbar extends Component {
         {this.state.expanded &&
           !level &&
           !!activeFilter &&
-          (isWorkWithFilters || this.state.isFilterCreate) && (
+          (hasFilterPermissions || this.state.isFilterCreate) && (
             <div className={cx('filter-controls-container')}>
               <div className={cx('filter-entities-container')}>
                 <EntitiesGroup