@orbe-agro/client-core 5.6.309 → 5.6.310

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

@@ -1,50 +1,30 @@
 import ActionLink from '@/components/shared/ActionLink'
 import Alert from '@/components/ui/Alert'
-import Button from '@/components/ui/Button'
 import useTimeOutMessage from '@/utils/hooks/useTimeOutMessage'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { useNavigate } from 'react-router-dom'
+import { Navigate } from 'react-router-dom'
 import ForgotPasswordForm from './components/ForgotPasswordForm'
 
-type ForgotPasswordProps = {
-    signInUrl?: string
-}
-
-export const ForgotPasswordBase = ({
-    signInUrl = '/sign-in',
-}: ForgotPasswordProps) => {
+export const ForgotPasswordBase = () => {
     const [emailSent, setEmailSent] = useState(false)
     const [message, setMessage] = useTimeOutMessage()
 
-    const navigate = useNavigate()
+    const { t } = useTranslation()
 
-    const handleContinue = () => {
-        navigate(signInUrl)
+    if (emailSent) {
+        return <Navigate replace to="/reset-password" />
     }
 
-    const { t } = useTranslation()
-
     return (
         <div>
             <div className="mb-12 flex flex-col items-center text-center">
-                {emailSent ? (
-                    <>
-                        <h3 className="mb-2">Link de redefinição enviado</h3>
-                        <p className="font-semibold">
-                            Enviamos um link de redefinição para seu e-mail. Ele é válido por 30 minutos.
-                        </p>
-                    </>
-                ) : (
-                    <>
-                        <h3 className="mb-2">
-                            {t('pages.auth.forgotPassword.title')}
-                        </h3>
-                        <p className="font-semibold">
-                            {t('pages.auth.forgotPassword.desc')}
-                        </p>
-                    </>
-                )}
+                <h3 className="mb-2">
+                    {t('pages.auth.forgotPassword.title')}
+                </h3>
+                <p className="font-semibold">
+                    {t('pages.auth.forgotPassword.desc')}
+                </p>
             </div>
             {message && (
                 <Alert showIcon className="mb-4" type="danger">
@@ -55,16 +35,7 @@ export const ForgotPasswordBase = ({
                 emailSent={emailSent}
                 setMessage={setMessage}
                 setEmailSent={setEmailSent}
-            >
-                <Button
-                    block
-                    variant="solid"
-                    type="button"
-                    onClick={handleContinue}
-                >
-                    {t('common.actions.continue')}
-                </Button>
-            </ForgotPasswordForm>
+            />
         </div>
     )
 }

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

@@ -1,10 +1,10 @@
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import Alert from "@/components/ui/Alert";
 import Button from "@/components/ui/Button";
 import ActionLink from "@/components/shared/ActionLink";
 import ResetPasswordForm from "./components/ResetPasswordForm";
 import useTimeOutMessage from "@/utils/hooks/useTimeOutMessage";
-import { useNavigate, useSearchParams } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
 import { TAlterarPasswordType } from "@base/@types/models/auth";
 import Logo from "@/components/template/Logo";
 import { getLogoFilename } from "@base/utils";
@@ -14,13 +14,11 @@ import { useAuth } from "@/auth";
 type ResetPasswordProps = {
   signInUrl?: string;
   type: TAlterarPasswordType;
-  token?: string;
 };
 
 export const ResetPasswordBase = ({
   signInUrl = "/sign-in",
   type,
-  token,
 }: ResetPasswordProps) => {
   const [resetComplete, setResetComplete] = useState(false);
 
@@ -49,7 +47,7 @@ export const ResetPasswordBase = ({
               <>
                 <h3 className="mb-2">Crie sua nova senha</h3>
                 <p className="font-semibold">
-                  Digite e confirme sua nova senha abaixo.
+                  Informe o código enviado para seu e-mail e crie sua nova senha.
                 </p>
               </>
             ) : (
@@ -76,7 +74,6 @@ export const ResetPasswordBase = ({
         setResetComplete={setResetComplete}
         type={type}
         userId={user.userId ?? undefined}
-        token={token}
       >
         <Button block variant="solid" type="button" onClick={handleContinue}>
           Continuar
@@ -96,29 +93,7 @@ export const ResetPasswordBase = ({
 };
 
 const ResetPassword = () => {
-  const [searchParams] = useSearchParams();
-  const [token, setToken] = useState<string | null>(null);
-  const [error, setError] = useState<string | null>(null);
-
-  useEffect(() => {
-    const tokenFromUrl = searchParams.get("token");
-
-    if (tokenFromUrl) {
-      setToken(tokenFromUrl);
-    } else {
-      setError("Link de redefinição inválido ou token não encontrado.");
-    }
-  }, [searchParams]);
-
-  if (error) {
-    return <div className="text-center text-red-500">{error}</div>;
-  }
-
-  if (!token) {
-    return <div className="text-center">Carregando...</div>;
-  }
-
-  return <ResetPasswordBase type="RECUPERARSENHA" token={token} />;
+  return <ResetPasswordBase type="RECUPERARSENHA" />;
 };
 
 export default ResetPassword;

package/lib/@ecme/views/auth/ResetPassword/components/ResetPasswordForm.tsx

@@ -1,5 +1,6 @@
 import { useState } from "react";
 import Button from "@/components/ui/Button";
+import Input from "@/components/ui/Input";
 import { FormItem, Form } from "@/components/ui/Form";
 import PasswordInput from "@/components/shared/PasswordInput";
 import { apiResetPassword } from "@/services/AuthService";
@@ -21,17 +22,17 @@ interface ResetPasswordFormProps extends CommonProps {
   setMessage?: (message: string) => void;
   type: TAlterarPasswordType;
   userId?: string;
-  token?: string;
 }
 
 type ResetPasswordFormSchema = {
+  token?: string;
   newPassword: string;
   confirmPassword: string;
 };
 
 const validationSchema: ZodType<ResetPasswordFormSchema> = z
   .object({
-    token: z.string().optional(),
+    token: z.string().trim().optional(),
     id: z.string().optional(),
     newPassword: z.string({ required_error: "Por favor digite uma senha" }),
     confirmPassword: z.string({
@@ -57,7 +58,6 @@ const ResetPasswordForm = (props: ResetPasswordFormProps) => {
     children,
     type,
     userId,
-    token,
   } = props;
 
   const {
@@ -65,11 +65,22 @@ const ResetPasswordForm = (props: ResetPasswordFormProps) => {
     formState: { errors },
     control,
   } = useForm<ResetPasswordFormSchema>({
-    resolver: zodResolver(validationSchema),
+    resolver: zodResolver(
+      type === "RECUPERARSENHA"
+        ? validationSchema.and(
+            z.object({
+              token: z
+                .string({ required_error: "Informe o código recebido por e-mail." })
+                .trim()
+                .min(1, "Informe o código recebido por e-mail."),
+            })
+          )
+        : validationSchema
+    ),
   });
 
   const onResetPassword = async (values: ResetPasswordFormSchema) => {
-    const { newPassword } = values;
+    const { newPassword, token } = values;
     setSubmitting(true);
 
     try {
@@ -105,6 +116,25 @@ const ResetPasswordForm = (props: ResetPasswordFormProps) => {
     <div className={className}>
       {!resetComplete ? (
         <Form onSubmit={handleSubmit(onResetPassword)}>
+          {type === "RECUPERARSENHA" && (
+            <FormItem
+              label="Código"
+              invalid={Boolean(errors.token)}
+              errorMessage={errors.token?.message}
+            >
+              <Controller
+                name="token"
+                control={control}
+                render={({ field }) => (
+                  <Input
+                    autoComplete="off"
+                    placeholder="Código recebido por e-mail"
+                    {...field}
+                  />
+                )}
+              />
+            </FormItem>
+          )}
           <FormItem
             label="Senha"
             invalid={Boolean(errors.newPassword)}

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/auth-demo/ForgotPasswordDemoSide/ForgotPasswordDemoSide.tsx

@@ -4,7 +4,7 @@ import Side from '@/components/layouts/AuthLayout/Side'
 const ForgotPasswordDemoSide = () => {
     return (
         <Side>
-            <ForgotPasswordBase signInUrl="/auth/sign-in-side" />
+            <ForgotPasswordBase />
         </Side>
     )
 }

package/lib/@ecme/views/auth-demo/ForgotPasswordDemoSimple/ForgotPasswordDemoSimple.tsx

@@ -4,7 +4,7 @@ import Simple from '@/components/layouts/AuthLayout/Simple'
 const ForgotPasswordDemoSimple = () => {
     return (
         <Simple>
-            <ForgotPasswordBase signInUrl="/auth/sign-in-side" />
+            <ForgotPasswordBase />
         </Simple>
     )
 }

package/lib/@ecme/views/auth-demo/ForgotPasswordDemoSplit/ForgotPasswordDemoSplit.tsx

@@ -4,7 +4,7 @@ import Split from '@/components/layouts/AuthLayout/Split'
 const ForgotPasswordDemoSplit = () => {
     return (
         <Split>
-            <ForgotPasswordBase signInUrl="/auth/sign-in-side" />
+            <ForgotPasswordBase />
         </Split>
     )
 }

package/lib/@ecme/views/dashboards/FavoritesLanding/FavoritesLanding.tsx

@@ -0,0 +1,124 @@
+import { useMemo } from 'react'
+import { useNavigate } from 'react-router-dom'
+import { useTranslation } from 'react-i18next'
+import useSWR from 'swr'
+import Card from '@/components/ui/Card'
+import Button from '@/components/ui/Button'
+import Loading from '@/components/shared/Loading'
+import navigationConfig from '@/configs/navigation.config'
+import navigationIcon from '@/configs/navigation-icon.config'
+import { filterNavigationByAuthority } from '@/components/template/Search'
+import { useSessionUser } from '@/store/authStore'
+import { apiFindFavoritosByUsuario } from '@base/services/modules/DadosMestres/FavoritoMenu/FavoritoMenuService'
+import { PiStarDuotone } from 'react-icons/pi'
+import { buildFavoriteNavMap } from './utils'
+import type { FavoriteGroup } from './types'
+
+type FavoritesLandingProps = {
+    title?: string
+    emptyStateMessage?: string
+    className?: string
+}
+
+export const FavoritesLandingBase = ({
+    title = 'Meus favoritos',
+    emptyStateMessage = 'Você ainda não adicionou nenhum favorito. Use a busca para marcar páginas com a estrela.',
+    className,
+}: FavoritesLandingProps) => {
+    const { t } = useTranslation()
+    const navigate = useNavigate()
+    const userId = useSessionUser((state) => state.user.userId)
+    const userAuthority = useSessionUser((state) => state.user.authority)
+
+    const { data: favorites, isLoading } = useSWR(
+        userId ? ['/api/favoritos-menu/usuario', userId] : null,
+        () => apiFindFavoritosByUsuario(Number(userId)),
+        { revalidateOnFocus: false },
+    )
+
+    const navMap = useMemo(() => {
+        const filteredNavigationTree = filterNavigationByAuthority(
+            navigationConfig,
+            userAuthority || [],
+        )
+        return buildFavoriteNavMap(filteredNavigationTree)
+    }, [userAuthority])
+
+    const favoriteGroups = useMemo<FavoriteGroup[]>(() => {
+        if (!favorites || favorites.length === 0) return []
+
+        const sorted = [...favorites].sort((a, b) => a.ordem - b.ordem)
+        const groups = new Map<string, FavoriteGroup>()
+
+        sorted.forEach((fav) => {
+            const navInfo = navMap.get(fav.menuKey)
+            if (!navInfo) return
+
+            const group = groups.get(navInfo.moduleKey)
+            if (group) {
+                group.items.push(navInfo)
+            } else {
+                groups.set(navInfo.moduleKey, {
+                    moduleKey: navInfo.moduleKey,
+                    moduleTitle: t(
+                        navInfo.moduleTranslateKey,
+                        navInfo.moduleTitle,
+                    ),
+                    items: [navInfo],
+                })
+            }
+        })
+
+        return Array.from(groups.values())
+    }, [favorites, navMap, t])
+
+    return (
+        <Loading loading={isLoading}>
+            <div className={className}>
+                <h3 className="mb-4">{title}</h3>
+                {favoriteGroups.length === 0 ? (
+                    <Card>
+                        <p className="text-center text-gray-500">
+                            {emptyStateMessage}
+                        </p>
+                    </Card>
+                ) : (
+                    <div className="flex flex-col gap-4">
+                        {favoriteGroups.map((group) => (
+                            <Card
+                                key={group.moduleKey}
+                                header={{ content: group.moduleTitle }}
+                            >
+                                <div className="grid grid-cols-1 gap-3 sm:grid-cols-2 lg:grid-cols-3">
+                                    {group.items.map((item) => (
+                                        <Button
+                                            key={item.key}
+                                            block
+                                            className="!justify-start gap-2 text-left"
+                                            icon={
+                                                navigationIcon[item.icon] ?? (
+                                                    <PiStarDuotone />
+                                                )
+                                            }
+                                            onClick={() =>
+                                                navigate(item.path)
+                                            }
+                                        >
+                                            {t(item.translateKey, item.title)}
+                                        </Button>
+                                    ))}
+                                </div>
+                            </Card>
+                        ))}
+                    </div>
+                )}
+            </div>
+        </Loading>
+    )
+}
+
+export const FavoritesLanding = () => {
+    return <FavoritesLandingBase />
+}
+
+export default FavoritesLanding

package/lib/@ecme/views/dashboards/FavoritesLanding/index.ts

@@ -0,0 +1,3 @@
+import FavoritesLanding from './FavoritesLanding'
+
+export default FavoritesLanding

package/lib/@ecme/views/dashboards/FavoritesLanding/types.ts

@@ -0,0 +1,17 @@
+export type FavoriteNavInfo = {
+    key: string
+    path: string
+    title: string
+    translateKey: string
+    icon: string
+    moduleKey: string
+    moduleTitle: string
+    moduleTranslateKey: string
+    moduleIcon: string
+}
+
+export type FavoriteGroup = {
+    moduleKey: string
+    moduleTitle: string
+    items: FavoriteNavInfo[]
+}

package/lib/@ecme/views/dashboards/FavoritesLanding/utils.ts

@@ -0,0 +1,51 @@
+import type { NavigationTree } from '@/@types/navigation'
+import { NAV_ITEM_TYPE_ITEM } from '@/constants/navigation.constant'
+import type { FavoriteNavInfo } from './types'
+
+/** Maps every leaf nav item to its top-level ancestor (the "module") for grouping favorites. */
+export const buildFavoriteNavMap = (
+    navTree: NavigationTree[],
+): Map<string, FavoriteNavInfo> => {
+    const map = new Map<string, FavoriteNavInfo>()
+
+    const walk = (
+        items: NavigationTree[],
+        moduleInfo: {
+            key: string
+            title: string
+            translateKey: string
+            icon: string
+        } | null,
+    ) => {
+        items.forEach((item) => {
+            const currentModule = moduleInfo ?? {
+                key: item.key,
+                title: item.title,
+                translateKey: item.translateKey,
+                icon: item.icon,
+            }
+
+            if (item.type === NAV_ITEM_TYPE_ITEM && item.path) {
+                map.set(item.key, {
+                    key: item.key,
+                    path: item.path,
+                    title: item.title,
+                    translateKey: item.translateKey,
+                    icon: item.icon,
+                    moduleKey: currentModule.key,
+                    moduleTitle: currentModule.title,
+                    moduleTranslateKey: currentModule.translateKey,
+                    moduleIcon: currentModule.icon,
+                })
+            }
+
+            if (item.subMenu && item.subMenu.length > 0) {
+                walk(item.subMenu, currentModule)
+            }
+        })
+    }
+
+    walk(navTree, null)
+
+    return map
+}

package/lib/@ecme/views/dashboards/index.ts

@@ -1,3 +1 @@
-// Dashboard components exports
-// Add specific dashboard component exports as needed
-export const dashboardsPlaceholder = 'Dashboard components';
+

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/@ecme/views/index.ts

@@ -11,7 +11,7 @@ export * from './auth-demo';
 export * from './concepts';
 
 // Dashboard views
-export * from './dashboards';
+// export * from './dashboards';
 
 // Guide views
 export * from './guide';

package/lib/base/@types/api/request/dm/TCreateFavoritoMenuRequest.ts

@@ -0,0 +1,3 @@
+export type TCreateFavoritoMenuRequest = {
+  menuKey: string
+}

package/lib/base/@types/api/request/dm/TReorderFavoritosMenuRequest.ts

@@ -0,0 +1,3 @@
+export type TReorderFavoritosMenuRequest = {
+  orderedIds: number[]
+}

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

@@ -0,0 +1,24 @@
+export type TCreateCertidaoRequest = {
+    estadoId: string;
+    cidadeId: string;
+    solicitarDocket: boolean;
+    arquivo?: File;
+}
+
+export type TCreateAnalisePenhorAlienacaoItemRequest = {
+    produtorId: number;
+    safraId: number;
+    municipio: string;
+    commoditie: string;
+    tipoSolicitacao: string;
+    certidaoPenhor: TCreateCertidaoRequest | null;
+    certidaoAlienacao: TCreateCertidaoRequest | null;
+    ordenacaoPenhores: {
+        enviarEmail: boolean;
+        lancarPenhor: boolean;
+    };
+}
+
+export type TCreateAnalisePenhorAlienacaoRequest = {
+    analises: TCreateAnalisePenhorAlienacaoItemRequest[];
+}

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

@@ -1,9 +1,13 @@
 export type TCreateDadosPenhoresRequest = {
     tipoPenhor: string;
     dtRegistro: string;
-    volume: number;
-    valor: number;
+    volume: number | null;
+    valor: number | null;
     safraId: number;
     credor: string;
     matricula: string;
-}
+    credorId: number;
+    favorecidoId: number;
+    prioridade: number;
+    contasAutorizadasIds: number[];
+}

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

@@ -10,4 +10,6 @@ export type TSeloSocialRequest = {
   cpfSegundoAssinante?: string;
   emailSegundoAssinante?: string;
   dapAreaTotal: number;
+  numeroCaf: string;
+  areaTotalCaf: number;
 };

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'
+}