Skip to content

Commit d1c7f88

Browse files
EvianTanEvianTan
committed
eslint fixing
1 parent a97b7af commit d1c7f88

15 files changed

+410
-356
lines changed

‎.eslintignore

-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ src/components/common/**
2222
src/components/Header/**
2323
src/components/BMDashboard/BMHeader/**
2424
src/components/MonthlyEffort/**
25-
26-
src/components/PermissionsManagement/**
2725
src/components/ProfileLinks/**
2826
src/components/Projects/**
2927
src/components/Reports/**

‎.eslintrc.js

+4
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,13 @@ module.exports = {
4848
'react/display-name': 'off',
4949
'react/no-direct-mutation-state': 'off',
5050
'react/no-unknown-property': 'off',
51+
'react/destructuring-assignment': 'off',
5152
'react/react-in-jsx-scope': 'off',
5253
'import/no-duplicates': 'off',
5354
'import/no-named-as-default': 'off',
55+
'jsx-a11y/label-has-associated-control': 'off',
56+
'jsx-a11y/no-static-element-interactions': 'off',
57+
'jsx-a11y/click-events-have-key-events': 'off',
5458
'no-alert': 'error',
5559
'no-console': 'error',
5660
'import/no-extraneous-dependencies': ['error', { devDependencies: true }],

‎.prettierignore

-5
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,11 @@ src/__tests__/**
1818

1919
src/components/App.jsx
2020
src/components/AutoReload/**
21-
22-
23-
2421
src/components/Header/**
2522
src/components/Inventory/**
2623
src/components/Memberships/**
2724
src/components/MonthlyEffort/**
2825
src/components/NewProfileLink/**
29-
30-
src/components/PermissionsManagement/**
3126
src/components/ProfileLinks/**
3227
src/components/Projects/**
3328
src/components/Reports/**

‎src/components/PermissionsManagement/NewRolePopUp.jsx

+17-19
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
import React, { useState } from 'react';
2-
import { FormCheck } from 'react-bootstrap';
1+
import { useState } from 'react';
32
import { Alert, Button, Form, FormGroup, Input, Label } from 'reactstrap';
43
import { toast } from 'react-toastify';
54
import { connect } from 'react-redux';
65
import { boxStyle } from 'styles';
76
import { addNewRole, getAllRoles } from '../../actions/role';
87
import PermissionList from './PermissionList';
98

10-
function CreateNewRolePopup({ toggle, addNewRole, roleNames }) {
9+
function CreateNewRolePopup({ toggle, roleNames }) {
1110
const [permissionsChecked, setPermissionsChecked] = useState([]);
1211
const [newRoleName, setNewRoleName] = useState('');
1312
const [isValidRole, setIsValidRole] = useState(true);
@@ -37,6 +36,19 @@ function CreateNewRolePopup({ toggle, addNewRole, roleNames }) {
3736
}
3837
};
3938

39+
const checkIfDuplicate = value => {
40+
let duplicateFound = false;
41+
42+
roleNames.forEach(val => {
43+
if (val.localeCompare(value, 'en', { sensitivity: 'base' }) === 0) {
44+
duplicateFound = true;
45+
return true;
46+
}
47+
return 0;
48+
});
49+
return duplicateFound;
50+
};
51+
4052
const handleRoleName = e => {
4153
const { value } = e.target;
4254
const regexTest = noSymbolsRegex.test(value);
@@ -60,18 +72,6 @@ function CreateNewRolePopup({ toggle, addNewRole, roleNames }) {
6072
}
6173
};
6274

63-
const checkIfDuplicate = value => {
64-
let duplicateFound = false;
65-
66-
roleNames.forEach(val => {
67-
if (val.localeCompare(value, 'en', { sensitivity: 'base' }) === 0) {
68-
duplicateFound = true;
69-
return true;
70-
}
71-
});
72-
return duplicateFound;
73-
};
74-
7575
return (
7676
<Form id="createRole" onSubmit={handleSubmit}>
7777
<FormGroup>
@@ -85,16 +85,14 @@ function CreateNewRolePopup({ toggle, addNewRole, roleNames }) {
8585
<Alert className="createRole__alert" color="danger">
8686
{errorMessage}
8787
</Alert>
88-
) : (
89-
<></>
90-
)}
88+
) : null}
9189
</FormGroup>
9290

9391
<FormGroup>
9492
<Label>Permissions:</Label>
9593
<PermissionList
9694
rolePermissions={permissionsChecked}
97-
editable={true}
95+
editable
9896
setPermissions={setPermissionsChecked}
9997
/>
10098
</FormGroup>

‎src/components/PermissionsManagement/PermissionChangeLogTable.jsx

+39-20
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
import React, { useState } from 'react';
1+
import { useState } from 'react';
22

3-
import "./PermissionChangeLogTable.css";
4-
import { formatDate, formatted_AM_PM_Time } from 'utils/formatDate';
3+
import './PermissionChangeLogTable.css';
4+
import { formatDate, formattedAmPmTime } from 'utils/formatDate';
55

6-
7-
const PermissionChangeLogTable = ({ changeLogs, darkMode }) => {
6+
function PermissionChangeLogTable({ changeLogs, darkMode }) {
87
const [currentPage, setCurrentPage] = useState(1);
98
const itemsPerPage = 20;
109
const indexOfLastItem = currentPage * itemsPerPage;
@@ -18,10 +17,15 @@ const PermissionChangeLogTable = ({ changeLogs, darkMode }) => {
1817

1918
return (
2019
<>
21-
<table className='permission-change-log-table' style={{ borderCollapse: 'collapse', width: '98%', margin: "0 auto" }}>
20+
<table
21+
className="permission-change-log-table"
22+
style={{ borderCollapse: 'collapse', width: '98%', margin: '0 auto' }}
23+
>
2224
<thead>
2325
<tr className={darkMode ? 'table-row-dark' : 'table-row'}>
24-
<th className={`permission-change-log-table--header${addDark}`}>Log Date and Time (PST)</th>
26+
<th className={`permission-change-log-table--header${addDark}`}>
27+
Log Date and Time (PST)
28+
</th>
2529
<th className={`permission-change-log-table--header${addDark}`}>Role Name</th>
2630
<th className={`permission-change-log-table--header${addDark}`}>Permissions</th>
2731
<th className={`permission-change-log-table--header${addDark}`}>Permissions Added</th>
@@ -34,32 +38,47 @@ const PermissionChangeLogTable = ({ changeLogs, darkMode }) => {
3438
{currentItems.map(log => (
3539
<tr key={log._id}>
3640
{/* ... (same as before) */}
37-
<td className={`permission-change-log-table--cell ${bgYinmnBlue}`}>{`${formatDate(log.logDateTime)} ${formatted_AM_PM_Time(log.logDateTime)}`}</td>
41+
<td className={`permission-change-log-table--cell ${bgYinmnBlue}`}>{`${formatDate(
42+
log.logDateTime,
43+
)} ${formattedAmPmTime(log.logDateTime)}`}</td>
3844
<td className={`permission-change-log-table--cell ${bgYinmnBlue}`}>{log.roleName}</td>
39-
<td className={`permission-change-log-table--cell ${bgYinmnBlue}`}>{log.permissions.join(', ')}</td>
40-
<td className={`permission-change-log-table--cell ${bgYinmnBlue}`}>{log.permissionsAdded.join(', ')}</td>
41-
<td className={`permission-change-log-table--cell ${bgYinmnBlue}`}>{log.permissionsRemoved.join(', ')}</td>
42-
<td className={`permission-change-log-table--cell ${bgYinmnBlue}`}>{log.requestorRole}</td>
43-
<td className={`permission-change-log-table--cell ${bgYinmnBlue}`}>{log.requestorEmail}</td>
45+
<td className={`permission-change-log-table--cell ${bgYinmnBlue}`}>
46+
{log.permissions.join(', ')}
47+
</td>
48+
<td className={`permission-change-log-table--cell ${bgYinmnBlue}`}>
49+
{log.permissionsAdded.join(', ')}
50+
</td>
51+
<td className={`permission-change-log-table--cell ${bgYinmnBlue}`}>
52+
{log.permissionsRemoved.join(', ')}
53+
</td>
54+
<td className={`permission-change-log-table--cell ${bgYinmnBlue}`}>
55+
{log.requestorRole}
56+
</td>
57+
<td className={`permission-change-log-table--cell ${bgYinmnBlue}`}>
58+
{log.requestorEmail}
59+
</td>
4460
</tr>
4561
))}
4662
</tbody>
4763
</table>
48-
<div className="pagination" style={{ width: '98%', margin: "5px auto" }}>
64+
<div className="pagination" style={{ width: '98%', margin: '5px auto' }}>
4965
{Array.from({ length: Math.ceil(changeLogs.length / itemsPerPage) }).map((_, index) => (
50-
<button
51-
key={index}
52-
onClick={() => paginate(index + 1)}
53-
className='permission-change-log-table--button'
66+
<button
67+
// eslint-disable-next-line react/no-array-index-key
68+
key={index}
69+
type="button"
70+
onClick={() => paginate(index + 1)}
71+
className="permission-change-log-table--button"
5472
style={{
5573
backgroundColor: index + 1 === currentPage ? '#103a8d' : '#1d62f0',
56-
}}>
74+
}}
75+
>
5776
{index + 1}
5877
</button>
5978
))}
6079
</div>
6180
</>
6281
);
63-
};
82+
}
6483

6584
export default PermissionChangeLogTable;

‎src/components/PermissionsManagement/PermissionList.jsx

+42-49
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,49 @@
1-
import React from 'react';
1+
import { connect } from 'react-redux';
2+
// eslint-disable-next-line import/no-cycle
23
import PermissionListItem from './PermissionListItem';
34
import permissionLabel from './PermissionsConst';
4-
import { connect } from 'react-redux';
55

6-
7-
const PermissionList = (props) => {
8-
const { //the modifiable permissions for this role/user
9-
rolePermissions=[],
10-
//all permissions to be listed
11-
permissionsList=permissionLabel,
12-
// any additional permissions that cannot be added
13-
// (used for preventing adding permissions to users
14-
// which are already covered by their role)
15-
immutablePermissions=[],
16-
// if the add/remove buttons will appear
17-
editable=false,
18-
// used for indentation in subcategories/sublists
19-
depth=0,
20-
// function to update the permission list in parent component
21-
setPermissions=()=>{},
22-
// runs when permission is added or removed
23-
onChange=()=>{},
24-
} = props;
6+
function PermissionList(props) {
7+
const {
8+
// the modifiable permissions for this role/user
9+
rolePermissions = [],
10+
// all permissions to be listed
11+
permissionsList = permissionLabel,
12+
// any additional permissions that cannot be added
13+
// (used for preventing adding permissions to users
14+
// which are already covered by their role)
15+
immutablePermissions = [],
16+
// if the add/remove buttons will appear
17+
editable = false,
18+
// used for indentation in subcategories/sublists
19+
depth = 0,
20+
// function to update the permission list in parent component
21+
setPermissions = () => {},
22+
// runs when permission is added or removed
23+
onChange = () => {},
24+
} = props;
2525
return (
2626
<ul className="user-role-tab__permissionList">
27-
{permissionsList.map((permission) => (
28-
<PermissionListItem
29-
key={permission.label}
30-
rolePermissions={rolePermissions}
31-
immutablePermissions={immutablePermissions}
32-
label={permission.label}
33-
permission={permission.key}
34-
subperms={permission.subperms}
35-
description={permission.description}
36-
editable={editable}
37-
depth={depth}
38-
darkMode={props.darkMode}
39-
40-
//functions
41-
setPermissions={setPermissions}
42-
onChange={onChange}
43-
/>
44-
))}
45-
</ul>
27+
{permissionsList.map(permission => (
28+
<PermissionListItem
29+
key={permission.label}
30+
rolePermissions={rolePermissions}
31+
immutablePermissions={immutablePermissions}
32+
label={permission.label}
33+
permission={permission.key}
34+
subperms={permission.subperms}
35+
description={permission.description}
36+
editable={editable}
37+
depth={depth}
38+
// eslint-disable-next-line react/destructuring-assignment
39+
darkMode={props.darkMode}
40+
// functions
41+
setPermissions={setPermissions}
42+
onChange={onChange}
43+
/>
44+
))}
45+
</ul>
4646
);
47-
};
48-
49-
50-
51-
const mapStateToProps = state => ({});
52-
53-
const mapDispatchToProps = dispatch => ({
54-
});
47+
}
5548

56-
export default connect(mapStateToProps, mapDispatchToProps)(PermissionList);
49+
export default connect(null, null)(PermissionList);

0 commit comments

Comments
 (0)