diff --git a/result.txt b/result.txt index 6d8f9d2..2ae845d 100644 --- a/result.txt +++ b/result.txt @@ -170,7 +170,7 @@ │ │ ├── notifications │ │ │ ├── NotificationsPage.tsx │ │ │ ├── components -│ │ │ │ ├── NotificationDetailsModal.tsx +│ │ │ │ ├── NotificationDetailsDrawer.tsx │ │ │ │ ├── NotificationsHistoryTable.tsx │ │ │ │ ├── SendNotificationForm.tsx │ │ ├── permissions diff --git a/src/pages/monthlyOrders/MonthlyOrdersSettingsPage.tsx b/src/pages/monthlyOrders/MonthlyOrdersSettingsPage.tsx index 7335782..58c4400 100644 --- a/src/pages/monthlyOrders/MonthlyOrdersSettingsPage.tsx +++ b/src/pages/monthlyOrders/MonthlyOrdersSettingsPage.tsx @@ -1,10 +1,12 @@ import { useEffect } from 'react' -import { Box, Button, Group, NumberInput, Paper, Stack, Title, Text, Select, Textarea } from '@mantine/core' +import { Box, Button, Group, NumberInput, Paper, Stack, Text, Select, Textarea, Skeleton } from '@mantine/core' import { DateTimePicker } from '@mantine/dates' import { useForm } from '@mantine/form' -import { useMonthlyOrderSettings, useSaveMonthlyOrderSettings } from '@/features/monthlyOrders/hooks/useMonthlyOrderSettings' +import { IconDeviceFloppy, IconInfoCircle } from '@tabler/icons-react' import dayjs from 'dayjs' -import { IconDeviceFloppy } from '@tabler/icons-react' + +import { useMonthlyOrderSettings, useSaveMonthlyOrderSettings } from '@/features/monthlyOrders/hooks/useMonthlyOrderSettings' +import { PageHeader } from '@/components/ui/PageHeader' interface SettingsFormValues { deadline_date: Date | null @@ -34,76 +36,112 @@ export default function MonthlyOrdersSettingsPage() { if (currentSettings) { form.setValues({ deadline_date: currentSettings.deadline_date ? new Date(currentSettings.deadline_date) : null, - assembly_time_days: currentSettings.assembly_time_days || 3, + assembly_time_days: currentSettings.assembly_time_days ?? 3, market_stage: currentSettings.market_stage || null, market_stage_comment: currentSettings.market_stage_comment || '', }) + form.resetDirty() // Сбрасываем флаг изменений после загрузки данных } + // eslint-disable-next-line react-hooks/exhaustive-deps }, [currentSettings]) const handleSubmit = (values: SettingsFormValues) => { - saveSettings({ - deadline_date: values.deadline_date ? dayjs(values.deadline_date).format() : null, - assembly_time_days: values.assembly_time_days, - market_stage: values.market_stage, - market_stage_comment: values.market_stage_comment, - }) + saveSettings( + { + deadline_date: values.deadline_date ? dayjs(values.deadline_date).format() : null, + assembly_time_days: values.assembly_time_days, + market_stage: values.market_stage, + market_stage_comment: values.market_stage_comment, + }, + { + onSuccess: () => form.resetDirty(), // После успешного сохранения кнопка снова блокируется + } + ) } - if (isLoading) return Загрузка... - return ( - - Настройки: Заказ товаров на месяц + + - -
+ {isLoading ? ( + - - Эти настройки применяются к текущему месяцу. Заказы открываются автоматически 15-го числа и закрываются в указанную дату. - - - - -