Merge remote-tracking branch 'origin/MVPTN-77' into release(MVP/Sprint5)

This commit is contained in:
Keven Willian Pereira de Souza 2025-09-24 14:34:55 -03:00
commit 7546ec90b3
8 changed files with 45 additions and 84 deletions

View file

@ -15,6 +15,7 @@ import { useGTBEstadoCivilSaveHook } from "../../_hooks/g_tb_estadocivil/useGTBE
import { useGTBEstadoCivilRemoveHook } from "../../_hooks/g_tb_estadocivil/useGTBEstadoCivilRemoveHook";
import { GTBEstadoCivilInterface } from "../../_interfaces/GTBEstadoCivilInterface";
import { useResponse } from "@/app/_response/ResponseContext";
const initalEstadoCivil: GTBEstadoCivilInterface = {
tb_estadocivil_id: 0,
@ -25,6 +26,12 @@ const initalEstadoCivil: GTBEstadoCivilInterface = {
export default function TBEstadoCivilPage() {
// Controle de exibição de respostas
const { setResponse } = useResponse();
// Controle de estado do botão
const [buttonIsLoading, setButtonIsLoading] = useState(false);
// Hooks para leitura e salvamento
const { gTBEstadoCivil, fetchGTBEstadoCivil } = useGTBEstadoCivilReadHook();
const { saveGTBEstadoCivil } = useGTBEstadoCivilSaveHook();
@ -39,7 +46,6 @@ export default function TBEstadoCivilPage() {
const {
isOpen: isConfirmOpen,
openDialog: openConfirmDialog,
handleConfirm,
handleCancel,
} = useConfirmDialog();
@ -55,7 +61,11 @@ export default function TBEstadoCivilPage() {
}, []);
const handleSave = useCallback(async (data: GTBEstadoCivilInterface) => {
// Coloca o botão em estado de loading
setButtonIsLoading(true);
await saveGTBEstadoCivil(data);
// Remove o botão do estado de loading
setButtonIsLoading(false);
await fetchGTBEstadoCivil(); // Atualiza a tabela após salvar
handleCloseForm();
}, [saveGTBEstadoCivil, fetchGTBEstadoCivil]);
@ -67,10 +77,17 @@ export default function TBEstadoCivilPage() {
}, [openConfirmDialog]);
const handleDelete = useCallback(async () => {
if (itemToDelete) {
await removeGTBEstadoCivil(itemToDelete);
await fetchGTBEstadoCivil(); // Atualiza a tabela após remover
}
if (!itemToDelete) {
// Define os dados da resposta visual
setResponse({
status: 400,
message: 'Não foi informado um registro para exclusão'
});
return;
};
await removeGTBEstadoCivil(itemToDelete);
await fetchGTBEstadoCivil(); // Atualiza a tabela após remover
handleCancel();
}, [itemToDelete, fetchGTBEstadoCivil, handleCancel]);
@ -78,7 +95,7 @@ export default function TBEstadoCivilPage() {
useEffect(() => {
fetchGTBEstadoCivil();
}, []);
// Mostra tela de loading enquanto os dados não são carregados
if (!gTBEstadoCivil) {
return <Loading type={2} />;
@ -123,6 +140,7 @@ export default function TBEstadoCivilPage() {
data={selectedEstadoCivil}
onClose={handleCloseForm}
onSave={handleSave}
buttonIsLoading={buttonIsLoading}
/>
</div>
);

View file

@ -5,6 +5,7 @@ import { useEffect } from "react";
import { useForm, Controller } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import LoadingButton from "@/app/_components/loadingButton/LoadingButton";
import { Button } from "@/components/ui/button";
import { Checkbox } from "@/components/ui/checkbox";
import {
@ -37,9 +38,10 @@ interface TBEstadoCivilFormProps {
data: FormValues | null;
onClose: (item: null, isFormStatus: boolean) => void;
onSave: (data: FormValues) => void;
buttonIsLoading: boolean;
}
export default function GTBEstadoCivilForm({ isOpen, data, onClose, onSave }: TBEstadoCivilFormProps) {
export default function GTBEstadoCivilForm({ isOpen, data, onClose, onSave, buttonIsLoading }: TBEstadoCivilFormProps) {
// Inicializa o react-hook-form com o schema Zod
const form = useForm<FormValues>({
resolver: zodResolver(GTBEstadoCivilSchema),
@ -113,9 +115,8 @@ export default function GTBEstadoCivilForm({ isOpen, data, onClose, onSave }: TB
Cancelar
</Button>
</DialogClose>
<Button type="submit" className="cursor-pointer">
Salvar
</Button>
{/* Botão de loading */}
<LoadingButton text="Salvar" textLoading="Aguarde..." type="submit" loading={buttonIsLoading} />
</DialogFooter>
{/* Campos ocultos */}

View file

@ -1,14 +1,8 @@
import API from "@/services/api/Api";
import { Methods } from "@/services/api/enums/ApiMethodEnum";
import EstadoCivilMockDeDados from "./mockEstadoCivil";
const useMock = true
export default async function GTBEstadoCivilIndexData() {
if (useMock) {
console.log(EstadoCivilMockDeDados())
return await EstadoCivilMockDeDados();
}
const api = new API();
try {

View file

@ -2,7 +2,7 @@ import API from "@/services/api/Api";
import { GTBEstadoCivilInterface } from "../../_interfaces/GTBEstadoCivilInterface";
import { Methods } from "@/services/api/enums/ApiMethodEnum";
export default async function GTBEstadoCivilRemoveData(data: GTBEstadoCivilInterface) {
export default async function executeGTBEstadoCivilRemoveData(data: GTBEstadoCivilInterface) {
const api = new API();

View file

@ -1,58 +0,0 @@
import { GTBBairroInterface } from "../../_interfaces/GTBBairroInterface";
export default async function EstadoCivilMockDeDados() {
return Promise.resolve({
status: 200,
message: 'Dados localizados',
data: [
{
tb_estadocivil_id: 26.00,
sistema_id: 2.00,
descricao: "casado",
situacao: "A",
},
{
tb_estadocivil_id: 27.00,
sistema_id: 2.00,
descricao: "solteiro(a)",
situacao: "A",
},
{
tb_estadocivil_id: 28.00,
sistema_id: 2.00,
descricao: "desquitado(a)",
situacao: "A",
},
{
tb_estadocivil_id: 29.00,
sistema_id: 2.00,
descricao: "divorciado(a)",
situacao: "A",
},
{
tb_estadocivil_id: 30.00,
sistema_id: 2.00,
descricao: "espólio",
situacao: "A",
},
{
tb_estadocivil_id: 31.00,
sistema_id: 2.00,
descricao: "menor impúbere",
situacao: "A",
},
{
tb_estadocivil_id: 32.00,
sistema_id: 2.00,
descricao: "menor púbere",
situacao: "A",
},
{
tb_estadocivil_id: 33.00,
sistema_id: 2.00,
descricao: "não consta",
situacao: "A",
}
]
});
}

View file

@ -1,12 +1,14 @@
import { withClientErrorHandler } from "@/actions/withClientErrorHandler/withClientErrorHandler";
import GTBEstadoCivilIndexData from "../../_data/GTBEstadoCivil/GTBEstadoCivilIndexData";
export default async function GTBEstadoCivilIndexService() {
async function executeGTBEstadoCivilIndexService() {
try {
const response = await GTBEstadoCivilIndexData();
return response;
} catch (error) {
console.log(error)
return error
}
}
}
export const GTBEstadoCivilIndexService = withClientErrorHandler(executeGTBEstadoCivilIndexService)

View file

@ -1,10 +1,13 @@
import { withClientErrorHandler } from "@/actions/withClientErrorHandler/withClientErrorHandler";
import GTBEstadoCivilSaveData from "../../_data/GTBEstadoCivil/GTBEstadoCivilSaveData";
import { GTBEstadoCivilInterface } from "../../_interfaces/GTBEstadoCivilInterface";
export default async function GTBEstadoCivilRemoveService(data: GTBEstadoCivilInterface) {
async function executeGTBEstadoCivilRemoveService(data: GTBEstadoCivilInterface) {
const response = await GTBEstadoCivilSaveData(data);
return response;
}
}
export const GTBEstadoCivilRemoveService = withClientErrorHandler(executeGTBEstadoCivilRemoveService)

View file

@ -1,12 +1,13 @@
import { withClientErrorHandler } from "@/actions/withClientErrorHandler/withClientErrorHandler";
import GTBEstadoCivilSaveData from "../../_data/GTBEstadoCivil/GTBEstadoCivilSaveData";
import { GTBEstadoCivilInterface } from "../../_interfaces/GTBEstadoCivilInterface";
export default async function GTBEstadoCivilSaveService(data: GTBEstadoCivilInterface) {
async function executeGTBEstadoCivilSaveService(data: GTBEstadoCivilInterface) {
const response = await GTBEstadoCivilSaveData(data);
console.log('GTBRegimeComunhaoSaveData', response)
return response;
}
}
export const GTBEstadoCivilSaveService = withClientErrorHandler(executeGTBEstadoCivilSaveService)