From a0e737aa11e2506a18af0a3dcceffbcaba96db31 Mon Sep 17 00:00:00 2001 From: c00b3r Date: Mon, 30 Jun 2025 13:11:15 +0500 Subject: [PATCH] fix: update ClientModal submit button logic to include email comparison and adjust ManagerSelect to ensure selected manager displays correctly --- src/components/ManagerSelect.tsx | 6 ++---- src/components/modals/ClientModal.tsx | 10 +++++++++- src/pages/SessionsPage.tsx | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/components/ManagerSelect.tsx b/src/components/ManagerSelect.tsx index 918f71b..fc8db42 100644 --- a/src/components/ManagerSelect.tsx +++ b/src/components/ManagerSelect.tsx @@ -16,7 +16,7 @@ function ManagerSelect({ }) { const [isOpen, setIsOpen] = useState(false); const [selectedManager, setSelectedManager] = useState( - data[0] || null + data[0] ); const [position, setPosition] = useState<"top" | "bottom">("bottom"); const selectRef = useClickAway(() => setIsOpen(false)); @@ -58,9 +58,7 @@ function ManagerSelect({
-
- {selectedManager?.fullname || data[0].fullname} -
+
{selectedManager?.fullname}
diff --git a/src/components/modals/ClientModal.tsx b/src/components/modals/ClientModal.tsx index f3adbee..285de47 100644 --- a/src/components/modals/ClientModal.tsx +++ b/src/components/modals/ClientModal.tsx @@ -108,7 +108,15 @@ function ClientModal({ client }: { client: Client }) { size="large" className="w-full" type="submit" - disabled={!clientData.name || !clientData.phone || isPending} + disabled={ + !clientData.name || + !clientData.phone || + isPending || + (clientData.name === client.name && + clientData.phone.replace(/\D/g, "") === + client.phone.replace(/\D/g, "") && + clientData.email === client.email) + } > {isPending ? ( diff --git a/src/pages/SessionsPage.tsx b/src/pages/SessionsPage.tsx index 21e9869..89fa99d 100644 --- a/src/pages/SessionsPage.tsx +++ b/src/pages/SessionsPage.tsx @@ -146,7 +146,7 @@ function SessionsPage() { ) : grouppedSessions?.length ? ( grouppedSessions?.map(([timestamp, sessions]) => (
-

+

{isToday(new Date(timestamp)) ? "Сегодня" : format(new Date(timestamp), "d MMMM", { locale: ru })}