@orbe-agro/client-core 5.6.295 → 5.6.297

package/lib/@ecme/constants/index.ts

@@ -1,6 +1,7 @@
 // Constants exports
 export * from './api.constant';
 export * from './app.constant';
+export * from './auth.constant';
 export * from './chart.constant';
 export * from './countries.constant';
 export * from './navigation.constant';

package/lib/@ecme/views/auth/SignIn/SignIn.tsx

@@ -1,6 +1,4 @@
 import ActionLink from '@/components/shared/ActionLink'
-import Alert from '@/components/ui/Alert'
-import useTimeOutMessage from '@/utils/hooks/useTimeOutMessage'
 import SignInForm from './components/SignInForm'
 import Logo from '@/components/template/Logo'
 import { getLogoFilename } from '@base/utils/logo'
@@ -17,8 +15,6 @@ export const SignInBase = ({
     forgetPasswordUrl = '/forgot-password',
     disableSubmit,
 }: SignInProps) => {
-    const [message, setMessage] = useTimeOutMessage()
-
     const { mode } = useThemeStore()
 
     return (
@@ -33,14 +29,8 @@ export const SignInBase = ({
                     Digite seus dados para entrar.
                 </p>
             </div>
-            {message && (
-                <Alert showIcon className="mb-4" type="danger">
-                    <span className="break-all">{message}</span>
-                </Alert>
-            )}
             <SignInForm
                 disableSubmit={disableSubmit}
-                setMessage={setMessage}
                 passwordHint={
                     <div className="mb-6 mt-2">
                         <ActionLink

package/lib/@ecme/views/auth/SignIn/components/SignInForm.tsx

@@ -1,6 +1,8 @@
 import { ReactNode, useState } from "react";
 import Input from "@/components/ui/Input";
 import Button from "@/components/ui/Button";
+import Notification from "@/components/ui/Notification";
+import toast from "@/components/ui/toast";
 import { FormItem, Form } from "@/components/ui/Form";
 import PasswordInput from "@/components/shared/PasswordInput";
 import classNames from "@/utils/classNames";
@@ -13,7 +15,6 @@ import type { CommonProps } from "@/@types/common";
 interface SignInFormProps extends CommonProps {
   disableSubmit?: boolean;
   passwordHint?: string | ReactNode;
-  setMessage?: (message: string) => void;
 }
 
 type SignInFormSchema = {
@@ -33,7 +34,7 @@ const validationSchema: ZodType<SignInFormSchema> = z.object({
 const SignInForm = (props: SignInFormProps) => {
   const [isSubmitting, setSubmitting] = useState<boolean>(false);
 
-  const { disableSubmit = false, className, setMessage, passwordHint } = props;
+  const { disableSubmit = false, className, passwordHint } = props;
 
   const {
     handleSubmit,
@@ -58,7 +59,11 @@ const SignInForm = (props: SignInFormProps) => {
       const result = await signIn({ username, password });
 
       if (result?.status === "failed") {
-        setMessage?.(result.message);
+        toast.push(
+          <Notification title="Erro ao entrar" type="danger">
+            {result.message}
+          </Notification>
+        );
       }
     }
 

package/lib/@ecme/views/guide/Documentations/components/Authentication.tsx

@@ -56,9 +56,9 @@ const Authentication = () => {
                                 },
                                 {
                                     propName: 'signOut',
-                                    type: `<code>() => void</code>`,
+                                    type: `<code>(redirectUrl?: string) => void</code>`,
                                     default: `-`,
-                                    desc: `A method to sign out the current user`,
+                                    desc: `A method to sign out the current user. Pass a redirect URL to return there after signing in again.`,
                                 },
                                 {
                                     propName: 'oAuthSignIn',
@@ -102,6 +102,29 @@ const YourComponent = () => {
         </div>
     );
 };
+`}</SyntaxHighlighter>
+                <p className="mt-4">
+                    To return to the current screen after an idle timeout, pass{' '}
+                    <code>signOut</code> directly to <code>useIdleTimeout</code>.
+                    The timeout hook supplies the current path, query string,
+                    and hash to the callback. Calling <code>signOut()</code>{' '}
+                    without a destination, such as for a manual logout, keeps
+                    the existing behavior.
+                </p>
+                <SyntaxHighlighter language="tsx">{`import { useAuth } from '@/auth'
+import { useIdleTimeout } from '@/base/hooks'
+
+const SessionTimeout = () => {
+    const { signOut, authenticated } = useAuth();
+
+    useIdleTimeout({
+        timeout: 900,
+        onTimeout: signOut,
+        enabled: authenticated,
+    });
+
+    return null;
+};
 `}</SyntaxHighlighter>
             </div>
             <div className="mt-10" id="OAuth">

package/lib/base/@types/api/request/originacao/TCreateTermoFunruralRequest.ts

@@ -0,0 +1,11 @@
+import type {
+    TTipoAssinaturaTermoFunrural,
+    TTipoRecolhimentoTermoFunrural,
+} from '../../../models/originacao/termoFunrural'
+
+export type TCreateTermoFunruralRequest = {
+    produtorId: number
+    tipoAssinatura: TTipoAssinaturaTermoFunrural
+    tipoRecolhimento: TTipoRecolhimentoTermoFunrural
+    tipoVigencia?: 'ANUAL' | 'VITALICIO'
+}

package/lib/base/@types/api/response/originacao/TDisponibilidadeOpcaoTermoFunruralResponse.ts

@@ -0,0 +1,9 @@
+/**
+ * Disponibilidade de uma opção do Termo de Funrural (tipo de assinatura ou de recolhimento).
+ * Quando `habilitado` é false, `motivo` explica por que a opção não pode ser escolhida.
+ */
+export type TDisponibilidadeOpcaoTermoFunruralResponse<TOpcao extends string = string> = {
+    opcao: TOpcao
+    habilitado: boolean
+    motivo: string | null
+}

package/lib/base/@types/api/response/originacao/TExisteTermoFunruralResponse.ts

@@ -0,0 +1,3 @@
+export type TExisteTermoFunruralResponse = {
+    existe: boolean
+}

package/lib/base/@types/models/originacao/termoFunrural.ts

@@ -1,10 +1,20 @@
+export type TTipoAssinaturaTermoFunrural = 'DIGITAL' | 'FISICA'
+
+export type TTipoRecolhimentoTermoFunrural = 'PRODUCAO' | 'FOLHA_PAGAMENTO'
+
 export type TTermoFunrural = {
     id?: number,
-    cpfCnpj: string
+    cpfCnpj?: string
+    cpf?: string | null
+    cnpj?: string | null
     produtorId?: number
-    tipoAssinatura?: 'DIGITAL' | 'FISICA' | null
-    tipoRecolhimento?: 'PRODUCAO' | 'FOLHA_PAGAMENTO' | null
+    tipoAssinatura?: TTipoAssinaturaTermoFunrural | null
+    tipoRecolhimento?: TTipoRecolhimentoTermoFunrural | null
     // Termo de Funrural é vitalício desde a melhoria OA-2000; ANUAL é mantido apenas para leitura de registros legados.
     tipoVigencia?: 'ANUAL' | 'VITALICIO' | null
+    statusTermoFunrural?: string | null
     statusCrm?: 'AGUARDANDO_ATUALIZACAO' | 'CONCLUIDO_SAP_ORBEAGRO' | null
+    motivo?: string | null
+    contratoId?: number | null
+    dataCriacao?: string | null
 }

package/lib/base/configs/endpoints.config/originacao/config/termoFunrural.ts

@@ -2,9 +2,11 @@ const TERMO_FUNRURAL_URL = '/originacao/api/termo-funrural'
 
 const termoFunrural = {
     add: { endpoint: `${TERMO_FUNRURAL_URL}`, method: 'post' },
-    findOne: { endpoint: `${TERMO_FUNRURAL_URL}`, method: 'get' },
+    findOne: { endpoint: `${TERMO_FUNRURAL_URL}/`, method: 'get' },
     findMonitor: { endpoint: `${TERMO_FUNRURAL_URL}/find-monitor`, method: 'get' },
     existePorCpf: { endpoint: `${TERMO_FUNRURAL_URL}/existe-por-cpf`, method: 'get' },
+    verificarTiposAssinatura: { endpoint: `${TERMO_FUNRURAL_URL}/verificar-tipos-assinatura`, method: 'get' },
+    verificarTiposRecolhimento: { endpoint: `${TERMO_FUNRURAL_URL}/verificar-tipos-recolhimento`, method: 'get' },
     findAllMetrics: { endpoint: `${TERMO_FUNRURAL_URL}/metrics`, method: 'get' },
     cancelar: { endpoint: `${TERMO_FUNRURAL_URL}/cancelar/`, method: 'post' },
     reprovar: { endpoint: `${TERMO_FUNRURAL_URL}/reprovar/`, method: 'post' },

package/lib/base/hooks/useIdleTimeout.ts

@@ -3,7 +3,7 @@ import { useCallback } from 'react'
 
 interface UseIdleTimeoutOptions {
     timeout?: number
-    onTimeout: () => void
+    onTimeout: (redirectUrl: string) => void
     enabled?: boolean
 }
 
@@ -14,7 +14,11 @@ export function useIdleTimeout({
 }: UseIdleTimeoutOptions) {
     const handleIdle = useCallback(() => {
         if (enabled) {
-            onTimeout()
+            const redirectUrl =
+                window.location.pathname +
+                window.location.search +
+                window.location.hash
+            onTimeout(redirectUrl)
         }
     }, [enabled, onTimeout])
 

package/lib/base/services/modules/originacao/termoFunrural/termoFunruralService.ts

@@ -1,13 +1,22 @@
-import { IFilterParams, TQueryResponse } from '@base/@types/api'
 import endpointConfig from "@base/configs/endpoints.config/endpoints.navigation";
 import ApiService from '@/services/ApiService'
-import { TTermoFunrural } from '@base/@types/models/originacao/termoFunrural';
-import { TFindAllMetricsTermoFunruralResponse } from '@base/@types/api/response/originacao/TFindAllMetricsTermoFunruralResponse';
+// Os tipos usam caminhos relativos para que o .d.ts gerado resolva nos projetos que consomem a lib
+// (o alias @base não existe fora do client-core e deixaria as assinaturas como `any`).
+import type { TQueryResponse } from '../../../../@types/api'
+import type {
+    TTermoFunrural,
+    TTipoAssinaturaTermoFunrural,
+    TTipoRecolhimentoTermoFunrural,
+} from '../../../../@types/models/originacao/termoFunrural';
+import type { TCreateTermoFunruralRequest } from '../../../../@types/api/request/originacao/TCreateTermoFunruralRequest';
+import type { TExisteTermoFunruralResponse } from '../../../../@types/api/response/originacao/TExisteTermoFunruralResponse';
+import type { TDisponibilidadeOpcaoTermoFunruralResponse } from '../../../../@types/api/response/originacao/TDisponibilidadeOpcaoTermoFunruralResponse';
+import type { TFindAllMetricsTermoFunruralResponse } from '../../../../@types/api/response/originacao/TFindAllMetricsTermoFunruralResponse';
 
 const TERMO_FUNRURAL_PROJECT_ENDPOINT = endpointConfig.originacao.termoFunrural;
 
-export async function apiAddTermoFunrural(body: TTermoFunrural) {
-    return ApiService.fetchDataWithAxios<TQueryResponse<TTermoFunrural>>({
+export async function apiAddTermoFunrural(body: TCreateTermoFunruralRequest) {
+    return ApiService.fetchDataWithAxios<TTermoFunrural>({
         url: TERMO_FUNRURAL_PROJECT_ENDPOINT.add.endpoint,
         method: TERMO_FUNRURAL_PROJECT_ENDPOINT.add.method,
         data: body,
@@ -44,19 +53,19 @@ export async function apiReprovarTermoFunrural(id: number, motivo: string) {
     });
 }
 
-export async function apiAprovarTermoFunrural(id: number) {
-    return ApiService.fetchDataWithAxios<TTermoFunrural>({
+// O backend responde 204 e exige corpo (AprovarTermoFunruralRequest), mesmo com o motivo opcional.
+export async function apiAprovarTermoFunrural(id: number, motivo?: string) {
+    return ApiService.fetchDataWithAxios<void>({
         url: TERMO_FUNRURAL_PROJECT_ENDPOINT.aprovar.endpoint + `/${id}`,
         method: TERMO_FUNRURAL_PROJECT_ENDPOINT.aprovar.method,
-        data: { id },
+        data: { motivo: motivo ?? null },
     });
 }
 
 export async function apiReabrirTermoFunrural(id: number) {
-    return ApiService.fetchDataWithAxios<TTermoFunrural>({
+    return ApiService.fetchDataWithAxios<void>({
         url: TERMO_FUNRURAL_PROJECT_ENDPOINT.reabrir.endpoint + `/${id}`,
         method: TERMO_FUNRURAL_PROJECT_ENDPOINT.reabrir.method,
-        data: { id },
     });
 }
 
@@ -73,12 +82,28 @@ export async function apiUploadArquivoAssinado(id: number, formData: FormData) {
 
 // Termo de Funrural é vitalício (OA-2000): a checagem agora considera apenas o CPF, sem recorte por ano.
 export async function apiExistePorCpfTermoFunrural(cpf: string) {
-    return ApiService.fetchDataWithAxios<boolean>({
+    return ApiService.fetchDataWithAxios<TExisteTermoFunruralResponse>({
         url: TERMO_FUNRURAL_PROJECT_ENDPOINT.existePorCpf.endpoint + `?cpf=${cpf}`,
         method: TERMO_FUNRURAL_PROJECT_ENDPOINT.existePorCpf.method,
     });
 }
 
+// Informa quais tipos de assinatura (envio) o produtor pode escolher ao emitir o termo e, para os bloqueados, o motivo.
+export async function apiVerificarTiposAssinaturaTermoFunrural(produtorId: number) {
+    return ApiService.fetchDataWithAxios<TDisponibilidadeOpcaoTermoFunruralResponse<TTipoAssinaturaTermoFunrural>[]>({
+        url: TERMO_FUNRURAL_PROJECT_ENDPOINT.verificarTiposAssinatura.endpoint + `?produtorId=${produtorId}`,
+        method: TERMO_FUNRURAL_PROJECT_ENDPOINT.verificarTiposAssinatura.method,
+    });
+}
+
+// Informa quais tipos de recolhimento o produtor pode escolher ao emitir o termo e, para os bloqueados, o motivo.
+export async function apiVerificarTiposRecolhimentoTermoFunrural(produtorId: number) {
+    return ApiService.fetchDataWithAxios<TDisponibilidadeOpcaoTermoFunruralResponse<TTipoRecolhimentoTermoFunrural>[]>({
+        url: TERMO_FUNRURAL_PROJECT_ENDPOINT.verificarTiposRecolhimento.endpoint + `?produtorId=${produtorId}`,
+        method: TERMO_FUNRURAL_PROJECT_ENDPOINT.verificarTiposRecolhimento.method,
+    });
+}
+
 export async function apiFindTermoFunruralMetrics() {
     return ApiService.fetchDataWithAxios<TFindAllMetricsTermoFunruralResponse>({
         url: TERMO_FUNRURAL_PROJECT_ENDPOINT.findAllMetrics.endpoint,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbe-agro/client-core",
-  "version": "5.6.295",
+  "version": "5.6.297",
   "description": "Biblioteca principal de componentes e utilidades para os microfrontends do Orbe Agro.",
   "type": "module",
   "main": "./dist/index.js",