Skip to content

Commit f75c50d

Browse files
rvsiarvsia
committed
Fix lint (seriously)
1 parent 1c6368a commit f75c50d

File tree

43 files changed

+665
-578
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+665
-578
lines changed

‎.eslintrc.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"it": true,
2222
"arguments": true
2323
},
24-
"plugins": ["prettier"],
25-
"extends": ["react-app", "eslint:recommended", "plugin:react/recommended"],
24+
"plugins": ["react"],
25+
"extends": ["react-app", "eslint:recommended", "plugin:react/recommended", "plugin:prettier/recommended", "prettier"],
2626
"env": {
2727
"es6": true,
2828
"browser": true,
@@ -84,6 +84,7 @@
8484
"no-prototype-builtins": "error",
8585
"no-mixed-operators": "error",
8686
"no-unused-expressions": "error",
87-
"no-sequences": "error"
87+
"no-sequences": "error",
88+
"react-hooks/exhaustive-deps": 0
8889
}
8990
}

‎packages/ant-component-mapper/src/field-array/field-array.js

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,39 +7,42 @@ import { UndoOutlined, RedoOutlined } from '@ant-design/icons';
77

88
import FormGroup from '../form-group';
99

10-
const ArrayItem = memo(({
11-
fields,
12-
fieldIndex,
13-
name,
14-
remove,
15-
length,
16-
minItems,
17-
removeLabel,
18-
ArrayItemProps,
19-
FieldsContainerProps,
20-
RemoveContainerProps,
21-
RemoveButtonProps
22-
}) => {
23-
const { renderForm } = useFormApi();
10+
const ArrayItem = memo(
11+
({
12+
fields,
13+
fieldIndex,
14+
name,
15+
remove,
16+
length,
17+
minItems,
18+
removeLabel,
19+
ArrayItemProps,
20+
FieldsContainerProps,
21+
RemoveContainerProps,
22+
RemoveButtonProps
23+
}) => {
24+
const { renderForm } = useFormApi();
2425

25-
const editedFields = fields.map((field, index) => {
26-
const computedName = field.name ? `${name}.${field.name}` : name;
27-
return { ...field, name: computedName, key: `${computedName}-${index}` };
28-
});
26+
const editedFields = fields.map((field, index) => {
27+
const computedName = field.name ? `${name}.${field.name}` : name;
28+
return { ...field, name: computedName, key: `${computedName}-${index}` };
29+
});
2930

30-
return (
31-
<Row {...ArrayItemProps}>
32-
<Col span={24} {...FieldsContainerProps}>
33-
{renderForm([editedFields])}
34-
</Col>
35-
<Col span={24} {...RemoveContainerProps}>
36-
<Button type="primary" danger {...RemoveButtonProps} onClick={() => remove(fieldIndex)} disabled={length <= minItems}>
37-
{removeLabel}
38-
</Button>
39-
</Col>
40-
</Row>
41-
);
42-
}, ({remove: _prevRemove, ...prev}, {remove: _nextRemove, ...next}) => isEqual(prev, next));
31+
return (
32+
<Row {...ArrayItemProps}>
33+
<Col span={24} {...FieldsContainerProps}>
34+
{renderForm([editedFields])}
35+
</Col>
36+
<Col span={24} {...RemoveContainerProps}>
37+
<Button type="primary" danger {...RemoveButtonProps} onClick={() => remove(fieldIndex)} disabled={length <= minItems}>
38+
{removeLabel}
39+
</Button>
40+
</Col>
41+
</Row>
42+
);
43+
},
44+
({ remove: _prevRemove, ...prev }, { remove: _nextRemove, ...next }) => isEqual(prev, next)
45+
);
4346

4447
ArrayItem.propTypes = {
4548
name: PropTypes.string,

‎packages/blueprint-component-mapper/src/field-array/field-array.js

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,33 @@ const useStyles = createUseStyles({
2020
}
2121
});
2222

23-
const ArrayItem = memo(({ remove, fields, name, removeLabel, ArrayItemProps, RemoveButtonProps, disabledRemove }) => {
24-
const formOptions = useFormApi();
25-
const { remove: removeCss } = useStyles();
26-
27-
const editedFields = fields.map((field) => ({
28-
...field,
29-
...(field.name ? { name: `${name}.${field.name}` } : { name })
30-
}));
31-
32-
return (
33-
<div {...ArrayItemProps}>
34-
{formOptions.renderForm(editedFields, formOptions)}
35-
<Button
36-
onClick={remove}
37-
intent={Intent.DANGER}
38-
disabled={disabledRemove}
39-
{...RemoveButtonProps}
40-
className={clsx(removeCss, RemoveButtonProps && RemoveButtonProps.className)}
41-
>
42-
{removeLabel}
43-
</Button>
44-
</div>
45-
);
46-
}, ({remove: _prevRemove, ...prev}, {remove: _nextRemove, ...next}) => isEqual(prev, next));
23+
const ArrayItem = memo(
24+
({ remove, fields, name, removeLabel, ArrayItemProps, RemoveButtonProps, disabledRemove }) => {
25+
const formOptions = useFormApi();
26+
const { remove: removeCss } = useStyles();
27+
28+
const editedFields = fields.map((field) => ({
29+
...field,
30+
...(field.name ? { name: `${name}.${field.name}` } : { name })
31+
}));
32+
33+
return (
34+
<div {...ArrayItemProps}>
35+
{formOptions.renderForm(editedFields, formOptions)}
36+
<Button
37+
onClick={remove}
38+
intent={Intent.DANGER}
39+
disabled={disabledRemove}
40+
{...RemoveButtonProps}
41+
className={clsx(removeCss, RemoveButtonProps && RemoveButtonProps.className)}
42+
>
43+
{removeLabel}
44+
</Button>
45+
</div>
46+
);
47+
},
48+
({ remove: _prevRemove, ...prev }, { remove: _nextRemove, ...next }) => isEqual(prev, next)
49+
);
4750

4851
ArrayItem.propTypes = {
4952
remove: PropTypes.func,

‎packages/carbon-component-mapper/src/field-array/field-array.js

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -31,32 +31,35 @@ const useStyles = createUseStyles({
3131
}
3232
});
3333

34-
const ArrayItem = memo(({ remove, fields, name, removeText, buttonDisabled, RemoveButtonProps, ArrayItemProps }) => {
35-
const formOptions = useFormApi();
36-
const { remove: removeStyle } = useStyles();
37-
38-
const editedFields = fields.map((field) => ({
39-
...field,
40-
...(field.name ? { name: `${name}.${field.name}` } : { name })
41-
}));
42-
43-
return (
44-
<div {...ArrayItemProps}>
45-
{formOptions.renderForm(editedFields, formOptions)}
46-
<Button
47-
disabled={buttonDisabled}
48-
renderIcon={Subtract32}
49-
id={`remove-${name}`}
50-
kind="danger"
51-
onClick={remove}
52-
{...RemoveButtonProps}
53-
className={clsx(removeStyle, RemoveButtonProps.className)}
54-
>
55-
{removeText}
56-
</Button>
57-
</div>
58-
);
59-
}, ({remove: _prevRemove, ...prev}, {remove: _nextRemove, ...next}) => isEqual(prev, next));
34+
const ArrayItem = memo(
35+
({ remove, fields, name, removeText, buttonDisabled, RemoveButtonProps, ArrayItemProps }) => {
36+
const formOptions = useFormApi();
37+
const { remove: removeStyle } = useStyles();
38+
39+
const editedFields = fields.map((field) => ({
40+
...field,
41+
...(field.name ? { name: `${name}.${field.name}` } : { name })
42+
}));
43+
44+
return (
45+
<div {...ArrayItemProps}>
46+
{formOptions.renderForm(editedFields, formOptions)}
47+
<Button
48+
disabled={buttonDisabled}
49+
renderIcon={Subtract32}
50+
id={`remove-${name}`}
51+
kind="danger"
52+
onClick={remove}
53+
{...RemoveButtonProps}
54+
className={clsx(removeStyle, RemoveButtonProps.className)}
55+
>
56+
{removeText}
57+
</Button>
58+
</div>
59+
);
60+
},
61+
({ remove: _prevRemove, ...prev }, { remove: _nextRemove, ...next }) => isEqual(prev, next)
62+
);
6063

6164
ArrayItem.propTypes = {
6265
remove: PropTypes.func,

‎packages/mui-component-mapper/src/field-array/field-array.js

Lines changed: 35 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -37,42 +37,45 @@ const useFielArrayStyles = makeStyles({
3737
}
3838
});
3939

40-
const ArrayItem = memo(({
41-
fields,
42-
fieldIndex,
43-
name,
44-
remove,
45-
length,
46-
minItems,
47-
removeLabel,
48-
FieldContainerProps,
49-
FieldGroupGridProps,
50-
RemoveButtonGridProps,
51-
RemoveButtonProps
52-
}) => {
53-
const { renderForm } = useFormApi();
54-
const classes = useFielArrayStyles();
40+
const ArrayItem = memo(
41+
({
42+
fields,
43+
fieldIndex,
44+
name,
45+
remove,
46+
length,
47+
minItems,
48+
removeLabel,
49+
FieldContainerProps,
50+
FieldGroupGridProps,
51+
RemoveButtonGridProps,
52+
RemoveButtonProps
53+
}) => {
54+
const { renderForm } = useFormApi();
55+
const classes = useFielArrayStyles();
5556

56-
const editedFields = fields.map((field, index) => {
57-
const computedName = field.name ? `${name}.${field.name}` : name;
58-
return { ...field, name: computedName, key: `${computedName}-${index}` };
59-
});
57+
const editedFields = fields.map((field, index) => {
58+
const computedName = field.name ? `${name}.${field.name}` : name;
59+
return { ...field, name: computedName, key: `${computedName}-${index}` };
60+
});
6061

61-
return (
62-
<Grid container spacing={3} {...FieldContainerProps}>
63-
<Grid item xs={12} {...FieldGroupGridProps}>
64-
<Grid container spacing={3}>
65-
{renderForm([editedFields])}
62+
return (
63+
<Grid container spacing={3} {...FieldContainerProps}>
64+
<Grid item xs={12} {...FieldGroupGridProps}>
65+
<Grid container spacing={3}>
66+
{renderForm([editedFields])}
67+
</Grid>
68+
</Grid>
69+
<Grid item xs={12} className={classes.buttonsToEnd} {...RemoveButtonGridProps}>
70+
<Button color="secondary" onClick={() => remove(fieldIndex)} disabled={length <= minItems} {...RemoveButtonProps}>
71+
{removeLabel}
72+
</Button>
6673
</Grid>
6774
</Grid>
68-
<Grid item xs={12} className={classes.buttonsToEnd} {...RemoveButtonGridProps}>
69-
<Button color="secondary" onClick={() => remove(fieldIndex)} disabled={length <= minItems} {...RemoveButtonProps}>
70-
{removeLabel}
71-
</Button>
72-
</Grid>
73-
</Grid>
74-
);
75-
}, ({remove: _prevRemove, ...prev}, {remove: _nextRemove, ...next}) => isEqual(prev, next));
75+
);
76+
},
77+
({ remove: _prevRemove, ...prev }, { remove: _nextRemove, ...next }) => isEqual(prev, next)
78+
);
7679

7780
ArrayItem.propTypes = {
7881
name: PropTypes.string,

‎packages/pf4-component-mapper/src/date-picker/date-picker.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,7 @@ const DatePicker = (props) => {
3232
id={id || input.name}
3333
FormGroupProps={FormGroupProps}
3434
>
35-
<PF4DatePicker
36-
{...input}
37-
{...rest}
38-
id={id || input.name}
39-
isDisabled={isDisabled || isReadOnly}
40-
/>
35+
<PF4DatePicker {...input} {...rest} id={id || input.name} isDisabled={isDisabled || isReadOnly} />
4136
</FormGroup>
4237
);
4338
};

‎packages/pf4-component-mapper/src/dual-list-select/dual-list-select.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,10 @@ DualList.propTypes = {
126126
isSortable: PropTypes.bool
127127
};
128128

129-
const DualListWrapper = (props) => props.isTree ? <DualListTree {...props} /> : <DualList {...props}/>;
129+
const DualListWrapper = (props) => (props.isTree ? <DualListTree {...props} /> : <DualList {...props} />);
130130

131131
DualListWrapper.propTypes = {
132-
isTree: PropTypes.bool,
132+
isTree: PropTypes.bool
133133
};
134134

135135
export default DualListWrapper;

0 commit comments

Comments
 (0)