Merge pull request #113 from canove/code-cleanup

chore: code cleanup

backend/src/models/Queue.ts

@@ -8,8 +8,7 @@ import {
   AutoIncrement,
   AllowNull,
   Unique,
-  BelongsToMany,
-  HasMany
+  BelongsToMany
 } from "sequelize-typescript";
 import User from "./User";
 import UserQueue from "./UserQueue";

frontend/src/components/Can/index.js

@@ -1,6 +1,6 @@
-import rules from "../../accessRules";
+import rules from "../../rules";
 
-const check = (rules, role, action, data) => {
+const check = (role, action, data) => {
 	const permissions = rules[role];
 	if (!permissions) {
 		// role is not present in the rules
@@ -29,7 +29,7 @@ const check = (rules, role, action, data) => {
 };
 
 const Can = ({ role, perform, data, yes, no }) =>
-	check(rules, role, perform, data) ? yes() : no();
+	check(role, perform, data) ? yes() : no();
 
 Can.defaultProps = {
 	yes: () => null,

frontend/src/components/ColorPicker/index.js

@@ -4,10 +4,10 @@ import React, { useState } from "react";
 import { GithubPicker } from "react-color";
 
 const ColorPicker = ({ onChange, currentColor, handleClose, open }) => {
-	const [color, setColor] = useState(currentColor);
+	const [selectedColor, setSelectedColor] = useState(currentColor);
 
 	const handleChange = color => {
-		setColor(color.hex);
+		setSelectedColor(color.hex);
 		handleClose();
 	};
 
@@ -20,7 +20,7 @@ const ColorPicker = ({ onChange, currentColor, handleClose, open }) => {
 			<GithubPicker
 				width={"100%"}
 				triangle="hide"
-				color={color}
+				color={selectedColor}
 				onChange={handleChange}
 				onChangeComplete={color => onChange(color.hex)}
 			/>

frontend/src/components/WhatsAppModal/index.js

@@ -178,7 +178,7 @@ const WhatsAppModal = ({ open, onClose, whatsAppId }) => {
 								</div>
 								<QueueSelect
 									selectedQueueIds={selectedQueueIds}
-									onChange={values => setSelectedQueueIds(values)}
+									onChange={selectedIds => setSelectedQueueIds(selectedIds)}
 								/>
 							</DialogContent>
 							<DialogActions>

frontend/src/context/Auth/useAuth.js

@@ -84,11 +84,11 @@ const useAuth = () => {
 		};
 	}, [user]);
 
-	const handleLogin = async user => {
+	const handleLogin = async userData => {
 		setLoading(true);
 
 		try {
-			const { data } = await api.post("/auth/login", user);
+			const { data } = await api.post("/auth/login", userData);
 			localStorage.setItem("token", JSON.stringify(data.token));
 			api.defaults.headers.Authorization = `Bearer ${data.token}`;
 			setUser(data.user);

frontend/src/layout/MainListItems.js

@@ -50,15 +50,13 @@ const MainListItems = () => {
 		const delayDebounceFn = setTimeout(() => {
 			if (whatsApps.length > 0) {
 				const offlineWhats = whatsApps.filter(whats => {
-					if (
+					return (
 						whats.status === "qrcode" ||
 						whats.status === "PAIRING" ||
 						whats.status === "DISCONNECTED" ||
 						whats.status === "TIMEOUT" ||
 						whats.status === "OPENING"
-					)
-						return true;
-					else return false;
+					);
 				});
 				if (offlineWhats.length > 0) {
 					setConnectionWarning(true);