andrei/maternal-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Implement comprehensive error handling and production deployment pipeline
Some checks failed
ParentFlow CI/CD Pipeline / Backend Tests (push) Has been cancelled
Details
ParentFlow CI/CD Pipeline / Frontend Tests (push) Has been cancelled
Details
ParentFlow CI/CD Pipeline / Security Scanning (push) Has been cancelled
Details
ParentFlow CI/CD Pipeline / Build Docker Images (map[context:maternal-app/maternal-app-backend dockerfile:Dockerfile.production name:backend]) (push) Has been cancelled
Details
ParentFlow CI/CD Pipeline / Build Docker Images (map[context:maternal-web dockerfile:Dockerfile.production name:frontend]) (push) Has been cancelled
Details
ParentFlow CI/CD Pipeline / Deploy to Development (push) Has been cancelled
Details
ParentFlow CI/CD Pipeline / Deploy to Production (push) Has been cancelled
Details
CI/CD Pipeline / Lint and Test (push) Has been cancelled
Details
CI/CD Pipeline / E2E Tests (push) Has been cancelled
Details
CI/CD Pipeline / Build Application (push) Has been cancelled
Details

Browse Source 
## Error Handling System
- Add centralized error handling utilities (errorHandler.ts)
- Create reusable error components (ErrorMessage, ErrorToast)
- Implement multilingual error support (preserves backend error messages in 5 languages)
- Update 15+ forms and components with consistent error handling
  - Auth forms: login, register, forgot-password
  - Family management: family page, join family dialog
  - Child management: child dialog
  - All tracking forms: feeding, sleep, diaper, medicine, growth, activity

## Production Build Fixes
- Fix backend TypeScript errors: InviteCode.uses → InviteCode.useCount (5 instances)
- Remove non-existent savedFamily variable from registration response
- Fix admin panel TypeScript errors: SimpleMDE toolbar type, PieChart label type

## User Experience Improvements
- Auto-uppercase invite code and share code inputs
- Visual feedback for case conversion with helper text
- Improved form validation with error codes

## CI/CD Pipeline
- Create comprehensive production deployment checklist (PRODUCTION_DEPLOYMENT_CHECKLIST.md)
- Add automated pre-deployment check script (pre-deploy-check.sh)
  - Validates frontend, backend, and admin panel builds
  - Checks git status, branch, and sync state
  - Verifies environment files and migrations
- Add quick start deployment guide (DEPLOYMENT_QUICK_START.md)
- Add production deployment automation template (deploy-production.sh)

## Cleanup
- Remove outdated push notifications documentation files
- Remove outdated PWA implementation plan

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Andrei
2025-10-09 21:27:39 +00:00
parent 40dbb2287a
commit c22fa82521
29 changed files with 1810 additions and 2130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
maternal-web/app/(auth)/forgot-password/page.tsx
View File

@@ -15,30 +15,31 @@ import { Email, ArrowBack } from '@mui/icons-material';
import { motion } from 'framer-motion';
import Link from 'next/link';
import apiClient from '@/lib/api/client';
import { useErrorMessage } from '@/components/common/ErrorMessage';
import { formatErrorMessage } from '@/lib/utils/errorHandler';
export default function ForgotPasswordPage() {
const [email, setEmail] = useState('');
const [loading, setLoading] = useState(false);
const [error, setError] = useState('');
const { error, showError, clearError, hasError } = useErrorMessage();
const [success, setSuccess] = useState(false);
const handleSubmit = async (e: React.FormEvent) => {
e.preventDefault();
if (!email.trim()) {
setError('Please enter your email address');
showError({ message: 'Please enter your email address', code: 'VALIDATION_EMAIL_REQUIRED' });
return;
}
setLoading(true);
setError('');
clearError();
try {
await apiClient.post('/api/v1/auth/password/forgot', { email });
setSuccess(true);
} catch (err: any) {
console.error('Forgot password error:', err);
setError(err.response?.data?.message || 'Failed to send reset email. Please try again.');
showError(err);
} finally {
setLoading(false);
}
@@ -97,9 +98,9 @@ export default function ForgotPasswordPage() {
</Typography>
</Box>
{error && (
<Alert severity="error" sx={{ mb: 3, borderRadius: 2 }}>
{error}
{hasError && (
<Alert severity="error" sx={{ mb: 3, borderRadius: 2 }} onClose={clearError}>
{formatErrorMessage(error)}
</Alert>
)}

22
maternal-web/app/(auth)/login/page.tsx
View File

@@ -28,6 +28,8 @@ import { startAuthentication } from '@simplewebauthn/browser';
import Link from 'next/link';
import { useTranslation } from '@/hooks/useTranslation';
import { useTheme } from '@mui/material/styles';
import { useErrorMessage } from '@/components/common/ErrorMessage';
import { formatErrorMessage } from '@/lib/utils/errorHandler';
const loginSchema = z.object({
email: z.string().email('Invalid email address'),
@@ -40,7 +42,7 @@ export default function LoginPage() {
const { t } = useTranslation('auth');
const theme = useTheme();
const [showPassword, setShowPassword] = useState(false);
const [error, setError] = useState<string | null>(null);
const { error, showError, clearError, hasError } = useErrorMessage();
const [isLoading, setIsLoading] = useState(false);
const [isBiometricLoading, setIsBiometricLoading] = useState(false);
const [isBiometricSupported, setIsBiometricSupported] = useState(false);
@@ -74,7 +76,7 @@ export default function LoginPage() {
};
const handleBiometricLogin = async () => {
setError(null);
clearError();
setIsBiometricLoading(true);
try {
@@ -100,11 +102,11 @@ export default function LoginPage() {
} catch (err: any) {
console.error('Biometric login failed:', err);
if (err.name === 'NotAllowedError') {
setError('Biometric authentication was cancelled');
showError({ message: 'Biometric authentication was cancelled', code: 'BIOMETRIC_CANCELLED' });
} else if (err.name === 'NotSupportedError') {
setError('Biometric authentication is not supported on this device');
showError({ message: 'Biometric authentication is not supported on this device', code: 'BIOMETRIC_NOT_SUPPORTED' });
} else {
setError(err.response?.data?.message || err.message || 'Biometric login failed. Please try again.');
showError(err);
}
} finally {
setIsBiometricLoading(false);
@@ -112,7 +114,7 @@ export default function LoginPage() {
};
const onSubmit = async (data: LoginFormData) => {
setError(null);
clearError();
setIsLoading(true);
try {
@@ -127,7 +129,7 @@ export default function LoginPage() {
mfaMethod: err.response.data.mfaMethod,
});
} else {
setError(err.message || 'Failed to login. Please check your credentials.');
showError(err);
}
} finally {
setIsLoading(false);
@@ -193,9 +195,9 @@ export default function LoginPage() {
{t('login.subtitle')}
</Typography>
{error && (
<Alert severity="error" sx={{ mb: 3, borderRadius: 2 }}>
{error}
{hasError && (
<Alert severity="error" sx={{ mb: 3, borderRadius: 2 }} onClose={clearError}>
{formatErrorMessage(error)}
</Alert>
)}

27
maternal-web/app/(auth)/register/page.tsx
View File

@@ -24,6 +24,8 @@ import { useAuth } from '@/lib/auth/AuthContext';
import Link from 'next/link';
import { useTheme } from '@mui/material/styles';
import apiClient from '@/lib/api/client';
import { useErrorMessage } from '@/components/common/ErrorMessage';
import { formatErrorMessage } from '@/lib/utils/errorHandler';
// Create a function to generate schema dynamically based on requireInviteCode
const createRegisterSchema = (requireInviteCode: boolean) => z.object({
@@ -79,7 +81,7 @@ export default function RegisterPage() {
const theme = useTheme();
const [showPassword, setShowPassword] = useState(false);
const [showConfirmPassword, setShowConfirmPassword] = useState(false);
const [error, setError] = useState<string | null>(null);
const { error, showError, clearError, hasError } = useErrorMessage();
const [isLoading, setIsLoading] = useState(false);
const [userAge, setUserAge] = useState<number | null>(null);
const [requiresParentalConsent, setRequiresParentalConsent] = useState(false);
@@ -150,11 +152,11 @@ export default function RegisterPage() {
}, [dateOfBirth]);
const onSubmit = async (data: RegisterFormData) => {
setError(null);
clearError();
// Validate invite code if required
if (requireInviteCode && (!data.inviteCode || data.inviteCode.trim() === '')) {
setError('Invite code is required to register');
showError({ message: 'Invite code is required to register', code: 'VALIDATION_INVITE_CODE_REQUIRED' });
return;
}
@@ -172,7 +174,7 @@ export default function RegisterPage() {
});
// Navigation to onboarding is handled in the register function
} catch (err: any) {
setError(err.message || 'Failed to register. Please try again.');
showError(err);
} finally {
setIsLoading(false);
}
@@ -224,9 +226,9 @@ export default function RegisterPage() {
Start your journey to organized parenting
</Typography>
{error && (
<Alert severity="error" sx={{ mb: 3, borderRadius: 2 }}>
{error}
{hasError && (
<Alert severity="error" sx={{ mb: 3, borderRadius: 2 }} onClose={clearError}>
{formatErrorMessage(error)}
</Alert>
)}
@@ -285,14 +287,21 @@ export default function RegisterPage() {
label="Invite Code"
margin="normal"
error={!!errors.inviteCode}
helperText={errors.inviteCode?.message || 'Enter your invite code to register'}
{...register('inviteCode')}
helperText={errors.inviteCode?.message || 'Invite codes are automatically converted to uppercase'}
{...register('inviteCode', {
setValueAs: (value) => value?.toUpperCase() || '',
})}
onChange={(e) => {
const uppercased = e.target.value.toUpperCase();
setValue('inviteCode', uppercased);
}}
disabled={isLoading}
required
inputProps={{
'aria-required': 'true',
'aria-invalid': !!errors.inviteCode,
'aria-describedby': errors.inviteCode ? 'invite-code-error' : 'invite-code-helper',
style: { textTransform: 'uppercase' },
}}
InputProps={{
sx: { borderRadius: 3 },

22
maternal-web/app/family/page.tsx
View File

@@ -38,6 +38,8 @@ import { RoleInvitesSection } from '@/components/family/RoleInvitesSection';
import { motion } from 'framer-motion';
import { useTranslation } from '@/hooks/useTranslation';
import { useSelectedFamily } from '@/hooks/useSelectedFamily';
import { useErrorMessage } from '@/components/common/ErrorMessage';
import { formatErrorMessage } from '@/lib/utils/errorHandler';
export default function FamilyPage() {
const { t } = useTranslation('family');
@@ -46,7 +48,7 @@ export default function FamilyPage() {
const [family, setFamily] = useState<Family | null>(null);
const [members, setMembers] = useState<FamilyMember[]>([]);
const [loading, setLoading] = useState(true);
const [error, setError] = useState<string>('');
const { error, showError, clearError, hasError } = useErrorMessage();
const [inviteDialogOpen, setInviteDialogOpen] = useState(false);
const [joinDialogOpen, setJoinDialogOpen] = useState(false);
const [removeDialogOpen, setRemoveDialogOpen] = useState(false);
@@ -63,7 +65,7 @@ export default function FamilyPage() {
fetchFamilyData();
} else {
setLoading(false);
setError(t('messages.noFamilyFound'));
showError({ message: t('messages.noFamilyFound'), code: 'NO_FAMILY_FOUND' });
}
}, [familyId, selectedIndex]);
@@ -72,7 +74,7 @@ export default function FamilyPage() {
try {
setLoading(true);
setError('');
clearError();
const [familyData, membersData] = await Promise.all([
familiesApi.getFamily(familyId),
familiesApi.getFamilyMembers(familyId),
@@ -86,8 +88,7 @@ export default function FamilyPage() {
[familyId]: familyData.name
}));
} catch (err: any) {
console.error('Failed to fetch family data:', err);
setError(err.response?.data?.message || t('messages.failedToLoad'));
showError(err);
} finally {
setLoading(false);
}
@@ -186,8 +187,7 @@ export default function FamilyPage() {
setRemoveDialogOpen(false);
setMemberToRemove(null);
} catch (err: any) {
console.error('Failed to remove member:', err);
setError(err.response?.data?.message || t('messages.failedToRemove'));
showError(err);
} finally {
setActionLoading(false);
}
@@ -281,9 +281,9 @@ export default function FamilyPage() {
</Paper>
)}
{error && (
<Alert severity="error" sx={{ mb: 3 }} onClose={() => setError('')}>
{error}
{hasError && (
<Alert severity="error" sx={{ mb: 3 }} onClose={clearError}>
{formatErrorMessage(error)}
</Alert>
)}
@@ -435,7 +435,7 @@ export default function FamilyPage() {
<RoleInvitesSection
familyId={familyId!}
onSuccess={(message) => setSnackbar({ open: true, message })}
onError={(message) => setError(message)}
onError={(err) => showError(err)}
/>
</Grid>
)}

20
maternal-web/app/track/activity/page.tsx
View File

@@ -51,6 +51,8 @@ import { useDispatch, useSelector } from 'react-redux';
import { fetchChildren, selectChild, selectSelectedChild, childrenSelectors } from '@/store/slices/childrenSlice';
import { AppDispatch, RootState } from '@/store/store';
import ChildSelector from '@/components/common/ChildSelector';
import { useErrorMessage } from '@/components/common/ErrorMessage';
import { formatErrorMessage } from '@/lib/utils/errorHandler';
interface ActivityData {
activityType: string;
@@ -83,7 +85,7 @@ function ActivityTrackPage() {
const [recentActivities, setRecentActivities] = useState<Activity[]>([]);
const [loading, setLoading] = useState(false);
const [activitiesLoading, setActivitiesLoading] = useState(false);
const [error, setError] = useState<string | null>(null);
const { error, showError, clearError, hasError } = useErrorMessage();
const [successMessage, setSuccessMessage] = useState<string | null>(null);
// Delete confirmation dialog
@@ -131,19 +133,19 @@ function ActivityTrackPage() {
const handleSubmit = async () => {
if (!selectedChild?.id) {
setError('Please select a child');
showError({ message: 'Please select a child', code: 'NO_CHILD_SELECTED' });
return;
}
// Validation
if (!activityType) {
setError('Please select activity type');
showError({ message: 'Please select activity type', code: 'VALIDATION_ERROR' });
return;
}
try {
setLoading(true);
setError(null);
clearError();
const data: ActivityData = {
activityType,
@@ -167,7 +169,7 @@ function ActivityTrackPage() {
await loadRecentActivities();
} catch (err: any) {
console.error('Failed to save activity:', err);
setError(err.response?.data?.message || 'Failed to save activity');
showError(err);
} finally {
setLoading(false);
}
@@ -197,7 +199,7 @@ function ActivityTrackPage() {
await loadRecentActivities();
} catch (err: any) {
console.error('Failed to delete activity:', err);
setError(err.response?.data?.message || 'Failed to delete activity');
showError(err);
} finally {
setLoading(false);
}
@@ -306,9 +308,9 @@ function ActivityTrackPage() {
/>
</Box>
{error && (
<Alert severity="error" sx={{ mb: 3 }} onClose={() => setError(null)}>
{error}
{hasError && (
<Alert severity="error" sx={{ mb: 3 }} onClose={clearError}>
{formatErrorMessage(error)}
</Alert>
)}

22
maternal-web/app/track/diaper/page.tsx
View File

@@ -48,6 +48,8 @@ import { childrenApi, Child } from '@/lib/api/children';
import { motion } from 'framer-motion';
import { useLocalizedDate } from '@/hooks/useLocalizedDate';
import { useTranslation } from '@/hooks/useTranslation';
import { useErrorMessage } from '@/components/common/ErrorMessage';
import { formatErrorMessage } from '@/lib/utils/errorHandler';
import { useDispatch, useSelector } from 'react-redux';
import { fetchChildren, selectChild, selectSelectedChild, childrenSelectors } from '@/store/slices/childrenSlice';
import { AppDispatch, RootState } from '@/store/store';
@@ -90,7 +92,7 @@ export default function DiaperTrackPage() {
const [recentDiapers, setRecentDiapers] = useState<Activity[]>([]);
const [loading, setLoading] = useState(false);
const [diapersLoading, setDiapersLoading] = useState(false);
const [error, setError] = useState<string | null>(null);
const { error, showError, clearError, hasError } = useErrorMessage();
const [successMessage, setSuccessMessage] = useState<string | null>(null);
// Delete confirmation dialog
@@ -215,24 +217,24 @@ export default function DiaperTrackPage() {
const handleSubmit = async () => {
if (!selectedChild?.id) {
setError('Please select a child');
showError({ message: 'Please select a child', code: 'NO_CHILD_SELECTED' });
return;
}
// Validation
if (!timestamp) {
setError('Please enter timestamp');
showError({ message: 'Please enter timestamp', code: 'VALIDATION_ERROR' });
return;
}
if (conditions.length === 0) {
setError('Please select at least one condition');
showError({ message: 'Please select at least one condition', code: 'VALIDATION_ERROR' });
return;
}
try {
setLoading(true);
setError(null);
clearError();
const data: DiaperData = {
diaperType,
@@ -260,7 +262,7 @@ export default function DiaperTrackPage() {
await loadRecentDiapers();
} catch (err: any) {
console.error('Failed to save diaper:', err);
setError(err.response?.data?.message || 'Failed to save diaper change');
showError(err);
} finally {
setLoading(false);
}
@@ -292,7 +294,7 @@ export default function DiaperTrackPage() {
await loadRecentDiapers();
} catch (err: any) {
console.error('Failed to delete diaper:', err);
setError(err.response?.data?.message || 'Failed to delete diaper change');
showError(err);
} finally {
setLoading(false);
}
@@ -421,9 +423,9 @@ export default function DiaperTrackPage() {
</Typography>
</Box>
{error && (
<Alert severity="error" sx={{ mb: 3 }} onClose={() => setError(null)}>
{error}
{hasError && (
<Alert severity="error" sx={{ mb: 3 }} onClose={clearError}>
{formatErrorMessage(error)}
</Alert>
)}

24
maternal-web/app/track/feeding/page.tsx
View File

@@ -54,6 +54,8 @@ import { motion } from 'framer-motion';
import { useLocalizedDate } from '@/hooks/useLocalizedDate';
import { useTranslation } from '@/hooks/useTranslation';
import { UnitInput } from '@/components/forms/UnitInput';
import { useErrorMessage } from '@/components/common/ErrorMessage';
import { formatErrorMessage } from '@/lib/utils/errorHandler';
import { convertVolume, getUnitSymbol } from '@/lib/utils/unitConversion';
import { MeasurementSystem } from '@/hooks/useLocale';
import { useDispatch, useSelector } from 'react-redux';
@@ -106,7 +108,7 @@ function FeedingTrackPage() {
const [recentFeedings, setRecentFeedings] = useState<Activity[]>([]);
const [loading, setLoading] = useState(false);
const [feedingsLoading, setFeedingsLoading] = useState(false);
const [error, setError] = useState<string | null>(null);
const { error, showError, clearError, hasError } = useErrorMessage();
const [successMessage, setSuccessMessage] = useState<string | null>(null);
// Delete confirmation dialog
@@ -186,29 +188,29 @@ function FeedingTrackPage() {
const handleSubmit = async () => {
if (!selectedChild?.id) {
setError(t('common.selectChild'));
showError({ message: t('common.selectChild'), code: 'NO_CHILD_SELECTED' });
return;
}
// Validation
if (feedingType === 'breast' && duration === 0 && timerSeconds === 0) {
setError(t('feeding.validation.durationRequired'));
showError({ message: t('feeding.validation.durationRequired'), code: 'VALIDATION_ERROR' });
return;
}
if (feedingType === 'bottle' && !amount) {
setError(t('feeding.validation.amountRequired'));
showError({ message: t('feeding.validation.amountRequired'), code: 'VALIDATION_ERROR' });
return;
}
if (feedingType === 'solid' && !foodDescription) {
setError(t('feeding.validation.foodRequired'));
showError({ message: t('feeding.validation.foodRequired'), code: 'VALIDATION_ERROR' });
return;
}
try {
setLoading(true);
setError(null);
clearError();
const data: FeedingData = {
feedingType,
@@ -241,7 +243,7 @@ function FeedingTrackPage() {
await loadRecentFeedings();
} catch (err: any) {
console.error('Failed to save feeding:', err);
setError(err.response?.data?.message || t('feeding.error.saveFailed'));
showError(err);
} finally {
setLoading(false);
}
@@ -276,7 +278,7 @@ function FeedingTrackPage() {
await loadRecentFeedings();
} catch (err: any) {
console.error('Failed to delete feeding:', err);
setError(err.response?.data?.message || t('feeding.error.deleteFailed'));
showError(err);
} finally {
setLoading(false);
}
@@ -398,9 +400,9 @@ function FeedingTrackPage() {
/>
</Box>
{error && (
<Alert severity="error" sx={{ mb: 3 }} onClose={() => setError(null)}>
{error}
{hasError && (
<Alert severity="error" sx={{ mb: 3 }} onClose={clearError}>
{formatErrorMessage(error)}
</Alert>
)}

26
maternal-web/app/track/growth/page.tsx
View File

@@ -50,6 +50,8 @@ import { fetchChildren, selectChild, selectSelectedChild, childrenSelectors } fr
import { AppDispatch, RootState } from '@/store/store';
import ChildSelector from '@/components/common/ChildSelector';
import { UnitInput } from '@/components/forms/UnitInput';
import { useErrorMessage } from '@/components/common/ErrorMessage';
import { formatErrorMessage } from '@/lib/utils/errorHandler';
interface GrowthData {
weight?: number; // in kg
@@ -84,7 +86,7 @@ function GrowthTrackPage() {
const [recentGrowth, setRecentGrowth] = useState<Activity[]>([]);
const [loading, setLoading] = useState(false);
const [growthLoading, setGrowthLoading] = useState(false);
const [error, setError] = useState<string | null>(null);
const { error, showError, clearError, hasError } = useErrorMessage();
const [successMessage, setSuccessMessage] = useState<string | null>(null);
// Delete confirmation dialog
@@ -132,31 +134,31 @@ function GrowthTrackPage() {
const handleSubmit = async () => {
if (!selectedChild?.id) {
setError(t('common.selectChild'));
showError({ message: t('common.selectChild'), code: 'NO_CHILD_SELECTED' });
return;
}
// Validation
if (measurementType === 'weight' && weight === 0) {
setError('Please enter weight');
showError({ message: 'Please enter weight', code: 'VALIDATION_ERROR' });
return;
}
if (measurementType === 'height' && height === 0) {
setError('Please enter height');
showError({ message: 'Please enter height', code: 'VALIDATION_ERROR' });
return;
}
if (measurementType === 'head' && headCircumference === 0) {
setError('Please enter head circumference');
showError({ message: 'Please enter head circumference', code: 'VALIDATION_ERROR' });
return;
}
if (measurementType === 'all' && (weight === 0 || height === 0 || headCircumference === 0)) {
setError('Please enter all measurements');
showError({ message: 'Please enter all measurements', code: 'VALIDATION_ERROR' });
return;
}
try {
setLoading(true);
setError(null);
clearError();
const data: GrowthData = {
measurementType,
@@ -181,7 +183,7 @@ function GrowthTrackPage() {
await loadRecentGrowth();
} catch (err: any) {
console.error('Failed to save growth:', err);
setError(err.response?.data?.message || 'Failed to save growth measurement');
showError(err);
} finally {
setLoading(false);
}
@@ -212,7 +214,7 @@ function GrowthTrackPage() {
await loadRecentGrowth();
} catch (err: any) {
console.error('Failed to delete growth:', err);
setError(err.response?.data?.message || 'Failed to delete growth measurement');
showError(err);
} finally {
setLoading(false);
}
@@ -324,9 +326,9 @@ function GrowthTrackPage() {
/>
</Box>
{error && (
<Alert severity="error" sx={{ mb: 3 }} onClose={() => setError(null)}>
{error}
{hasError && (
<Alert severity="error" sx={{ mb: 3 }} onClose={clearError}>
{formatErrorMessage(error)}
</Alert>
)}

26
maternal-web/app/track/medicine/page.tsx
View File

@@ -53,6 +53,8 @@ import { useTranslation } from '@/hooks/useTranslation';
import { UnitInput } from '@/components/forms/UnitInput';
import { convertVolume, convertTemperature } from '@/lib/utils/unitConversion';
import { MeasurementSystem } from '@/hooks/useLocale';
import { useErrorMessage } from '@/components/common/ErrorMessage';
import { formatErrorMessage } from '@/lib/utils/errorHandler';
import { useDispatch, useSelector } from 'react-redux';
import { fetchChildren, selectChild, selectSelectedChild, childrenSelectors } from '@/store/slices/childrenSlice';
import { AppDispatch, RootState } from '@/store/store';
@@ -121,7 +123,7 @@ function MedicalTrackPage() {
const [recentActivities, setRecentActivities] = useState<Activity[]>([]);
const [loading, setLoading] = useState(false);
const [activitiesLoading, setActivitiesLoading] = useState(false);
const [error, setError] = useState<string | null>(null);
const { error, showError, clearError, hasError } = useErrorMessage();
const [successMessage, setSuccessMessage] = useState<string | null>(null);
// Delete confirmation dialog
@@ -184,36 +186,36 @@ function MedicalTrackPage() {
const handleSubmit = async () => {
if (!selectedChild?.id) {
setError(t('common.selectChild'));
showError({ message: t('common.selectChild'), code: 'NO_CHILD_SELECTED' });
return;
}
// Validation based on activity type
if (activityType === 'medication') {
if (!medicineName) {
setError(t('health.medicineName.required'));
showError({ message: t('health.medicineName.required'), code: 'VALIDATION_ERROR' });
return;
}
const dosageValue = unit === 'ml' ? dosage : dosageText;
if (!dosageValue || (unit === 'ml' && dosage === 0) || (unit !== 'ml' && !dosageText)) {
setError(t('health.dosage.required'));
showError({ message: t('health.dosage.required'), code: 'VALIDATION_ERROR' });
return;
}
} else if (activityType === 'temperature') {
if (temperature === 0) {
setError('Please enter temperature');
showError({ message: 'Please enter temperature', code: 'VALIDATION_ERROR' });
return;
}
} else if (activityType === 'doctor') {
if (!visitType) {
setError('Please select visit type');
showError({ message: 'Please select visit type', code: 'VALIDATION_ERROR' });
return;
}
}
try {
setLoading(true);
setError(null);
clearError();
let data: MedicationData | TemperatureData | DoctorVisitData;
@@ -253,7 +255,7 @@ function MedicalTrackPage() {
await loadRecentActivities();
} catch (err: any) {
console.error('Failed to save activity:', err);
setError(err.response?.data?.message || 'Failed to save activity');
showError(err);
} finally {
setLoading(false);
}
@@ -299,7 +301,7 @@ function MedicalTrackPage() {
await loadRecentActivities();
} catch (err: any) {
console.error('Failed to delete activity:', err);
setError(err.response?.data?.message || 'Failed to delete activity');
showError(err);
} finally {
setLoading(false);
}
@@ -446,9 +448,9 @@ function MedicalTrackPage() {
/>
</Box>
{error && (
<Alert severity="error" sx={{ mb: 3 }} onClose={() => setError(null)}>
{error}
{hasError && (
<Alert severity="error" sx={{ mb: 3 }} onClose={clearError}>
{formatErrorMessage(error)}
</Alert>
)}

24
maternal-web/app/track/sleep/page.tsx
View File

@@ -47,6 +47,8 @@ import { childrenApi, Child } from '@/lib/api/children';
import { motion } from 'framer-motion';
import { useLocalizedDate } from '@/hooks/useLocalizedDate';
import { useTranslation } from '@/hooks/useTranslation';
import { useErrorMessage } from '@/components/common/ErrorMessage';
import { formatErrorMessage } from '@/lib/utils/errorHandler';
import { useDispatch, useSelector } from 'react-redux';
import { fetchChildren, selectChild, selectSelectedChild, childrenSelectors } from '@/store/slices/childrenSlice';
import { AppDispatch, RootState } from '@/store/store';
@@ -91,7 +93,7 @@ export default function SleepTrackPage() {
const [recentSleeps, setRecentSleeps] = useState<Activity[]>([]);
const [loading, setLoading] = useState(false);
const [sleepsLoading, setSleepsLoading] = useState(false);
const [error, setError] = useState<string | null>(null);
const { error, showError, clearError, hasError } = useErrorMessage();
const [successMessage, setSuccessMessage] = useState<string | null>(null);
// Delete confirmation dialog
@@ -181,18 +183,18 @@ export default function SleepTrackPage() {
const handleSubmit = async () => {
if (!selectedChild?.id) {
setError('Please select a child');
showError({ message: 'Please select a child', code: 'NO_CHILD_SELECTED' });
return;
}
// Validation
if (!startTime) {
setError('Please enter start time');
showError({ message: 'Please enter start time', code: 'VALIDATION_ERROR' });
return;
}
if (!isOngoing && !endTime) {
setError('Please enter end time or mark as ongoing');
showError({ message: 'Please enter end time or mark as ongoing', code: 'VALIDATION_ERROR' });
return;
}
@@ -200,14 +202,14 @@ export default function SleepTrackPage() {
const start = new Date(startTime);
const end = new Date(endTime);
if (end <= start) {
setError('End time must be after start time');
showError({ message: 'End time must be after start time', code: 'VALIDATION_ERROR' });
return;
}
}
try {
setLoading(true);
setError(null);
clearError();
const data: SleepData = {
startTime,
@@ -236,7 +238,7 @@ export default function SleepTrackPage() {
await loadRecentSleeps();
} catch (err: any) {
console.error('Failed to save sleep:', err);
setError(err.response?.data?.message || 'Failed to save sleep');
showError(err);
} finally {
setLoading(false);
}
@@ -268,7 +270,7 @@ export default function SleepTrackPage() {
await loadRecentSleeps();
} catch (err: any) {
console.error('Failed to delete sleep:', err);
setError(err.response?.data?.message || 'Failed to delete sleep');
showError(err);
} finally {
setLoading(false);
}
@@ -380,9 +382,9 @@ export default function SleepTrackPage() {
</Typography>
</Box>
{error && (
<Alert severity="error" sx={{ mb: 3 }} onClose={() => setError(null)}>
{error}
{hasError && (
<Alert severity="error" sx={{ mb: 3 }} onClose={clearError}>
{formatErrorMessage(error)}
</Alert>
)}