Skip to content

Commit 3f3367e

Browse files
committed
fix: fix SonarQube errors
1 parent 1cc2009 commit 3f3367e

15 files changed

Lines changed: 98 additions & 117 deletions

src/actions/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export const fetchResource = createAction(
2121
ActionTypes.GET_RESOURCE,
2222
ApiClient.fetchResource,
2323
(resourceType: string, filters?: any, include?: string[], embed?: string[], meta?: any) => {
24-
return Object.assign({}, meta, { resourceType });
24+
return { ...meta, resourceType };
2525
}
2626
);
2727

src/actions/queueHandler.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export default function queueHandler(store) {
3232
markAndSendObservation(store, item);
3333
});
3434

35-
const shouldRetryImmediately = ((opts && opts.initial === true) || store.getState().updateFlush);
35+
const shouldRetryImmediately = ((opts?.initial === true) || store.getState().updateFlush);
3636
if (shouldRetryImmediately) {
3737
_.each(timers, (_, key) => {
3838
clearTimeout(key);

src/components/LoginScreen.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,10 @@ class LoginScreen extends React.Component {
3434
}
3535
handleChange(field) {
3636
return (event) => {
37-
this.setState(
38-
Object.assign(
39-
this.state,
40-
{[field]: event.target.value}
41-
));
37+
this.setState(prevState => ({
38+
...prevState,
39+
[field]: event.target.value
40+
}));
4241
};
4342
}
4443
render() {

src/components/NotFound.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const NotFound: React.FC = () => {
77
<div className="list-group facility-return clearfix">
88
<Link to="/" className="list-group-item">
99
<span className="action-icon glyphicon glyphicon-chevron-left"></span>
10-
Takaisin
10+
{' '}Takaisin
1111
</Link>
1212
</div>
1313
<h4>404 - Sivua ei löytynyt</h4>

src/components/UnitDetails.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ interface ObservablePropertyPanelProps {
3030
header: string;
3131
}
3232

33-
export function ObservableProperty({ quality, property, identifier, name, unitId }: ObservablePropertyProps): React.ReactElement {
33+
export function ObservableProperty({ quality, property, identifier, name, unitId }: Readonly<ObservablePropertyProps>): React.ReactElement {
3434
const url = `/unit/${unitId}/update/${property}/${identifier}`;
3535
const color = COLORS[quality] || 'primary';
3636
const icon = ICONS[identifier];
@@ -40,7 +40,7 @@ export function ObservableProperty({ quality, property, identifier, name, unitId
4040
return <Link to={url} className={buttonClassName}><span className={iconClassName}></span><br />{name.fi}</Link>;
4141
}
4242

43-
export function ObservablePropertyPanel({ allowedValues, header }: ObservablePropertyPanelProps): React.ReactElement {
43+
export function ObservablePropertyPanel({ allowedValues, header }: Readonly<ObservablePropertyPanelProps>): React.ReactElement {
4444
const amountOfValues = allowedValues.length;
4545
const cutPoint = (amountOfValues / 2) + (amountOfValues % 2);
4646
const left = allowedValues.slice(0, cutPoint);
@@ -65,7 +65,7 @@ export function ObservablePropertyPanel({ allowedValues, header }: ObservablePro
6565

6666
const UnitDetails: React.FC = () => {
6767
const params = useParams<{ unitId: string }>();
68-
const unitId = params.unitId!;
68+
const unitId = params.unitId;
6969

7070
const unit = useSelector((state: RootState) => state.data.unit[unitId]);
7171
const isLoading = useSelector((state: RootState) => state.data.loading.unit === true);

src/components/UnitHistory.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class UnitHistory extends React.Component {
3737
<div className="list-group facility-return clearfix">
3838
<Link to={`/unit/${unit.id}`} className="list-group-item">
3939
<span className="action-icon glyphicon glyphicon-chevron-left"></span>
40-
Takaisin
40+
{' '}Takaisin
4141
</Link>
4242
</div>
4343
<div className="well">

src/components/UnitList.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ interface UnitListElementProps {
1111
unit: Unit;
1212
}
1313

14-
export function UnitListElement(props: UnitListElementProps): React.ReactElement {
14+
export function UnitListElement(props: Readonly<UnitListElementProps>): React.ReactElement {
1515
const { unit } = props;
1616
const url = `/unit/${unit.id}`;
1717
let iconClassName: string;
@@ -72,7 +72,7 @@ const UnitList: React.FC = () => {
7272
<div className="list-group facility-return">
7373
<Link to="/group" className="list-group-item">
7474
<span className="action-icon glyphicon glyphicon-chevron-left"></span>
75-
Takaisin
75+
{' '}Takaisin
7676
</Link>
7777
</div>
7878
<h5>{name}</h5>

src/components/UnitMassEdit.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ const UnitMassEdit = (props) => {
7676
const isServiced = formValues.observationType === 'serviced';
7777
const notice = formValues.notice;
7878

79-
unitIds.map((unitId) => {
80-
enqueueObservation(propertyId, value, parseInt(unitId), isServiced);
79+
unitIds.forEach((unitId) => {
80+
enqueueObservation(propertyId, value, Number.parseInt(unitId), isServiced);
8181
if (notice) {
82-
enqueueObservation('notice', notice, parseInt(unitId));
82+
enqueueObservation('notice', notice, Number.parseInt(unitId));
8383
}
8484
});
8585

@@ -229,7 +229,7 @@ const UnitMassEdit = (props) => {
229229
<div className="list-group facility-return clearfix">
230230
<Link to={`/group/${groupId}/mass-edit`} className="list-group-item">
231231
<span className="action-icon glyphicon glyphicon-chevron-left"></span>
232-
Takaisin
232+
{' '}Takaisin
233233
</Link>
234234
</div>
235235
<h4>Massapäivitys ({qualityHeader})</h4>
@@ -278,7 +278,7 @@ function mapStateToProps(state, ownProps) {
278278
let unitsIncludingSelectedProperty = [];
279279
let observableProperty;
280280

281-
units.map((u) => {
281+
units.forEach((u) => {
282282
const allObservableProperties = unitObservableProperties(u, service, onlyQualityProperties);
283283
const selectedObservableProperty = _.filter(allObservableProperties, (op) => op.id === propertyId);
284284
const selectedObservablePropertyId = selectedObservableProperty[0]?.id;

src/components/UnitMassEditPropertySelect.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class UnitMassEditPropertySelect extends React.Component {
2424
<div className="list-group facility-return clearfix">
2525
<Link to={`/group/${groupId}`} className="list-group-item">
2626
<span className="action-icon glyphicon glyphicon-chevron-left"></span>
27-
Takaisin
27+
{' '}Takaisin
2828
</Link>
2929
</div>
3030
<div className="well">
@@ -52,12 +52,12 @@ function mapStateToProps(state, ownProps) {
5252
// Get all available properties
5353
const properties = units.reduce((result, currentUnit) => {
5454
const observableProperties = unitObservableProperties(currentUnit, service, onlyQualityProperties);
55-
observableProperties.map((op) => {
55+
observableProperties.forEach((op) => {
5656
// Remove duplicate observable properties
57-
if (result.findIndex(res => res.id === op.id) === -1) {
57+
if (!result.some(res => res.id === op.id)) {
5858
result.push(op);
5959
}
60-
})
60+
});
6161
return result;
6262
}, []);
6363

src/components/UnitStatusSummary.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ interface UnitStatusSummaryProps {
1010
unit: Unit;
1111
}
1212

13-
export default function UnitStatusSummary({ unit }: UnitStatusSummaryProps): React.ReactElement {
13+
export default function UnitStatusSummary({ unit }: Readonly<UnitStatusSummaryProps>): React.ReactElement {
1414
const observations = _.map(
1515
unit.observations,
1616
(obs) => <ObservationItem key={obs.id} observation={obs} />
@@ -24,7 +24,7 @@ export default function UnitStatusSummary({ unit }: UnitStatusSummaryProps): Rea
2424
<div className="list-group facility-return clearfix">
2525
<Link to="/" className="list-group-item">
2626
<span className="action-icon glyphicon glyphicon-chevron-left"></span>
27-
Takaisin
27+
{' '}Takaisin
2828
</Link>
2929
</div>
3030
<div className="well">

0 commit comments

Comments
 (0)