Refactored old validation from profile and password forms, fixed alert text

This commit is contained in:
Daniel Cojocea committed 2024-07-15 20:51:18 -04:00
1 parent 2a77c3fc12
commit d39a716ab6
6 files changed
+37 -70

No files matched your search

+4 -2
View File
@@ -2,6 +2,8 @@
margin: 0;
width: fit-content;
}
.alert, .alert button{
.alert,
.alert button,
.alert .MuiTypography-root {
font-size: var(--env-var-font-size-medium);
}
}
+12 -4
View File
@@ -1,6 +1,6 @@
import PropTypes from "prop-types";
import { useTheme } from "@emotion/react";
import { Box, IconButton, Stack } from "@mui/material";
import { Box, IconButton, Stack, Typography } from "@mui/material";
import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined";
import ErrorOutlineOutlinedIcon from "@mui/icons-material/ErrorOutlineOutlined";
import WarningAmberOutlinedIcon from "@mui/icons-material/WarningAmberOutlined";
@@ -50,9 +50,17 @@ const Alert = ({ variant, title, body, isToast, hasIcon = true, onClick }) => {
}}
>
{hasIcon && <Box sx={{ color: color }}>{icon}</Box>}
<Stack direction="column" gap="2px" sx={{ flex: 1, color: color }}>
{title && <Box sx={{ fontWeight: "700" }}>{title}</Box>}
{body && <Box sx={{ fontWeight: "400" }}>{body}</Box>}
<Stack direction="column" gap="2px" sx={{ flex: 1 }}>
{title && (
<Typography sx={{ fontWeight: "700", color: `${color} !important` }}>
{title}
</Typography>
)}
{body && (
<Typography sx={{ fontWeight: "400", color: `${color} !important` }}>
{body}
</Typography>
)}
{hasIcon && isToast && (
<Button
level="tertiary"
@@ -4,7 +4,7 @@ import { useTheme } from "@emotion/react";
import { Box, Divider, Stack, Typography } from "@mui/material";
import ButtonSpinner from "../../ButtonSpinner";
import Field from "../../Inputs/Field";
import { editPasswordValidation } from "../../../Validation/validation";
import { credentials } from "../../../Validation/validation";
import Alert from "../../Alert";
import { update } from "../../../Features/Auth/authSlice";
import { useDispatch, useSelector } from "react-redux";
@@ -44,9 +44,9 @@ const PasswordPanel = () => {
[name]: value,
}));
const validation = editPasswordValidation.validate(
const validation = credentials.validate(
{ [name]: value },
{ abortEarly: false, context: { newPassword: localData.newPassword } }
{ abortEarly: false, context: { password: localData.newPassword } }
);
setErrors((prev) => {
@@ -64,9 +64,9 @@ const PasswordPanel = () => {
const handleSubmit = async (event) => {
event.preventDefault();
const { error } = editPasswordValidation.validate(localData, {
const { error } = credentials.validate(localData, {
abortEarly: false,
context: { newPassword: localData.newPassword },
context: { password: localData.newPassword },
});
if (error) {
@@ -7,10 +7,7 @@ import Button from "../../Button";
import Avatar from "../../Avatar";
import Field from "../../Inputs/Field";
import ImageField from "../../Inputs/Image";
import {
editProfileValidation,
imageValidation,
} from "../../../Validation/validation";
import { credentials, imageValidation } from "../../../Validation/validation";
import { useDispatch, useSelector } from "react-redux";
import {
clearAuthState,
@@ -66,7 +63,7 @@ const ProfilePanel = () => {
[name]: value,
}));
validateField({ [name]: value }, editProfileValidation, name);
validateField({ [name]: value }, credentials, name);
};
// Handles image file
@@ -165,8 +162,8 @@ const ProfilePanel = () => {
localData.file === undefined
) {
createToast({
variant: "warning",
body: "Unable to update profile: No changes detected.",
variant: "info",
body: "Unable to update profile — no changes detected.",
hasIcon: false,
});
setErrors({ unchanged: "unable to update profile" });