From aeea5c31af09e883b073a37dd69cc54e8e03092f Mon Sep 17 00:00:00 2001 From: Wikzyy Date: Mon, 17 Mar 2025 11:06:58 +0700 Subject: [PATCH] add validation empty field on create and update form --- src/pages/master/municipios/blocks/AddDialog.tsx | 4 ++-- src/pages/master/municipios/blocks/EditDialog.tsx | 4 ++-- src/pages/master/municipios/blocks/ListToolbar.tsx | 4 ++-- .../municipios/hooks/ManageMunicipiosContext.tsx | 5 +++-- src/pages/master/postoadms/blocks/AddDialog.tsx | 2 +- src/pages/master/postoadms/blocks/EditDialog.tsx | 2 +- src/pages/master/products/blocks/AddDialog.tsx | 12 ++++++------ src/pages/master/products/blocks/EditDialog.tsx | 8 ++++---- src/pages/master/profession/blocks/AddDialog.tsx | 2 +- src/pages/master/profession/blocks/EditDialog.tsx | 2 +- src/pages/master/provider/blocks/AddDialog.tsx | 12 ++++++------ src/pages/master/provider/blocks/EditDialog.tsx | 12 ++++++------ src/pages/master/sucos/blocks/AddDialog.tsx | 2 +- src/pages/master/sucos/blocks/EditDialog.tsx | 2 +- 14 files changed, 37 insertions(+), 36 deletions(-) diff --git a/src/pages/master/municipios/blocks/AddDialog.tsx b/src/pages/master/municipios/blocks/AddDialog.tsx index 03fca26..082889e 100644 --- a/src/pages/master/municipios/blocks/AddDialog.tsx +++ b/src/pages/master/municipios/blocks/AddDialog.tsx @@ -72,12 +72,12 @@ const AddDialog = () => { const handleSubmit = (e: React.FormEvent) => { e.preventDefault(); - if (formField.name === '') { + if (formField.name.trim() === '') { setAlert({ show: true, message: 'Please fill name field.' }); return; } - doCreateMunicipio(e); + // doCreateMunicipio(e); console.log(parsedUser.email); console.log(formField); setAlert({ show: false, message: '' }); diff --git a/src/pages/master/municipios/blocks/EditDialog.tsx b/src/pages/master/municipios/blocks/EditDialog.tsx index 0579d28..ed04567 100644 --- a/src/pages/master/municipios/blocks/EditDialog.tsx +++ b/src/pages/master/municipios/blocks/EditDialog.tsx @@ -77,7 +77,7 @@ const EditDialog = () => { const handleUpdate = (e: React.FormEvent) => { e.preventDefault(); - if (formField.name === '') { + if (formField.name.trim() === '') { setAlert({ show: true, message: 'Please fill name field.' }); return; } @@ -88,7 +88,7 @@ const EditDialog = () => { // created_at: formattedTime // }); - doUpdateMunicipios(e); + // doUpdateMunicipios(e); console.log(formField); setAlert({ show: false, message: '' }); }; diff --git a/src/pages/master/municipios/blocks/ListToolbar.tsx b/src/pages/master/municipios/blocks/ListToolbar.tsx index abbdce2..68dd8fe 100644 --- a/src/pages/master/municipios/blocks/ListToolbar.tsx +++ b/src/pages/master/municipios/blocks/ListToolbar.tsx @@ -29,8 +29,8 @@ const ListToolbar = () => { setSearchName(event.target.value)} + value={(table.getColumn('name')?.getFilterValue() as string) ?? ''} + onChange={(event) => table.getColumn('name')?.setFilterValue(event.target.value)} /> diff --git a/src/pages/master/municipios/hooks/ManageMunicipiosContext.tsx b/src/pages/master/municipios/hooks/ManageMunicipiosContext.tsx index 606ef0d..1ac9904 100644 --- a/src/pages/master/municipios/hooks/ManageMunicipiosContext.tsx +++ b/src/pages/master/municipios/hooks/ManageMunicipiosContext.tsx @@ -113,8 +113,9 @@ const ManageMunicipiosProvider = ({ children }: { children: React.ReactNode }) = } }, { - accessorFn: (row) => row.name, - id: 'name', + // accessorFn: (row) => row.name, + // id: 'name', + accessorKey: 'name', header: ({ column }) => , enableSorting: true, enableHiding: false, diff --git a/src/pages/master/postoadms/blocks/AddDialog.tsx b/src/pages/master/postoadms/blocks/AddDialog.tsx index 42126b9..64590bf 100644 --- a/src/pages/master/postoadms/blocks/AddDialog.tsx +++ b/src/pages/master/postoadms/blocks/AddDialog.tsx @@ -83,7 +83,7 @@ const AddDialog = () => { const handleSubmit = (e: React.FormEvent) => { e.preventDefault(); - if (formField.name === '' || formField.municipio_id === 0) { + if (formField.name.trim() === '' || formField.municipio_id === 0) { setAlert({ show: true, message: 'Please fill in all required fields.' }); return; } diff --git a/src/pages/master/postoadms/blocks/EditDialog.tsx b/src/pages/master/postoadms/blocks/EditDialog.tsx index c42423b..abb8f0d 100644 --- a/src/pages/master/postoadms/blocks/EditDialog.tsx +++ b/src/pages/master/postoadms/blocks/EditDialog.tsx @@ -83,7 +83,7 @@ const EditDialog = () => { const handleUpdate = (e: React.FormEvent) => { e.preventDefault(); - if (formField.name === '' || formField.municipio_id === 0) { + if (formField.name.trim() === '' || formField.municipio_id === 0) { setAlert({ show: true, message: 'Please fill in all required fields.' }); return; } diff --git a/src/pages/master/products/blocks/AddDialog.tsx b/src/pages/master/products/blocks/AddDialog.tsx index dc6ec88..3debb85 100644 --- a/src/pages/master/products/blocks/AddDialog.tsx +++ b/src/pages/master/products/blocks/AddDialog.tsx @@ -71,21 +71,21 @@ const AddDialog = () => { e.preventDefault(); if ( - formField.name === '' || - formField.description === '' || + formField.name.trim() === '' || + formField.description.trim() === '' || formField.price_point === 0 || formField.price_cash === 0 || formField.cashback_point === 0 || formField.cashback_cash === 0 || - formField.status === '' || - formField.created_by === '' || - formField.created_at === '' + formField.status.trim() === '' || + formField.created_by.trim() === '' || + formField.created_at.trim() === '' ) { setAlert({ show: true, message: 'Please fill in all required fields.' }); return; } - doCreateProduct(e); + // doCreateProduct(e); console.log(formField); setAlert({ show: false, message: '' }); }; diff --git a/src/pages/master/products/blocks/EditDialog.tsx b/src/pages/master/products/blocks/EditDialog.tsx index 5f5e45c..a34f93d 100644 --- a/src/pages/master/products/blocks/EditDialog.tsx +++ b/src/pages/master/products/blocks/EditDialog.tsx @@ -70,15 +70,15 @@ const EditDialog = () => { e.preventDefault(); if ( - formField.name === '' || - formField.description === '' || + formField.name.trim() === '' || + formField.description.trim() === '' || formField.price_point === 0 || formField.price_cash === 0 || formField.cashback_point === 0 || formField.cashback_cash === 0 || formField.status === '' || - formField.updated_by === '' || - formField.updated_at === '' + formField.updated_by.trim() === '' || + formField.updated_at.trim() === '' ) { setAlert({ show: true, message: 'Please fill in all required fields.' }); return; diff --git a/src/pages/master/profession/blocks/AddDialog.tsx b/src/pages/master/profession/blocks/AddDialog.tsx index 247ff73..f87c9f9 100644 --- a/src/pages/master/profession/blocks/AddDialog.tsx +++ b/src/pages/master/profession/blocks/AddDialog.tsx @@ -61,7 +61,7 @@ const AddDialog = () => { const handleSubmit = (e: React.FormEvent) => { e.preventDefault(); - if (formField.name === '') { + if (formField.name.trim() === '') { setAlert({ show: true, message: 'Please fill name field.' }); return; } diff --git a/src/pages/master/profession/blocks/EditDialog.tsx b/src/pages/master/profession/blocks/EditDialog.tsx index ad592da..7dfc06c 100644 --- a/src/pages/master/profession/blocks/EditDialog.tsx +++ b/src/pages/master/profession/blocks/EditDialog.tsx @@ -65,7 +65,7 @@ const EditDialog = () => { const handleUpdate = (e: React.FormEvent) => { e.preventDefault(); - if (formField.name === '') { + if (formField.name.trim() === '') { setAlert({ show: true, message: 'Please fill name field.' }); return; } diff --git a/src/pages/master/provider/blocks/AddDialog.tsx b/src/pages/master/provider/blocks/AddDialog.tsx index 854ebf9..636ba54 100644 --- a/src/pages/master/provider/blocks/AddDialog.tsx +++ b/src/pages/master/provider/blocks/AddDialog.tsx @@ -100,12 +100,12 @@ const AddDialog = () => { e.preventDefault(); if ( - formField.name === '' || - formField.description === '' || - formField.type === '' || - formField.status === '' || - formField.transactionTypeId === '' || - formField.agentId === '' + formField.name.trim() === '' || + formField.description.trim() === '' || + formField.type.trim() === '' || + formField.status.trim() === '' || + formField.transactionTypeId.trim() === '' || + formField.agentId.trim() === '' ) { setAlert({ show: true, message: 'Please fill in all required fields.' }); return; diff --git a/src/pages/master/provider/blocks/EditDialog.tsx b/src/pages/master/provider/blocks/EditDialog.tsx index 3cd2b6c..5fa37c2 100644 --- a/src/pages/master/provider/blocks/EditDialog.tsx +++ b/src/pages/master/provider/blocks/EditDialog.tsx @@ -114,12 +114,12 @@ const EditDialog = () => { e.preventDefault(); if ( - formField.name === '' || - formField.description === '' || - formField.type === '' || - formField.status === '' || - formField.transactionTypeId === '' || - formField.agentId === '' + formField.name.trim() === '' || + formField.description.trim() === '' || + formField.type.trim() === '' || + formField.status.trim() === '' || + formField.transactionTypeId.trim() === '' || + formField.agentId.trim() === '' ) { setAlert({ show: true, message: 'Please fill in all required fields.' }); return; diff --git a/src/pages/master/sucos/blocks/AddDialog.tsx b/src/pages/master/sucos/blocks/AddDialog.tsx index e9e0ad0..c6c4c39 100644 --- a/src/pages/master/sucos/blocks/AddDialog.tsx +++ b/src/pages/master/sucos/blocks/AddDialog.tsx @@ -62,7 +62,7 @@ const AddDialog = () => { const handleSubmit = (e: React.FormEvent) => { e.preventDefault(); - if (formField.name === '' || formField.posto_adm_id === 0) { + if (formField.name.trim() === '' || formField.posto_adm_id === 0) { setAlert({ show: true, message: 'Please fill in all required fields.' }); return; } diff --git a/src/pages/master/sucos/blocks/EditDialog.tsx b/src/pages/master/sucos/blocks/EditDialog.tsx index 6d70b64..64c8b94 100644 --- a/src/pages/master/sucos/blocks/EditDialog.tsx +++ b/src/pages/master/sucos/blocks/EditDialog.tsx @@ -68,7 +68,7 @@ const EditDialog = () => { const handleUpdate = (e: React.FormEvent) => { e.preventDefault(); - if (formField.name === '' || formField.posto_adm_id === 0) { + if (formField.name.trim() === '' || formField.posto_adm_id === 0) { setAlert({ show: true, message: 'Please fill in all required fields.' }); return; }