@hed-hog/core 0.0.303 → 0.0.305

package/hedhog/frontend/app/users/page.tsx.ejs

@@ -35,6 +35,7 @@ import {
   FormLabel,
   FormMessage,
 } from '@/components/ui/form';
+import { FormActions } from '@/components/ui/form-actions';
 import { Input } from '@/components/ui/input';
 import {
   Sheet,
@@ -43,6 +44,7 @@ import {
   SheetHeader,
   SheetTitle,
 } from '@/components/ui/sheet';
+import { useFormDraft } from '@/hooks/use-form-draft';
 import { formatDateTime } from '@/lib/format-date';
 import { getPhotoUrl } from '@/lib/get-photo-url';
 import { getUserEmail } from '@/lib/get-user-email';
@@ -79,8 +81,8 @@ import {
   Users,
 } from 'lucide-react';
 import { useTranslations } from 'next-intl';
-import { useEffect, useState } from 'react';
-import { useForm } from 'react-hook-form';
+import { useEffect, useMemo, useState } from 'react';
+import { useForm, useWatch } from 'react-hook-form';
 import { toast } from 'sonner';
 import { z } from 'zod';
 import { ActiveSessions } from './active-session';
@@ -96,6 +98,24 @@ type RequestResponse<T> = {
   };
 };
 
+type UserCreateDraftPayload = {
+  values: {
+    name: string;
+    email: string;
+  };
+};
+
+type UserEditDraftPayload = {
+  userId: number | null;
+  values: {
+    name: string;
+    email: string;
+  };
+};
+
+const USER_CREATE_DRAFT_STORAGE_KEY = 'core-user-create-draft';
+const USER_EDIT_DRAFT_STORAGE_KEY = 'core-user-edit-draft';
+
 export default function UserPage() {
   const t = useTranslations('core.UserPage');
   const userActivityT = useTranslations('core.UserActivity');
@@ -198,6 +218,108 @@ export default function UserPage() {
     },
   });
 
+  const watchedCreateValues = useWatch({
+    control: form.control,
+  });
+  const watchedEditValues = useWatch({
+    control: editForm.control,
+  });
+
+  const {
+    clearDraft: clearCreateDraft,
+    loadDraft: loadCreateDraft,
+    hasDraft: hasCreateDraft,
+    savedAt: createDraftSavedAt,
+  } = useFormDraft<UserCreateDraftPayload>({
+    storageKey: USER_CREATE_DRAFT_STORAGE_KEY,
+    value: {
+      values: {
+        name: watchedCreateValues.name ?? '',
+        email: watchedCreateValues.email ?? '',
+      },
+    },
+    hasData: Boolean(
+      (watchedCreateValues.name ?? '').trim() ||
+      (watchedCreateValues.email ?? '').trim()
+    ),
+    enabled: isDialogOpen,
+  });
+
+  const {
+    clearDraft: clearEditDraft,
+    loadDraft: loadEditDraft,
+    hasDraft: hasEditDraft,
+    savedAt: editDraftSavedAt,
+  } = useFormDraft<UserEditDraftPayload>({
+    storageKey: USER_EDIT_DRAFT_STORAGE_KEY,
+    value: {
+      userId: editingUser?.id ? Number(editingUser.id) : null,
+      values: {
+        name: watchedEditValues.name ?? '',
+        email: watchedEditValues.email ?? '',
+      },
+    },
+    hasData: Boolean(
+      (watchedEditValues.name ?? '').trim() ||
+      (watchedEditValues.email ?? '').trim()
+    ),
+    enabled: Boolean(editingUser),
+  });
+
+  const createDraftStatusContent = useMemo(() => {
+    if (!hasCreateDraft || !createDraftSavedAt) {
+      return null;
+    }
+
+    const savedDate = new Date(createDraftSavedAt);
+
+    if (Number.isNaN(savedDate.getTime())) {
+      return null;
+    }
+
+    const locale = currentLocaleCode === 'en' ? enUS : ptBR;
+    const relativeLabel = formatDistanceToNow(savedDate, {
+      addSuffix: true,
+      locale,
+    });
+    const absoluteLabel = formatDateTime(
+      savedDate,
+      getSettingValue,
+      currentLocaleCode
+    );
+
+    return currentLocaleCode === 'en'
+      ? `Draft saved ${relativeLabel} • Last saved: ${absoluteLabel}`
+      : `Rascunho salvo ${relativeLabel} • Último salvamento: ${absoluteLabel}`;
+  }, [createDraftSavedAt, currentLocaleCode, getSettingValue, hasCreateDraft]);
+
+  const editDraftStatusContent = useMemo(() => {
+    if (!hasEditDraft || !editDraftSavedAt) {
+      return null;
+    }
+
+    const savedDate = new Date(editDraftSavedAt);
+
+    if (Number.isNaN(savedDate.getTime())) {
+      return null;
+    }
+
+    const locale = currentLocaleCode === 'en' ? enUS : ptBR;
+    const relativeLabel = formatDistanceToNow(savedDate, {
+      addSuffix: true,
+      locale,
+    });
+    const absoluteLabel = formatDateTime(
+      savedDate,
+      getSettingValue,
+      currentLocaleCode
+    );
+
+    return currentLocaleCode === 'en'
+      ? `Draft saved ${relativeLabel} • Last saved: ${absoluteLabel}`
+      : `Rascunho salvo ${relativeLabel} • Último salvamento: ${absoluteLabel}`;
+  }, [editDraftSavedAt, currentLocaleCode, getSettingValue, hasEditDraft]);
+
   const [activeTab, setActiveTab] = useState('overview');
   const [openDeleteModal, setOpenDeleteModal] = useState(false);
 
@@ -246,13 +368,35 @@ export default function UserPage() {
 
   useEffect(() => {
     if (editingUser) {
-      editForm.reset({
-        name: editingUser.name || '',
-        email: getUserEmail(editingUser),
-      });
+      const storedDraft = loadEditDraft();
+      const shouldRestoreDraft =
+        storedDraft?.payload.userId === Number(editingUser.id);
+
+      editForm.reset(
+        shouldRestoreDraft
+          ? storedDraft.payload.values
+          : {
+              name: editingUser.name || '',
+              email: getUserEmail(editingUser),
+            }
+      );
       setActiveTab('overview');
     }
-  }, [editingUser]);
+  }, [editForm, editingUser, loadEditDraft]);
+
+  useEffect(() => {
+    if (!isDialogOpen) {
+      return;
+    }
+
+    const storedDraft = loadCreateDraft();
+
+    form.reset({
+      name: storedDraft?.payload.values.name ?? '',
+      email: storedDraft?.payload.values.email ?? '',
+      password: '',
+    });
+  }, [form, isDialogOpen, loadCreateDraft]);
 
   const onSubmit = async (values: z.infer<typeof addUserSchema>) => {
     try {
@@ -261,6 +405,7 @@ export default function UserPage() {
         method: 'POST',
         data: values,
       });
+      clearCreateDraft();
       form.reset();
       refetch();
       setIsDialogOpen(false);
@@ -324,6 +469,7 @@ export default function UserPage() {
         method: 'PATCH',
         data: values,
       });
+      clearEditDraft();
       refetch();
       setEditFormError(null);
       toast.success(t('userUpdatedSuccess'));
@@ -773,9 +919,13 @@ export default function UserPage() {
                   </Alert>
                 )}
 
-                <Button type="submit" className="w-full">
-                  {t('buttonAddUser')}
-                </Button>
+                <FormActions
+                  sheet
+                  statusContent={createDraftStatusContent}
+                  submitLabel={t('buttonAddUser')}
+                  submitType="submit"
+                  sheetClassName="px-0 pb-0"
+                />
               </form>
             </Form>
           </SheetContent>
@@ -1210,19 +1360,14 @@ export default function UserPage() {
                           </FormItem>
                         )}
                       />
-                      <div className="flex flex-col w-full gap-2 pt-2">
-                        <Button type="submit" className="w-full">
-                          {t('saveChanges')}
-                        </Button>
-                        <Button
-                          className="w-full"
-                          type="button"
-                          variant="outline"
-                          onClick={() => setEditingUser(null)}
-                        >
-                          {t('cancel')}
-                        </Button>
-                      </div>
+                      <FormActions
+                        statusContent={editDraftStatusContent}
+                        cancelLabel={t('cancel')}
+                        onCancel={() => setEditingUser(null)}
+                        submitLabel={t('saveChanges')}
+                        submitType="submit"
+                        className="pt-2"
+                      />
                     </form>
                   </Form>
                 </TabsContent>

package/hedhog/frontend/messages/en.json

@@ -495,7 +495,8 @@
       "errorTitle": "Unable to authenticate",
       "buttonRetry": "Try again",
       "loading": "Loading...",
-      "errorOccurred": "An error occurred."
+      "errorOccurred": "An error occurred.",
+      "alreadyProcessed": "This authentication callback has already been processed. Start the flow again."
     },
     "github": {
       "loginTitle": "Completing login...",
@@ -510,7 +511,8 @@
       "errorTitle": "Unable to authenticate",
       "buttonRetry": "Try again",
       "loading": "Loading...",
-      "errorOccurred": "An error occurred."
+      "errorOccurred": "An error occurred.",
+      "alreadyProcessed": "This authentication callback has already been processed. Start the flow again."
     },
     "facebook": {
       "loginTitle": "Completing login...",
@@ -525,7 +527,8 @@
       "errorTitle": "Unable to authenticate",
       "buttonRetry": "Try again",
       "loading": "Loading...",
-      "errorOccurred": "An error occurred."
+      "errorOccurred": "An error occurred.",
+      "alreadyProcessed": "This authentication callback has already been processed. Start the flow again."
     },
     "microsoft": {
       "loginTitle": "Completing login...",
@@ -540,7 +543,8 @@
       "errorTitle": "Unable to authenticate",
       "buttonRetry": "Try again",
       "loading": "Loading...",
-      "errorOccurred": "An error occurred."
+      "errorOccurred": "An error occurred.",
+      "alreadyProcessed": "This authentication callback has already been processed. Start the flow again."
     },
     "microsoft-entra-id": {
       "loginTitle": "Completing login...",
@@ -555,7 +559,8 @@
       "errorTitle": "Unable to authenticate",
       "buttonRetry": "Try again",
       "loading": "Loading...",
-      "errorOccurred": "An error occurred."
+      "errorOccurred": "An error occurred.",
+      "alreadyProcessed": "This authentication callback has already been processed. Start the flow again."
     }
   },
   "ConnectedAccounts": {
@@ -866,7 +871,41 @@
     "bcc": "BCC",
     "body": "Body",
     "createdAt": "Created At",
-    "updatedAt": "Updated At"
+    "updatedAt": "Updated At",
+    "id": "ID",
+    "actions": "Actions",
+    "delivery": "Delivery",
+    "loadingLogs": "Loading email logs...",
+    "recipientPlaceholder": "Filter by recipient",
+    "clearFilters": "Clear filters",
+    "viewMode": "View mode",
+    "viewModeTable": "Table",
+    "viewModeCards": "Cards",
+    "filterByStatus": "Filter by status",
+    "filterByError": "Filter by error",
+    "statusAll": "All statuses",
+    "statusReceived": "Received",
+    "statusRead": "Read",
+    "statusError": "Error",
+    "statusUnavailable": "No status",
+    "statusReceivedShort": "Received: {count}",
+    "statusReadShort": "Read: {count}",
+    "statusErrorShort": "Errors: {count}",
+    "status_received": "Received",
+    "status_read": "Read",
+    "status_error": "Error",
+    "errorAll": "All",
+    "errorOnly": "Only with error",
+    "errorNone": "Without error",
+    "hasError": "With error",
+    "withoutError": "Without error",
+    "totalRecipientsCurrentPage": "Recipients (page)",
+    "readRecipientsCurrentPage": "Read (page)",
+    "emailsWithErrorCurrentPage": "Emails with error (page)",
+    "totalRecipientsLabel": "Recipients: {count}",
+    "noRecipientStatus": "No recipient tracking available for this delivery.",
+    "readAt": "Read at",
+    "errorMessage": "Error message"
   },
   "Configurations": {
     "breadcrumbHome": "Home",

package/hedhog/frontend/messages/pt.json

@@ -495,7 +495,8 @@
       "errorTitle": "Não foi possível autenticar",
       "buttonRetry": "Tentar novamente",
       "loading": "Carregando...",
-      "errorOccurred": "Ocorreu um erro."
+      "errorOccurred": "Ocorreu um erro.",
+      "alreadyProcessed": "Esta autenticacao ja foi processada. Inicie o fluxo novamente."
     },
     "github": {
       "loginTitle": "Finalizando login...",
@@ -510,7 +511,8 @@
       "errorTitle": "Não foi possível autenticar",
       "buttonRetry": "Tentar novamente",
       "loading": "Carregando...",
-      "errorOccurred": "Ocorreu um erro."
+      "errorOccurred": "Ocorreu um erro.",
+      "alreadyProcessed": "Esta autenticacao ja foi processada. Inicie o fluxo novamente."
     },
     "facebook": {
       "loginTitle": "Finalizando login...",
@@ -525,7 +527,8 @@
       "errorTitle": "Não foi possível autenticar",
       "buttonRetry": "Tentar novamente",
       "loading": "Carregando...",
-      "errorOccurred": "Ocorreu um erro."
+      "errorOccurred": "Ocorreu um erro.",
+      "alreadyProcessed": "Esta autenticacao ja foi processada. Inicie o fluxo novamente."
     },
     "microsoft": {
       "loginTitle": "Finalizando login...",
@@ -540,7 +543,8 @@
       "errorTitle": "Não foi possível autenticar",
       "buttonRetry": "Tentar novamente",
       "loading": "Carregando...",
-      "errorOccurred": "Ocorreu um erro."
+      "errorOccurred": "Ocorreu um erro.",
+      "alreadyProcessed": "Esta autenticacao ja foi processada. Inicie o fluxo novamente."
     },
     "microsoft-entra-id": {
       "loginTitle": "Finalizando login...",
@@ -555,7 +559,8 @@
       "errorTitle": "Não foi possível autenticar",
       "buttonRetry": "Tentar novamente",
       "loading": "Carregando...",
-      "errorOccurred": "Ocorreu um erro."
+      "errorOccurred": "Ocorreu um erro.",
+      "alreadyProcessed": "Esta autenticacao ja foi processada. Inicie o fluxo novamente."
     }
   },
   "ConnectedAccounts": {
@@ -869,7 +874,41 @@
     "bcc": "CCO",
     "body": "Corpo",
     "createdAt": "Criado em",
-    "updatedAt": "Atualizado em"
+    "updatedAt": "Atualizado em",
+    "id": "ID",
+    "actions": "Ações",
+    "delivery": "Entrega",
+    "loadingLogs": "Carregando logs de e-mail...",
+    "recipientPlaceholder": "Filtrar por destinatário",
+    "clearFilters": "Limpar filtros",
+    "viewMode": "Visualização",
+    "viewModeTable": "Tabela",
+    "viewModeCards": "Cards",
+    "filterByStatus": "Filtrar por status",
+    "filterByError": "Filtrar por erro",
+    "statusAll": "Todos os status",
+    "statusReceived": "Recebido",
+    "statusRead": "Lido",
+    "statusError": "Erro",
+    "statusUnavailable": "Sem status",
+    "statusReceivedShort": "Recebidos: {count}",
+    "statusReadShort": "Lidos: {count}",
+    "statusErrorShort": "Erros: {count}",
+    "status_received": "Recebido",
+    "status_read": "Lido",
+    "status_error": "Erro",
+    "errorAll": "Todos",
+    "errorOnly": "Apenas com erro",
+    "errorNone": "Sem erro",
+    "hasError": "Com erro",
+    "withoutError": "Sem erro",
+    "totalRecipientsCurrentPage": "Destinatários (página)",
+    "readRecipientsCurrentPage": "Lidos (página)",
+    "emailsWithErrorCurrentPage": "E-mails com erro (página)",
+    "totalRecipientsLabel": "Destinatários: {count}",
+    "noRecipientStatus": "Sem rastreamento por destinatário para este envio.",
+    "readAt": "Lido em",
+    "errorMessage": "Mensagem de erro"
   },
   "Configurations": {
     "breadcrumbHome": "Início",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hed-hog/core",
-  "version": "0.0.303",
+  "version": "0.0.305",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {
@@ -30,12 +30,12 @@
     "sharp": "^0.34.2",
     "speakeasy": "^2.0.0",
     "uuid": "^11.1.0",
-    "@hed-hog/api": "0.0.6",
+    "@hed-hog/api-pagination": "0.0.7",
     "@hed-hog/api-locale": "0.0.14",
     "@hed-hog/api-mail": "0.0.9",
     "@hed-hog/api-prisma": "0.0.6",
-    "@hed-hog/api-types": "0.0.1",
-    "@hed-hog/api-pagination": "0.0.7"
+    "@hed-hog/api": "0.0.6",
+    "@hed-hog/api-types": "0.0.1"
   },
   "exports": {
     ".": {

package/src/auth/auth.controller.ts

@@ -1,18 +1,17 @@
 import { Public, Role, User, UserOptional } from '@hed-hog/api';
 import { Locale } from '@hed-hog/api-locale';
 import {
-    BadRequestException,
-    Body,
-    Controller,
-    forwardRef,
-    Get,
-    Headers,
-    Inject,
-    Ip,
-    Post,
-    Req,
-    Res,
-    UnauthorizedException,
+  Body,
+  Controller,
+  forwardRef,
+  Get,
+  Headers,
+  Inject,
+  Ip,
+  Post,
+  Req,
+  Res,
+  UnauthorizedException
 } from '@nestjs/common';
 import { TokenService } from '../token/token.service';
 import { CreateWithEmailAndPasswordDTO } from '../user/dto/create-with-email-and-password.dto';
@@ -64,13 +63,10 @@ export class AuthController {
     const { session, refreshToken, accessToken } = await this.service.refreshAccessToken(locale, currentRefreshToken, ipAddress, userAgent);
     await this.token.setRefreshTokenCookie(locale, res, refreshToken, session.expires_at);
 
-    if (!req.cookies['rt'] && refreshTokenFromBody) {
-      return {
-        accessToken,
-        refreshToken
-      };
-    }
-    return { accessToken };
+    return {
+      accessToken,
+      refreshToken,
+    };
   }
 
   @Public()

package/src/auth/auth.service.ts

@@ -2,12 +2,12 @@ import { getLocaleText } from '@hed-hog/api-locale';
 import { PrismaService } from '@hed-hog/api-prisma';
 import { User } from '@hed-hog/api-types';
 import {
-    BadRequestException,
-    forwardRef,
-    Inject,
-    Injectable,
-    NotFoundException,
-    UnauthorizedException,
+  BadRequestException,
+  forwardRef,
+  Inject,
+  Injectable,
+  NotFoundException,
+  UnauthorizedException,
 } from '@nestjs/common';
 import { ChallengeService } from '../challenge/challenge.service';
 import { MailService as MailManagerService } from '../mail/mail.service';
@@ -509,8 +509,13 @@ export class AuthService {
   }
 
   async logout(res, req, refreshToken: string) {
-    await this.session.deleteRefreshTokenCookie(res, refreshToken);
-    await this.user.registerUserActivity(req.auth?.sub, "logout")
+    const result = await this.session.deleteRefreshTokenCookie(res, refreshToken);
+    const logoutUserId = req.auth?.sub ?? result?.userId ?? null;
+
+    if (logoutUserId) {
+      await this.user.registerUserActivity(logoutUserId, 'logout');
+    }
+
     return { success: true };
   }
 

package/src/dashboard/dashboard-core/dashboard-core.controller.ts

@@ -1,15 +1,15 @@
 import { Role, User } from '@hed-hog/api';
 import { Locale } from '@hed-hog/api-locale';
 import {
-    Body,
-    Controller,
-    Delete,
-    Get,
-    Param,
-    ParseIntPipe,
-    Patch,
-    Post,
-    Query,
+  Body,
+  Controller,
+  Delete,
+  Get,
+  Param,
+  ParseIntPipe,
+  Patch,
+  Post,
+  Query,
 } from '@nestjs/common';
 import { DashboardCoreService } from './dashboard-core.service';
 
@@ -67,6 +67,19 @@ export class DashboardCoreController {
     return this.dashboardCoreService.createUserDashboard(user.id, body, locale);
   }
 
+  @Patch('dashboard/order')
+  reorderUserDashboards(
+    @User() user,
+    @Body() body: { slugs?: string[] },
+    @Locale() locale: string,
+  ) {
+    return this.dashboardCoreService.reorderUserDashboards(
+      user.id,
+      body.slugs,
+      locale,
+    );
+  }
+
   @Patch('dashboard/:slug')
   renameUserDashboard(
     @User() user,

package/src/dashboard/dashboard-core/dashboard-core.service.ts

@@ -1602,7 +1602,7 @@ export class DashboardCoreService {
           },
         },
       },
-      orderBy: [{ is_home: 'desc' }, { id: 'asc' }],
+      orderBy: [{ updated_at: 'asc' }, { id: 'asc' }],
     });
 
     const uniqueByDashboardId = new Map<number, (typeof dashboardUsers)[number]>();
@@ -1622,6 +1622,80 @@ export class DashboardCoreService {
     }));
   }
 
+  async reorderUserDashboards(userId: number, slugs: string[] | undefined, locale: string) {
+    const normalizedSlugs = Array.from(
+      new Set(
+        (Array.isArray(slugs) ? slugs : [])
+          .map((slug) => this.toNullableString(slug))
+          .filter((slug): slug is string => Boolean(slug)),
+      ),
+    );
+
+    if (normalizedSlugs.length === 0) {
+      throw new BadRequestException(
+        getLocaleText(
+          'validation.fieldRequired',
+          locale,
+          'Dashboard order is required.',
+        ),
+      );
+    }
+
+    const dashboardUsers = await this.prismaService.dashboard_user.findMany({
+      where: { user_id: userId },
+      include: {
+        dashboard: {
+          select: {
+            slug: true,
+          },
+        },
+      },
+      orderBy: [{ updated_at: 'asc' }, { id: 'asc' }],
+    });
+
+    if (dashboardUsers.length === 0) {
+      return { success: true };
+    }
+
+    const dashboardBySlug = new Map(
+      dashboardUsers.map((dashboardUser) => [dashboardUser.dashboard.slug, dashboardUser]),
+    );
+
+    for (const slug of normalizedSlugs) {
+      if (!dashboardBySlug.has(slug)) {
+        throw new ForbiddenException(
+          getLocaleText('dashboardNotFound', locale, 'Dashboard not found.'),
+        );
+      }
+    }
+
+    const normalizedSlugSet = new Set(normalizedSlugs);
+    const orderedDashboardUsers = [
+      ...normalizedSlugs.map((slug) => dashboardBySlug.get(slug)!),
+      ...dashboardUsers.filter(
+        (dashboardUser) => !normalizedSlugSet.has(dashboardUser.dashboard.slug),
+      ),
+    ];
+
+    const baseTimestamp = Date.now();
+
+    await this.prismaService.$transaction(
+      orderedDashboardUsers.map((dashboardUser, index) =>
+        this.prismaService.dashboard_user.update({
+          where: { id: dashboardUser.id },
+          data: {
+            updated_at: new Date(baseTimestamp + index),
+          },
+        }),
+      ),
+    );
+
+    return {
+      success: true,
+      orderedSlugs: orderedDashboardUsers.map((dashboardUser) => dashboardUser.dashboard.slug),
+    };
+  }
+
   async getAvailableTemplates(userId: number, locale: string) {
     const userRoleIds = await this.getUserRoleIds(userId);
     const templateAccessFilter =