Skip to content

Commit c58c052

Browse files
committed
EPMRPP-80259 || code review fixes - 1
1 parent b5555ca commit c58c052

File tree

7 files changed

+26
-19
lines changed

7 files changed

+26
-19
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
NODE_OPTIONS: '--max_old_space_size=2048'
3434

3535
run: |
36-
npm --prefix ${{ env.UI_BUILD_REACT }} ci
36+
npm --prefix ${{ env.UI_BUILD_REACT }} ci --legacy-peer-deps
3737
npm --prefix ${{ env.UI_BUILD_REACT }} run lint
3838
npm --prefix ${{ env.UI_BUILD_REACT }} run test:coverage
3939
npm --prefix ${{ env.UI_BUILD_REACT }} run build

app/Readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ To launch the development environment, follow these steps:
1010

1111
1. open console from the project root
1212
2. run the command `cd app`
13-
3. run the command `npm install`
13+
3. run the command `npm install --legacy-peer-deps`
1414
4. to proxy requests to the server, create `.env` file in `app` folder
1515

1616
```

app/src/componentLibrary/autocompletes/common/autocompleteMenu/autocompleteMenu.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
/* eslint-disable react/no-unknown-property */
18-
1917
import React from 'react';
2018
import PropTypes from 'prop-types';
2119
import classNames from 'classnames/bind';
@@ -39,6 +37,8 @@ export const AutocompleteMenu = React.forwardRef(
3937
{ opened: isOpen && isReadyForSearch(minLength, inputValue) },
4038
className,
4139
)}
40+
// placement used by Popper
41+
/* eslint-disable-next-line react/no-unknown-property */
4242
placement={placement}
4343
style={style}
4444
>

app/src/components/inputs/autocompletes/common/autocompleteMenu/autocompleteMenu.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
/* eslint-disable react/no-unknown-property */
18-
1917
import React from 'react';
2018
import { ScrollWrapper } from 'components/main/scrollWrapper';
2119
import PropTypes from 'prop-types';
@@ -79,6 +77,8 @@ export const AutocompleteMenu = React.forwardRef(
7977
<ul
8078
ref={ref}
8179
className={cx('menu', { opened: isOpen && menuContent })}
80+
// placement used by Popper
81+
/* eslint-disable-next-line react/no-unknown-property */
8282
placement={placement}
8383
style={style}
8484
>

app/src/pages/admin/allUsersPage/allUsersGrid/projectsAndRolesColumn/rolesRow/rolesRow.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ export class RolesRow extends Component {
164164
: intl.formatMessage(messages.unAssignFromProject);
165165
const Tooltip = () => <TextTooltip tooltipContent={tooltipMessage} />;
166166
const disable = this.isPersonalProject();
167-
const componentClickHandler = !this.isPersonalProject() ? clickHandler : null;
167+
const componentClickHandler = !disable ? clickHandler : null;
168168
const WrappedComponent = () => (
169169
<IconComponent
170170
different={different}

app/src/pages/inside/filtersPage/filterGrid/filterName/filterName.jsx

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,23 @@ import styles from './filterName.scss';
2626

2727
const cx = classNames.bind(styles);
2828

29+
const NameLink = ({ link, children }) =>
30+
link ? (
31+
<Link className={cx('name-link')} to={link}>
32+
{children}
33+
</Link>
34+
) : (
35+
children
36+
);
37+
NameLink.propTypes = {
38+
link: PropTypes.string,
39+
children: PropTypes.node,
40+
};
41+
NameLink.defaultProps = {
42+
link: '',
43+
children: null,
44+
};
45+
2946
export class FilterName extends Component {
3047
static propTypes = {
3148
userFilters: PropTypes.array,
@@ -82,16 +99,6 @@ export class FilterName extends Component {
8299
nameLink,
83100
} = this.props;
84101

85-
// eslint-disable-next-line react/prop-types
86-
const NameLink = ({ link, children }) =>
87-
link ? (
88-
<Link className={cx('name-link')} to={link}>
89-
{children}
90-
</Link>
91-
) : (
92-
children
93-
);
94-
95102
return (
96103
<Fragment>
97104
<span className={cx('name-wrapper')}>

readme.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/reportportal/service-ui?sort=semver)](https://github.com/reportportal/service-ui/releases/latest)
99
[![Docker Pulls](https://img.shields.io/docker/pulls/reportportal/service-ui.svg?maxAge=159200)](https://hub.docker.com/r/reportportal/service-ui/)
1010

11-
1. Install nodejs (minimum required version 12, recommended - 20)
11+
1. Install nodejs (version 20 is recommended)
1212

1313
2. Open console from the project root
1414

1515
3. Run the command `cd app`
1616

17-
4. Run the command `npm install` or `npm ci`
17+
4. Run the command `npm install --legacy-peer-deps` or `npm ci --legacy-peer-deps`
1818

1919
5. Create file `.env` in `app` folder
2020

0 commit comments

Comments
 (0)