@greatapps/common 1.1.543 → 1.1.547

package/src/modules/accounts/services/account.service.ts

@@ -15,6 +15,7 @@ import type {
   ChangeUserPhotoResponse,
   CreateAccountUserRequest,
   CreateAccountUserResponse,
+  DeleteAccountRequest,
   DeleteAccountResponse,
   DeleteAccountUserResponse,
   GetAccountDataResponse,
@@ -94,9 +95,12 @@ class AccountService {
     return response;
   }
 
-  async deleteAccount(): Promise<DeleteAccountResponse> {
+  async deleteAccount(data: DeleteAccountRequest): Promise<DeleteAccountResponse> {
     const { id_account } = await getUserContext();
-    const response = await api.apps.delete<DeleteAccountResponse>(`/accounts/${id_account}`);
+    const response = await api.apps.delete<DeleteAccountResponse>(
+      `/accounts/${id_account}`,
+      { body: JSON.stringify(data) }
+    );
 
     if (response.status === 0) {
       throw new ApiError(response.message || 'Erro ao deletar conta', 'DELETE_ACCOUNT_FAILED', 400);

package/src/modules/accounts/types.ts

@@ -127,6 +127,10 @@ export interface DeleteAccountUserResponse {
     message?: string;
 }
 
+export interface DeleteAccountRequest {
+    password: string;
+}
+
 export interface DeleteAccountResponse {
     status: 0 | 1;
     message?: string;

package/src/modules/auth/hooks/useUserQuery.ts

@@ -25,7 +25,7 @@ export function useUserQuery() {
   return useQuery({
     queryKey,
     queryFn: fetchUser,
-    staleTime: 5 * 60 * 1000,
+    staleTime: 60 * 1000,
     gcTime: 10 * 60 * 1000,
     retry: false,
   });

package/src/modules/cards/types.ts

@@ -1,16 +1,22 @@
 import z from 'zod';
 
+import {
+  PaginationParamsSchema,
+  SearchParamsSchema,
+  SortParamsSchema,
+} from '../../infra/api/types';
+
 export const CardSchema = z.object({
   id: z.union([z.number(), z.string()]),
-  id_wl: z.number().optional(),
-  id_account: z.union([z.number(), z.string()]).optional(),
+  id_wl: z.number(),
+  id_account: z.union([z.number(), z.string()]),
   id_gateway: z.union([z.number(), z.string()]).optional(),
-  gateway_account: z.string().optional(),
-  gateway_card: z.string().optional(),
+  gateway_account: z.string(),
+  gateway_card: z.string(),
   brand: z.string(),
   name: z.string(),
   number: z.string().nullable(),
-  date: z.string().nullable().optional(),
+  date: z.string().nullable(),
   deleted: z
     .number()
     .transform((val) => val === 1)
@@ -31,12 +37,8 @@ export const CreateCardRequestSchema = z.object({
 
 export type CreateCardRequest = z.infer<typeof CreateCardRequestSchema>;
 
-export const FindCardsParamsSchema = z.object({
-  page: z.number().optional(),
-  limit: z.number().optional(),
-  search: z.string().optional(),
-  sort: z.string().optional(),
-  order: z.enum(['asc', 'desc']).optional(),
-});
+export const FindCardsParamsSchema = PaginationParamsSchema.extend(SearchParamsSchema.shape).extend(
+  SortParamsSchema.shape
+);
 
 export type FindCardsParams = z.infer<typeof FindCardsParamsSchema>;

package/src/modules/plans/utils/map-api-plan-to-ui.ts

@@ -16,7 +16,7 @@ const BASE_FEATURES: PlanFeature[] = [
   { icon: "check", text: "Compartilhar páginas", tooltip: "sharePages" },
   { icon: "check", text: "Hospedagem inclusa" },
   { icon: "check", text: "SSL (HTTPS) + CDN" },
-  { icon: "check", text: "Templates Free" },
+  { icon: "check", text: "Templates gratuitos" },
 ];
 
 function buildMainFeaturesFromItems(items: Plan["items"]): PlanMainFeatures {

package/src/modules/subscriptions/types/subscription.type.ts

@@ -41,7 +41,7 @@ export const SubscriptionSchema = z.object({
   id_gateway: z.union([z.number(), z.string()]).nullable(),
   gateway_account: z.string().nullable(),
   date_hiring: z.coerce.date().nullable(),
-  date_due: z.coerce.date(),
+  date_due: z.coerce.date().nullable(),
   date_cancellation: z.coerce.date().nullable(),
   date_verification: z.coerce.date().nullable(),
   cancellation_reason: z.string().nullable(),
@@ -52,6 +52,7 @@ export const SubscriptionSchema = z.object({
   card_name: z.string().nullable().optional(),
   card_brand: z.string().nullable().optional(),
   card_number: z.string().nullable().optional(),
+  card: z.record(z.string(), z.unknown()).nullable().optional(),
   items: z.array(SubscriptionItemSchema),
   pending_change: z.object({
     schedule_id: z.string(),

package/src/store/useAccountModals.ts

@@ -13,18 +13,29 @@ export interface AccountModalsConfig {
   onGoToSubscription?: () => void;
 }
 
+interface DeleteAccountPayload {
+  password: string;
+}
+
 interface AccountModalsState {
   activeModal: AccountModalType | null;
   config: AccountModalsConfig;
   initialSection?: AccountSectionType;
 
+  /** Payload coletado no DeleteAccountModal, consumido pelo ConfirmDeleteAccountModal. */
+  deleteAccountPayload: DeleteAccountPayload | null;
+  /** Mensagem de erro do backend quando o delete falha (ex.: senha inválida).
+   *  Mostrada no DeleteAccountModal quando o usuário é mandado de volta. */
+  deleteAccountError: string | null;
+
   /** Called by <AccountModals> to keep app-level config in sync */
   updateConfig: (config: AccountModalsConfig) => void;
 
   openConfigurations: (initialSection?: AccountSectionType) => void;
-  openDeleteAccount: () => void;
+  openDeleteAccount: (error?: string) => void;
   openIsntPossibleDelete: () => void;
-  openConfirmDelete: () => void;
+  openConfirmDelete: (payload: DeleteAccountPayload) => void;
+  clearDeleteAccountError: () => void;
   close: () => void;
 }
 
@@ -32,21 +43,43 @@ export const useAccountModals = create<AccountModalsState>((set) => ({
   activeModal: null,
   config: {},
   initialSection: undefined,
+  deleteAccountPayload: null,
+  deleteAccountError: null,
 
   updateConfig: (config) => set({ config }),
 
   openConfigurations: (initialSection) =>
-    set({ activeModal: 'configurations', initialSection }),
+    set({
+      activeModal: 'configurations',
+      initialSection,
+      deleteAccountPayload: null,
+      deleteAccountError: null,
+    }),
 
-  openDeleteAccount: () =>
-    set({ activeModal: 'deleteAccount' }),
+  openDeleteAccount: (error) =>
+    set({
+      activeModal: 'deleteAccount',
+      deleteAccountPayload: null,
+      deleteAccountError: error ?? null,
+    }),
 
   openIsntPossibleDelete: () =>
     set({ activeModal: 'isntPossibleDelete' }),
 
-  openConfirmDelete: () =>
-    set({ activeModal: 'confirmDelete' }),
+  openConfirmDelete: (payload) =>
+    set({
+      activeModal: 'confirmDelete',
+      deleteAccountPayload: payload,
+      deleteAccountError: null,
+    }),
+
+  clearDeleteAccountError: () => set({ deleteAccountError: null }),
 
   close: () =>
-    set({ activeModal: null, initialSection: undefined }),
+    set({
+      activeModal: null,
+      initialSection: undefined,
+      deleteAccountPayload: null,
+      deleteAccountError: null,
+    }),
 }));