Skip to content

Commit dfa50cf

Browse files
authored
Merge pull request #1303 from Arnei/no-unused-expressions
Activate eslint no-unused-expressions
2 parents e522509 + 56b2652 commit dfa50cf

10 files changed

Lines changed: 72 additions & 36 deletions

File tree

eslint.config.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ export default [
1515
"indent": "off",
1616
"max-len": "off",
1717
"no-tabs": "off",
18-
"no-unused-expressions": "off",
1918
"object-curly-spacing": "off",
2019
"quotes": "off",
2120
"semi": "off",
@@ -29,8 +28,7 @@ export default [
2928
"@typescript-eslint/no-unsafe-assignment": "off",
3029
"@typescript-eslint/no-unsafe-call": "off",
3130
"@typescript-eslint/no-unsafe-member-access": "off",
32-
"@typescript-eslint/no-unused-expressions": "off",
33-
// "@typescript-eslint/no-unused-vars": "off",
31+
"@typescript-eslint/no-unused-vars": "off",
3432
"@typescript-eslint/no-unsafe-return": "off",
3533
"@typescript-eslint/require-await": "off",
3634
"@typescript-eslint/unbound-method": "off",

src/components/NavBar.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,11 @@ const NavBar = ({
5252
const newResourceModalRef = useRef<ModalHandle>(null);
5353

5454
const showNewResourceModal = async () => {
55-
create && create.onShowModal && await create.onShowModal();
56-
newResourceModalRef.current?.open();
55+
newResourceModalRef.current?.open()
5756
};
5857

5958
const hideNewResourceModal = () => {
60-
create && create.onHideModal && create.onHideModal();
61-
newResourceModalRef.current?.close?.();
59+
newResourceModalRef.current?.close?.()
6260
};
6361

6462
const toggleNavigation = () => {

src/components/events/partials/ModalTabsAndPages/EditScheduledEventsEditPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ const EditScheduledEventsEditPage = <T extends RequiredFormProps>({
157157
{/* Repeat table for each selected event */}
158158
{!loading && (
159159
<FieldArray name="editedEvents">
160-
{/* eslint-disable-next-line @typescript-eslint/no-unused-vars */}
160+
{ }
161161
{({ insert, remove, push }) => (
162162
<>
163163
{hasAccess(

src/components/events/partials/ModalTabsAndPages/NewSourcePage.tsx

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ const Upload = <T extends RequiredFormPropsUpload>({
261261
<tbody>
262262
<FieldArray name="uploadAssetsTrack">
263263
{/*File upload button for each upload asset*/}
264-
{/* eslint-disable-next-line @typescript-eslint/no-unused-vars */}
264+
{ }
265265
{({ insert, remove, push }) =>
266266
formik.values.uploadAssetsTrack &&
267267
formik.values.uploadAssetsTrack.length > 0 &&
@@ -404,17 +404,21 @@ const Schedule = <T extends {
404404
selected={typeof formik.values.scheduleStartDate === "string" ? parseISO(formik.values.scheduleStartDate) : formik.values.scheduleStartDate}
405405
onChange={value => {
406406
if (formik.values.sourceMode === "SCHEDULE_MULTIPLE") {
407-
value && changeStartDateMultiple(
408-
value,
409-
formik.values,
410-
formik.setFieldValue,
411-
);
407+
if (value) {
408+
changeStartDateMultiple(
409+
value,
410+
formik.values,
411+
formik.setFieldValue,
412+
);
413+
}
412414
} else {
413-
value && changeStartDate(
414-
value,
415-
formik.values,
416-
formik.setFieldValue,
417-
);
415+
if (value) {
416+
changeStartDate(
417+
value,
418+
formik.values,
419+
formik.setFieldValue,
420+
);
421+
}
418422
}
419423
}}
420424
showYearDropdown

src/components/shared/NavigationButtons.tsx

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ const NavigationButtons = ({
3939
className={cn(submitClassName, submitActiveClassName)}
4040
disabled={disabled}
4141
onClick={() => {
42-
nextPage?.();
42+
if (nextPage) {
43+
nextPage()
44+
}
4345
}}
4446
tabIndex={100}
4547
>
@@ -51,7 +53,9 @@ const NavigationButtons = ({
5153
className={cn(submitClassName, submitActiveClassName)}
5254
disabled={disabled}
5355
onClick={() => {
54-
nextPage?.();
56+
if (nextPage) {
57+
nextPage();
58+
}
5559
}}
5660
tabIndex={100}
5761
>
@@ -62,7 +66,9 @@ const NavigationButtons = ({
6266
<button
6367
className="cancel"
6468
onClick={() => {
65-
previousPage?.();
69+
if (previousPage) {
70+
previousPage()
71+
}
6672
}}
6773
tabIndex={101}
6874
>

src/components/shared/modals/ResourceDetailsAccessPolicyTab.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,12 @@ const ResourceDetailsAccessPolicyTab = ({
122122
await dispatch(fetchAccessPolicies(resourceId));
123123
fetchRolesWithTarget("ACL").then(roles => setRoles(roles));
124124
if (fetchHasActiveTransactions) {
125-
const fetchTransactionResult = await dispatch(fetchHasActiveTransactions(resourceId)).then(unwrapResult);
126-
fetchTransactionResult.active !== undefined
127-
? setTransactions({ read_only: fetchTransactionResult.active })
128-
: setTransactions({ read_only: true });
125+
const fetchTransactionResult = await dispatch(fetchHasActiveTransactions(resourceId)).then(unwrapResult)
126+
if (fetchTransactionResult.active !== undefined) {
127+
setTransactions({ read_only: fetchTransactionResult.active })
128+
} else {
129+
setTransactions({ read_only: true });
130+
}
129131
if (
130132
fetchTransactionResult.active === undefined ||
131133
fetchTransactionResult.active

src/components/shared/wizard/RenderField.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,12 @@ const RenderField = ({
3939
<div
4040
onClick={() => {
4141
if (editableRef.current) {
42-
editableRef.current.focus && editableRef.current.focus();
43-
editableRef.current.setFocus && editableRef.current.setFocus(); // For DatePicker
42+
if (editableRef.current.focus) {
43+
editableRef.current.focus()
44+
}
45+
if (editableRef.current.setFocus) {
46+
editableRef.current.setFocus() // For DatePicker
47+
}
4448
}
4549
}}
4650
onFocus={onFocus}

src/components/shared/wizard/WizardNavigationButtons.tsx

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,25 @@ const WizardNavigationButtons = <T, >({
3939
isSubmitDisabled={disabled}
4040
nextPage={
4141
isLast
42-
? () => { submitPage ? submitPage() : formik.handleSubmit(); }
43-
: () => { !!nextPage && nextPage(formik.values); }
42+
? () => {
43+
if (submitPage) {
44+
submitPage()
45+
} else {
46+
formik.handleSubmit();
47+
}
48+
}
49+
: () => {
50+
if (nextPage) {
51+
nextPage(formik.values);
52+
}
53+
}
4454
}
4555
previousPage={
46-
() => { !!previousPage && previousPage(formik.values); }
56+
() => {
57+
if (previousPage) {
58+
previousPage(formik.values)
59+
}
60+
}
4761
}
4862
nextTranslationString={
4963
isLast

src/slices/eventDetailsSlice.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1337,7 +1337,9 @@ export const performWorkflowAction = createAppAsyncThunk("eventDetails/performWo
13371337
context: NOTIFICATION_CONTEXT,
13381338
}),
13391339
);
1340-
close && close();
1340+
if (close) {
1341+
close();
1342+
}
13411343
})
13421344
.catch(response => {
13431345
dispatch(

src/utils/resourceUtils.ts

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,18 @@ export const buildUserBody = (values: NewUser | UpdateUser) => {
8888
const data = new URLSearchParams();
8989
// fill form data with user inputs
9090
data.append("username", values.username);
91-
values.name && data.append("name", values.name);
92-
values.email && data.append("email", values.email);
93-
values.password && data.append("password", values.password);
94-
values.roles && data.append("roles", JSON.stringify(values.roles));
91+
if (values.name) {
92+
data.append("name", values.name);
93+
}
94+
if (values.email) {
95+
data.append("email", values.email);
96+
}
97+
if (values.password) {
98+
data.append("password", values.password);
99+
}
100+
if (values.roles) {
101+
data.append("roles", JSON.stringify(values.roles));
102+
}
95103

96104
return data;
97105
};

0 commit comments

Comments
 (0)