@greatapps/common 1.1.658 → 1.1.659

package/dist/modules/projects/hooks/list-project-users.hook.mjs

@@ -1,6 +1,7 @@
 "use client";
 import { useInfiniteQuery } from "@tanstack/react-query";
-import { apiFetch } from "../../../infra/http/api-fetch";
+import { listProjectUsersAction } from "../actions/list-project-users.action";
+import { withAction } from "../../../utils/withAction";
 import { useAuthQueryKey } from "../../../hooks/useAuthQueryKey";
 const PAGE_SIZE = 20;
 const LIST_PROJECT_USERS_BASE_KEY = (projectId) => ["project-users", projectId, "in"];
@@ -12,14 +13,13 @@ function useListProjectUsers(projectId, search = "") {
   const queryKey = useAuthQueryKey([...LIST_PROJECT_USERS_QUERY_KEY(projectId, search)]);
   return useInfiniteQuery({
     queryKey,
-    queryFn: ({ pageParam, signal }) => apiFetch(`/api/projects/${projectId}/users`, {
-      params: {
+    queryFn: ({ pageParam }) => withAction(
+      () => listProjectUsersAction(projectId, {
         search: search || void 0,
         page: pageParam,
         limit: PAGE_SIZE
-      },
-      signal
-    }),
+      })
+    )(),
     getNextPageParam: (lastPage, allPages) => {
       const loaded = allPages.reduce((sum, p) => sum + p.data.length, 0);
       return loaded < lastPage.total ? allPages.length + 1 : void 0;

package/dist/modules/projects/hooks/list-project-users.hook.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/modules/projects/hooks/list-project-users.hook.ts"],"sourcesContent":["'use client';\n\nimport { useInfiniteQuery } from '@tanstack/react-query';\nimport { apiFetch } from '../../../infra/http/api-fetch';\nimport type { ProjectUser, UsersPage } from '../types';\nimport { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';\n\nconst PAGE_SIZE = 20;\n\nexport const LIST_PROJECT_USERS_BASE_KEY = (projectId: number) =>\n  ['project-users', projectId, 'in'] as const;\n\nexport const LIST_PROJECT_USERS_QUERY_KEY = (projectId: number, search: string = '') => [\n  ...LIST_PROJECT_USERS_BASE_KEY(projectId),\n  search,\n] as const;\n\nexport function useListProjectUsers(projectId: number, search: string = '') {\n  const queryKey = useAuthQueryKey([...LIST_PROJECT_USERS_QUERY_KEY(projectId, search)]);\n\n  return useInfiniteQuery({\n    queryKey,\n    queryFn: ({ pageParam, signal }) =>\n      apiFetch<UsersPage<ProjectUser>>(`/api/projects/${projectId}/users`, {\n        params: {\n          search: search || undefined,\n          page: pageParam as number,\n          limit: PAGE_SIZE,\n        },\n        signal,\n      }),\n    getNextPageParam: (lastPage, allPages) => {\n      const loaded = allPages.reduce((sum, p) => sum + p.data.length, 0);\n      return loaded < lastPage.total ? allPages.length + 1 : undefined;\n    },\n    initialPageParam: 1,\n    enabled: !!projectId,\n  });\n}\n"],"mappings":";AAEA,SAAS,wBAAwB;AACjC,SAAS,gBAAgB;AAEzB,SAAS,uBAAuB;AAEhC,MAAM,YAAY;AAEX,MAAM,8BAA8B,CAAC,cAC1C,CAAC,iBAAiB,WAAW,IAAI;AAE5B,MAAM,+BAA+B,CAAC,WAAmB,SAAiB,OAAO;AAAA,EACtF,GAAG,4BAA4B,SAAS;AAAA,EACxC;AACF;AAEO,SAAS,oBAAoB,WAAmB,SAAiB,IAAI;AAC1E,QAAM,WAAW,gBAAgB,CAAC,GAAG,6BAA6B,WAAW,MAAM,CAAC,CAAC;AAErF,SAAO,iBAAiB;AAAA,IACtB;AAAA,IACA,SAAS,CAAC,EAAE,WAAW,OAAO,MAC5B,SAAiC,iBAAiB,SAAS,UAAU;AAAA,MACnE,QAAQ;AAAA,QACN,QAAQ,UAAU;AAAA,QAClB,MAAM;AAAA,QACN,OAAO;AAAA,MACT;AAAA,MACA;AAAA,IACF,CAAC;AAAA,IACH,kBAAkB,CAAC,UAAU,aAAa;AACxC,YAAM,SAAS,SAAS,OAAO,CAAC,KAAK,MAAM,MAAM,EAAE,KAAK,QAAQ,CAAC;AACjE,aAAO,SAAS,SAAS,QAAQ,SAAS,SAAS,IAAI;AAAA,IACzD;AAAA,IACA,kBAAkB;AAAA,IAClB,SAAS,CAAC,CAAC;AAAA,EACb,CAAC;AACH;","names":[]}
+{"version":3,"sources":["../../../../src/modules/projects/hooks/list-project-users.hook.ts"],"sourcesContent":["'use client';\n\nimport { useInfiniteQuery } from '@tanstack/react-query';\nimport { listProjectUsersAction } from '../actions/list-project-users.action';\nimport { withAction } from '../../../utils/withAction';\nimport { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';\n\nconst PAGE_SIZE = 20;\n\nexport const LIST_PROJECT_USERS_BASE_KEY = (projectId: number) =>\n  ['project-users', projectId, 'in'] as const;\n\nexport const LIST_PROJECT_USERS_QUERY_KEY = (projectId: number, search: string = '') => [\n  ...LIST_PROJECT_USERS_BASE_KEY(projectId),\n  search,\n] as const;\n\nexport function useListProjectUsers(projectId: number, search: string = '') {\n  const queryKey = useAuthQueryKey([...LIST_PROJECT_USERS_QUERY_KEY(projectId, search)]);\n\n  return useInfiniteQuery({\n    queryKey,\n    queryFn: ({ pageParam }) =>\n      withAction(() =>\n        listProjectUsersAction(projectId, {\n          search: search || undefined,\n          page: pageParam as number,\n          limit: PAGE_SIZE,\n        })\n      )(),\n    getNextPageParam: (lastPage, allPages) => {\n      const loaded = allPages.reduce((sum, p) => sum + p.data.length, 0);\n      return loaded < lastPage.total ? allPages.length + 1 : undefined;\n    },\n    initialPageParam: 1,\n    enabled: !!projectId,\n  });\n}\n"],"mappings":";AAEA,SAAS,wBAAwB;AACjC,SAAS,8BAA8B;AACvC,SAAS,kBAAkB;AAC3B,SAAS,uBAAuB;AAEhC,MAAM,YAAY;AAEX,MAAM,8BAA8B,CAAC,cAC1C,CAAC,iBAAiB,WAAW,IAAI;AAE5B,MAAM,+BAA+B,CAAC,WAAmB,SAAiB,OAAO;AAAA,EACtF,GAAG,4BAA4B,SAAS;AAAA,EACxC;AACF;AAEO,SAAS,oBAAoB,WAAmB,SAAiB,IAAI;AAC1E,QAAM,WAAW,gBAAgB,CAAC,GAAG,6BAA6B,WAAW,MAAM,CAAC,CAAC;AAErF,SAAO,iBAAiB;AAAA,IACtB;AAAA,IACA,SAAS,CAAC,EAAE,UAAU,MACpB;AAAA,MAAW,MACT,uBAAuB,WAAW;AAAA,QAChC,QAAQ,UAAU;AAAA,QAClB,MAAM;AAAA,QACN,OAAO;AAAA,MACT,CAAC;AAAA,IACH,EAAE;AAAA,IACJ,kBAAkB,CAAC,UAAU,aAAa;AACxC,YAAM,SAAS,SAAS,OAAO,CAAC,KAAK,MAAM,MAAM,EAAE,KAAK,QAAQ,CAAC;AACjE,aAAO,SAAS,SAAS,QAAQ,SAAS,SAAS,IAAI;AAAA,IACzD;AAAA,IACA,kBAAkB;AAAA,IAClB,SAAS,CAAC,CAAC;AAAA,EACb,CAAC;AACH;","names":[]}

package/dist/modules/projects/hooks/list-projects.hook.mjs

@@ -1,6 +1,7 @@
 "use client";
 import { useQuery, keepPreviousData } from "@tanstack/react-query";
-import { apiFetch } from "../../../infra/http/api-fetch";
+import { listProjectsAction } from "../actions/list-projects.action";
+import { withAction } from "../../../utils/withAction";
 import { useAuthQueryKey } from "../../../hooks/useAuthQueryKey";
 const PROJECTS_BASE_KEY = ["projects"];
 const PROJECTS_QUERY_KEY = (params) => [...PROJECTS_BASE_KEY, params];
@@ -8,7 +9,7 @@ function useProjects(params) {
   const queryKey = useAuthQueryKey([...PROJECTS_QUERY_KEY(params)]);
   return useQuery({
     queryKey,
-    queryFn: ({ signal }) => apiFetch("/api/projects", { params, signal }),
+    queryFn: withAction(() => listProjectsAction(params)),
     staleTime: 1e4,
     placeholderData: keepPreviousData
   });

package/dist/modules/projects/hooks/list-projects.hook.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/modules/projects/hooks/list-projects.hook.ts"],"sourcesContent":["'use client';\n\nimport { useQuery, keepPreviousData } from '@tanstack/react-query';\nimport { apiFetch } from '../../../infra/http/api-fetch';\nimport type { ListProjectsActionParams } from '../actions/list-projects.action';\nimport type { ProjectsPage } from '../types';\nimport { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';\n\nexport const PROJECTS_BASE_KEY = ['projects'] as const;\n\nexport const PROJECTS_QUERY_KEY = (params?: ListProjectsActionParams) =>\n  [...PROJECTS_BASE_KEY, params] as const;\n\nexport function useProjects(params?: ListProjectsActionParams) {\n  const queryKey = useAuthQueryKey([...PROJECTS_QUERY_KEY(params)]);\n\n  return useQuery({\n    queryKey,\n    queryFn: ({ signal }) => apiFetch<ProjectsPage>('/api/projects', { params, signal }),\n    staleTime: 10_000,\n    placeholderData: keepPreviousData,\n  });\n}\n"],"mappings":";AAEA,SAAS,UAAU,wBAAwB;AAC3C,SAAS,gBAAgB;AAGzB,SAAS,uBAAuB;AAEzB,MAAM,oBAAoB,CAAC,UAAU;AAErC,MAAM,qBAAqB,CAAC,WACjC,CAAC,GAAG,mBAAmB,MAAM;AAExB,SAAS,YAAY,QAAmC;AAC7D,QAAM,WAAW,gBAAgB,CAAC,GAAG,mBAAmB,MAAM,CAAC,CAAC;AAEhE,SAAO,SAAS;AAAA,IACd;AAAA,IACA,SAAS,CAAC,EAAE,OAAO,MAAM,SAAuB,iBAAiB,EAAE,QAAQ,OAAO,CAAC;AAAA,IACnF,WAAW;AAAA,IACX,iBAAiB;AAAA,EACnB,CAAC;AACH;","names":[]}
+{"version":3,"sources":["../../../../src/modules/projects/hooks/list-projects.hook.ts"],"sourcesContent":["'use client';\n\nimport { useQuery, keepPreviousData } from '@tanstack/react-query';\nimport { listProjectsAction } from '../actions/list-projects.action';\nimport type { ListProjectsActionParams } from '../actions/list-projects.action';\nimport { withAction } from '../../../utils/withAction';\nimport { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';\n\nexport const PROJECTS_BASE_KEY = ['projects'] as const;\n\nexport const PROJECTS_QUERY_KEY = (params?: ListProjectsActionParams) =>\n  [...PROJECTS_BASE_KEY, params] as const;\n\nexport function useProjects(params?: ListProjectsActionParams) {\n  const queryKey = useAuthQueryKey([...PROJECTS_QUERY_KEY(params)]);\n\n  return useQuery({\n    queryKey,\n    queryFn: withAction(() => listProjectsAction(params)),\n    staleTime: 10_000,\n    placeholderData: keepPreviousData,\n  });\n}\n"],"mappings":";AAEA,SAAS,UAAU,wBAAwB;AAC3C,SAAS,0BAA0B;AAEnC,SAAS,kBAAkB;AAC3B,SAAS,uBAAuB;AAEzB,MAAM,oBAAoB,CAAC,UAAU;AAErC,MAAM,qBAAqB,CAAC,WACjC,CAAC,GAAG,mBAAmB,MAAM;AAExB,SAAS,YAAY,QAAmC;AAC7D,QAAM,WAAW,gBAAgB,CAAC,GAAG,mBAAmB,MAAM,CAAC,CAAC;AAEhE,SAAO,SAAS;AAAA,IACd;AAAA,IACA,SAAS,WAAW,MAAM,mBAAmB,MAAM,CAAC;AAAA,IACpD,WAAW;AAAA,IACX,iBAAiB;AAAA,EACnB,CAAC;AACH;","names":[]}

package/dist/modules/subscriptions/hooks/find-active-subscription.hook.mjs

@@ -1,16 +1,16 @@
 "use client";
 import { useQuery } from "@tanstack/react-query";
-import { apiFetch } from "../../../infra/http/api-fetch";
+import { listSubscriptionsAction } from "../actions/list-subscriptions.action";
 import { SUBSCRIPTIONS_QUERY_KEY } from "../constants/query-keys.constants";
+import { withAction } from "../../../utils/withAction";
 import { useAuthQueryKey } from "../../../hooks/useAuthQueryKey";
 function useActiveSubscription() {
   const queryKey = useAuthQueryKey([...SUBSCRIPTIONS_QUERY_KEY, "active"]);
   return useQuery({
     queryKey,
-    queryFn: ({ signal }) => apiFetch("/api/subscriptions", {
-      params: { limit: 1 },
-      signal
-    }),
+    queryFn: async () => {
+      return await withAction(listSubscriptionsAction)({ limit: 1 });
+    },
     staleTime: 1e4
   });
 }

package/dist/modules/subscriptions/hooks/find-active-subscription.hook.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/modules/subscriptions/hooks/find-active-subscription.hook.ts"],"sourcesContent":["\"use client\";\n\nimport { useQuery } from \"@tanstack/react-query\";\nimport { apiFetch } from \"../../../infra/http/api-fetch\";\nimport type { PaginatedSuccessResult } from \"../../../infra/api/types\";\nimport type { Subscription } from \"../types/subscription.type\";\nimport { SUBSCRIPTIONS_QUERY_KEY } from \"../constants/query-keys.constants\";\nimport { useAuthQueryKey } from \"../../../hooks/useAuthQueryKey\";\n\nexport function useActiveSubscription() {\n  const queryKey = useAuthQueryKey([...SUBSCRIPTIONS_QUERY_KEY, \"active\"]);\n\n  return useQuery({\n    queryKey,\n    queryFn: ({ signal }) =>\n      apiFetch<PaginatedSuccessResult<Subscription>>('/api/subscriptions', {\n        params: { limit: 1 },\n        signal,\n      }),\n    staleTime: 10_000,\n  });\n}\n"],"mappings":";AAEA,SAAS,gBAAgB;AACzB,SAAS,gBAAgB;AAGzB,SAAS,+BAA+B;AACxC,SAAS,uBAAuB;AAEzB,SAAS,wBAAwB;AACtC,QAAM,WAAW,gBAAgB,CAAC,GAAG,yBAAyB,QAAQ,CAAC;AAEvE,SAAO,SAAS;AAAA,IACd;AAAA,IACA,SAAS,CAAC,EAAE,OAAO,MACjB,SAA+C,sBAAsB;AAAA,MACnE,QAAQ,EAAE,OAAO,EAAE;AAAA,MACnB;AAAA,IACF,CAAC;AAAA,IACH,WAAW;AAAA,EACb,CAAC;AACH;","names":[]}
+{"version":3,"sources":["../../../../src/modules/subscriptions/hooks/find-active-subscription.hook.ts"],"sourcesContent":["\"use client\";\n\nimport { useQuery } from \"@tanstack/react-query\";\nimport { listSubscriptionsAction } from \"../actions/list-subscriptions.action\";\nimport { SUBSCRIPTIONS_QUERY_KEY } from \"../constants/query-keys.constants\";\nimport { withAction } from \"../../../utils/withAction\";\nimport { useAuthQueryKey } from \"../../../hooks/useAuthQueryKey\";\n\nexport function useActiveSubscription() {\n  const queryKey = useAuthQueryKey([...SUBSCRIPTIONS_QUERY_KEY, \"active\"]);\n\n  return useQuery({\n    queryKey,\n    queryFn: async () => {\n      return await withAction(listSubscriptionsAction)({ limit: 1 });\n    },\n    staleTime: 10_000,\n  });\n}\n"],"mappings":";AAEA,SAAS,gBAAgB;AACzB,SAAS,+BAA+B;AACxC,SAAS,+BAA+B;AACxC,SAAS,kBAAkB;AAC3B,SAAS,uBAAuB;AAEzB,SAAS,wBAAwB;AACtC,QAAM,WAAW,gBAAgB,CAAC,GAAG,yBAAyB,QAAQ,CAAC;AAEvE,SAAO,SAAS;AAAA,IACd;AAAA,IACA,SAAS,YAAY;AACnB,aAAO,MAAM,WAAW,uBAAuB,EAAE,EAAE,OAAO,EAAE,CAAC;AAAA,IAC/D;AAAA,IACA,WAAW;AAAA,EACb,CAAC;AACH;","names":[]}

package/dist/modules/subscriptions/hooks/list-subscriptions.hook.mjs

@@ -1,18 +1,16 @@
 "use client";
 import { useQuery } from "@tanstack/react-query";
-import { apiFetch } from "../../../infra/http/api-fetch";
+import { listSubscriptionsAction } from "../actions/list-subscriptions.action";
 import { parseResult } from "../../../infra/utils/parser";
 import { SubscriptionSchema } from "../types/subscription.type";
+import { withAction } from "../../../utils/withAction";
 import { SUBSCRIPTIONS_QUERY_KEY } from "../constants/query-keys.constants";
 import { useAuthQueryKey } from "../../../hooks/useAuthQueryKey";
 function useSubscriptions(params) {
   const queryKey = useAuthQueryKey([...SUBSCRIPTIONS_QUERY_KEY, params]);
   return useQuery({
     queryKey,
-    queryFn: async ({ signal }) => parseResult(
-      SubscriptionSchema,
-      await apiFetch("/api/subscriptions", { params, signal })
-    )
+    queryFn: async () => parseResult(SubscriptionSchema, await withAction(() => listSubscriptionsAction(params))())
   });
 }
 export {

package/dist/modules/subscriptions/hooks/list-subscriptions.hook.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/modules/subscriptions/hooks/list-subscriptions.hook.ts"],"sourcesContent":["'use client';\n\nimport { useQuery } from '@tanstack/react-query';\nimport { apiFetch } from '../../../infra/http/api-fetch';\nimport type { PaginatedSuccessResult } from '../../../infra/api/types';\nimport { parseResult } from '../../../infra/utils/parser';\nimport { SubscriptionSchema, type Subscription, type FindSubscriptionsParams } from '../types/subscription.type';\nimport { SUBSCRIPTIONS_QUERY_KEY } from '../constants/query-keys.constants';\nimport { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';\n\nexport function useSubscriptions(params?: Partial<FindSubscriptionsParams>) {\n  const queryKey = useAuthQueryKey([...SUBSCRIPTIONS_QUERY_KEY, params]);\n\n  return useQuery({\n    queryKey,\n    queryFn: async ({ signal }) =>\n      parseResult(\n        SubscriptionSchema,\n        await apiFetch<PaginatedSuccessResult<Subscription>>('/api/subscriptions', { params, signal })\n      ),\n  });\n}\n"],"mappings":";AAEA,SAAS,gBAAgB;AACzB,SAAS,gBAAgB;AAEzB,SAAS,mBAAmB;AAC5B,SAAS,0BAA2E;AACpF,SAAS,+BAA+B;AACxC,SAAS,uBAAuB;AAEzB,SAAS,iBAAiB,QAA2C;AAC1E,QAAM,WAAW,gBAAgB,CAAC,GAAG,yBAAyB,MAAM,CAAC;AAErE,SAAO,SAAS;AAAA,IACd;AAAA,IACA,SAAS,OAAO,EAAE,OAAO,MACvB;AAAA,MACE;AAAA,MACA,MAAM,SAA+C,sBAAsB,EAAE,QAAQ,OAAO,CAAC;AAAA,IAC/F;AAAA,EACJ,CAAC;AACH;","names":[]}
+{"version":3,"sources":["../../../../src/modules/subscriptions/hooks/list-subscriptions.hook.ts"],"sourcesContent":["'use client';\n\nimport { useQuery } from '@tanstack/react-query';\nimport { listSubscriptionsAction } from '../actions/list-subscriptions.action';\nimport { parseResult } from '../../../infra/utils/parser';\nimport { SubscriptionSchema, type FindSubscriptionsParams } from '../types/subscription.type';\nimport { withAction } from '../../../utils/withAction';\nimport { SUBSCRIPTIONS_QUERY_KEY } from '../constants/query-keys.constants';\nimport { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';\n\nexport function useSubscriptions(params?: Partial<FindSubscriptionsParams>) {\n  const queryKey = useAuthQueryKey([...SUBSCRIPTIONS_QUERY_KEY, params]);\n\n  return useQuery({\n    queryKey,\n    queryFn: async () =>\n      parseResult(SubscriptionSchema, await withAction(() => listSubscriptionsAction(params))()),\n  });\n}\n"],"mappings":";AAEA,SAAS,gBAAgB;AACzB,SAAS,+BAA+B;AACxC,SAAS,mBAAmB;AAC5B,SAAS,0BAAwD;AACjE,SAAS,kBAAkB;AAC3B,SAAS,+BAA+B;AACxC,SAAS,uBAAuB;AAEzB,SAAS,iBAAiB,QAA2C;AAC1E,QAAM,WAAW,gBAAgB,CAAC,GAAG,yBAAyB,MAAM,CAAC;AAErE,SAAO,SAAS;AAAA,IACd;AAAA,IACA,SAAS,YACP,YAAY,oBAAoB,MAAM,WAAW,MAAM,wBAAwB,MAAM,CAAC,EAAE,CAAC;AAAA,EAC7F,CAAC;AACH;","names":[]}

package/dist/modules/users/hooks/messages.hook.mjs

@@ -1,6 +1,6 @@
 "use client";
 import { useInfiniteQuery, useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { apiFetch } from "../../../infra/http/api-fetch";
+import { listMessagesAction } from "../action/list-messages.action";
 import { markMessageAsReadAction } from "../action/mark-message-as-read.action";
 import { markAllMessagesAsReadAction } from "../action/mark-all-messages-as-read.action";
 import { withAction } from "../../../utils/withAction";
@@ -11,21 +11,20 @@ function useMessages(params) {
   const queryKey = useAuthQueryKey([...MESSAGES_QUERY_KEY, params]);
   return useQuery({
     queryKey,
-    queryFn: ({ signal }) => apiFetch("/api/messages", { params, signal })
+    queryFn: withAction(() => listMessagesAction(params))
   });
 }
 function useInfiniteMessages(params) {
   const queryKey = useAuthQueryKey([...MESSAGES_QUERY_KEY, "infinite", params]);
   return useInfiniteQuery({
     queryKey,
-    queryFn: ({ pageParam, signal }) => apiFetch("/api/messages", {
-      params: {
+    queryFn: ({ pageParam }) => withAction(
+      () => listMessagesAction({
         ...params,
         page: pageParam,
         limit: INFINITE_MESSAGES_PAGE_SIZE
-      },
-      signal
-    }),
+      })
+    )(),
     getNextPageParam: (lastPage, allPages) => {
       const loaded = allPages.reduce((sum, p) => sum + p.data.length, 0);
       return loaded < lastPage.total ? allPages.length + 1 : void 0;

package/dist/modules/users/hooks/messages.hook.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/modules/users/hooks/messages.hook.ts"],"sourcesContent":["'use client';\n\nimport { useInfiniteQuery, useMutation, useQuery, useQueryClient } from '@tanstack/react-query';\nimport { apiFetch } from '../../../infra/http/api-fetch';\nimport { markMessageAsReadAction } from '../action/mark-message-as-read.action';\nimport { markAllMessagesAsReadAction } from '../action/mark-all-messages-as-read.action';\nimport { withAction } from '../../../utils/withAction';\nimport type { FindMessagesParams, ListMessagesApiResponse } from '../schema/messages.schema';\nimport { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';\n\nexport const MESSAGES_QUERY_KEY = ['messages'] as const;\n\nconst INFINITE_MESSAGES_PAGE_SIZE = 10;\n\nexport function useMessages(params?: Partial<FindMessagesParams>) {\n  const queryKey = useAuthQueryKey([...MESSAGES_QUERY_KEY, params]);\n\n  return useQuery({\n    queryKey,\n    queryFn: ({ signal }) =>\n      apiFetch<ListMessagesApiResponse>('/api/messages', { params, signal }),\n  });\n}\n\nexport function useInfiniteMessages(params?: Partial<Omit<FindMessagesParams, 'page' | 'limit'>>) {\n  const queryKey = useAuthQueryKey([...MESSAGES_QUERY_KEY, 'infinite', params]);\n\n  return useInfiniteQuery({\n    queryKey,\n    queryFn: ({ pageParam, signal }) =>\n      apiFetch<ListMessagesApiResponse>('/api/messages', {\n        params: {\n          ...params,\n          page: pageParam as number,\n          limit: INFINITE_MESSAGES_PAGE_SIZE,\n        },\n        signal,\n      }),\n    getNextPageParam: (lastPage, allPages) => {\n      const loaded = allPages.reduce((sum, p) => sum + p.data.length, 0);\n      return loaded < lastPage.total ? allPages.length + 1 : undefined;\n    },\n    initialPageParam: 1,\n  });\n}\n\nexport function useMarkMessageAsRead() {\n  const queryClient = useQueryClient();\n  const messagesKey = useAuthQueryKey([...MESSAGES_QUERY_KEY]);\n\n  return useMutation({\n    mutationFn: withAction(markMessageAsReadAction),\n    onSuccess: () => {\n      queryClient.invalidateQueries({ queryKey: messagesKey });\n    },\n  });\n}\n\nexport function useMarkAllMessagesAsRead() {\n  const queryClient = useQueryClient();\n  const messagesKey = useAuthQueryKey([...MESSAGES_QUERY_KEY]);\n\n  return useMutation({\n    mutationFn: withAction(markAllMessagesAsReadAction),\n    onSuccess: () => {\n      queryClient.invalidateQueries({ queryKey: messagesKey });\n    },\n  });\n}\n"],"mappings":";AAEA,SAAS,kBAAkB,aAAa,UAAU,sBAAsB;AACxE,SAAS,gBAAgB;AACzB,SAAS,+BAA+B;AACxC,SAAS,mCAAmC;AAC5C,SAAS,kBAAkB;AAE3B,SAAS,uBAAuB;AAEzB,MAAM,qBAAqB,CAAC,UAAU;AAE7C,MAAM,8BAA8B;AAE7B,SAAS,YAAY,QAAsC;AAChE,QAAM,WAAW,gBAAgB,CAAC,GAAG,oBAAoB,MAAM,CAAC;AAEhE,SAAO,SAAS;AAAA,IACd;AAAA,IACA,SAAS,CAAC,EAAE,OAAO,MACjB,SAAkC,iBAAiB,EAAE,QAAQ,OAAO,CAAC;AAAA,EACzE,CAAC;AACH;AAEO,SAAS,oBAAoB,QAA8D;AAChG,QAAM,WAAW,gBAAgB,CAAC,GAAG,oBAAoB,YAAY,MAAM,CAAC;AAE5E,SAAO,iBAAiB;AAAA,IACtB;AAAA,IACA,SAAS,CAAC,EAAE,WAAW,OAAO,MAC5B,SAAkC,iBAAiB;AAAA,MACjD,QAAQ;AAAA,QACN,GAAG;AAAA,QACH,MAAM;AAAA,QACN,OAAO;AAAA,MACT;AAAA,MACA;AAAA,IACF,CAAC;AAAA,IACH,kBAAkB,CAAC,UAAU,aAAa;AACxC,YAAM,SAAS,SAAS,OAAO,CAAC,KAAK,MAAM,MAAM,EAAE,KAAK,QAAQ,CAAC;AACjE,aAAO,SAAS,SAAS,QAAQ,SAAS,SAAS,IAAI;AAAA,IACzD;AAAA,IACA,kBAAkB;AAAA,EACpB,CAAC;AACH;AAEO,SAAS,uBAAuB;AACrC,QAAM,cAAc,eAAe;AACnC,QAAM,cAAc,gBAAgB,CAAC,GAAG,kBAAkB,CAAC;AAE3D,SAAO,YAAY;AAAA,IACjB,YAAY,WAAW,uBAAuB;AAAA,IAC9C,WAAW,MAAM;AACf,kBAAY,kBAAkB,EAAE,UAAU,YAAY,CAAC;AAAA,IACzD;AAAA,EACF,CAAC;AACH;AAEO,SAAS,2BAA2B;AACzC,QAAM,cAAc,eAAe;AACnC,QAAM,cAAc,gBAAgB,CAAC,GAAG,kBAAkB,CAAC;AAE3D,SAAO,YAAY;AAAA,IACjB,YAAY,WAAW,2BAA2B;AAAA,IAClD,WAAW,MAAM;AACf,kBAAY,kBAAkB,EAAE,UAAU,YAAY,CAAC;AAAA,IACzD;AAAA,EACF,CAAC;AACH;","names":[]}
+{"version":3,"sources":["../../../../src/modules/users/hooks/messages.hook.ts"],"sourcesContent":["'use client';\n\nimport { useInfiniteQuery, useMutation, useQuery, useQueryClient } from '@tanstack/react-query';\nimport { listMessagesAction } from '../action/list-messages.action';\nimport { markMessageAsReadAction } from '../action/mark-message-as-read.action';\nimport { markAllMessagesAsReadAction } from '../action/mark-all-messages-as-read.action';\nimport { withAction } from '../../../utils/withAction';\nimport type { FindMessagesParams } from '../schema/messages.schema';\nimport { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';\n\nexport const MESSAGES_QUERY_KEY = ['messages'] as const;\n\nconst INFINITE_MESSAGES_PAGE_SIZE = 10;\n\nexport function useMessages(params?: Partial<FindMessagesParams>) {\n  const queryKey = useAuthQueryKey([...MESSAGES_QUERY_KEY, params]);\n\n  return useQuery({\n    queryKey,\n    queryFn: withAction(() => listMessagesAction(params)),\n  });\n}\n\nexport function useInfiniteMessages(params?: Partial<Omit<FindMessagesParams, 'page' | 'limit'>>) {\n  const queryKey = useAuthQueryKey([...MESSAGES_QUERY_KEY, 'infinite', params]);\n\n  return useInfiniteQuery({\n    queryKey,\n    queryFn: ({ pageParam }) =>\n      withAction(() =>\n        listMessagesAction({\n          ...params,\n          page: pageParam as number,\n          limit: INFINITE_MESSAGES_PAGE_SIZE,\n        })\n      )(),\n    getNextPageParam: (lastPage, allPages) => {\n      const loaded = allPages.reduce((sum, p) => sum + p.data.length, 0);\n      return loaded < lastPage.total ? allPages.length + 1 : undefined;\n    },\n    initialPageParam: 1,\n  });\n}\n\nexport function useMarkMessageAsRead() {\n  const queryClient = useQueryClient();\n  const messagesKey = useAuthQueryKey([...MESSAGES_QUERY_KEY]);\n\n  return useMutation({\n    mutationFn: withAction(markMessageAsReadAction),\n    onSuccess: () => {\n      queryClient.invalidateQueries({ queryKey: messagesKey });\n    },\n  });\n}\n\nexport function useMarkAllMessagesAsRead() {\n  const queryClient = useQueryClient();\n  const messagesKey = useAuthQueryKey([...MESSAGES_QUERY_KEY]);\n\n  return useMutation({\n    mutationFn: withAction(markAllMessagesAsReadAction),\n    onSuccess: () => {\n      queryClient.invalidateQueries({ queryKey: messagesKey });\n    },\n  });\n}\n"],"mappings":";AAEA,SAAS,kBAAkB,aAAa,UAAU,sBAAsB;AACxE,SAAS,0BAA0B;AACnC,SAAS,+BAA+B;AACxC,SAAS,mCAAmC;AAC5C,SAAS,kBAAkB;AAE3B,SAAS,uBAAuB;AAEzB,MAAM,qBAAqB,CAAC,UAAU;AAE7C,MAAM,8BAA8B;AAE7B,SAAS,YAAY,QAAsC;AAChE,QAAM,WAAW,gBAAgB,CAAC,GAAG,oBAAoB,MAAM,CAAC;AAEhE,SAAO,SAAS;AAAA,IACd;AAAA,IACA,SAAS,WAAW,MAAM,mBAAmB,MAAM,CAAC;AAAA,EACtD,CAAC;AACH;AAEO,SAAS,oBAAoB,QAA8D;AAChG,QAAM,WAAW,gBAAgB,CAAC,GAAG,oBAAoB,YAAY,MAAM,CAAC;AAE5E,SAAO,iBAAiB;AAAA,IACtB;AAAA,IACA,SAAS,CAAC,EAAE,UAAU,MACpB;AAAA,MAAW,MACT,mBAAmB;AAAA,QACjB,GAAG;AAAA,QACH,MAAM;AAAA,QACN,OAAO;AAAA,MACT,CAAC;AAAA,IACH,EAAE;AAAA,IACJ,kBAAkB,CAAC,UAAU,aAAa;AACxC,YAAM,SAAS,SAAS,OAAO,CAAC,KAAK,MAAM,MAAM,EAAE,KAAK,QAAQ,CAAC;AACjE,aAAO,SAAS,SAAS,QAAQ,SAAS,SAAS,IAAI;AAAA,IACzD;AAAA,IACA,kBAAkB;AAAA,EACpB,CAAC;AACH;AAEO,SAAS,uBAAuB;AACrC,QAAM,cAAc,eAAe;AACnC,QAAM,cAAc,gBAAgB,CAAC,GAAG,kBAAkB,CAAC;AAE3D,SAAO,YAAY;AAAA,IACjB,YAAY,WAAW,uBAAuB;AAAA,IAC9C,WAAW,MAAM;AACf,kBAAY,kBAAkB,EAAE,UAAU,YAAY,CAAC;AAAA,IACzD;AAAA,EACF,CAAC;AACH;AAEO,SAAS,2BAA2B;AACzC,QAAM,cAAc,eAAe;AACnC,QAAM,cAAc,gBAAgB,CAAC,GAAG,kBAAkB,CAAC;AAE3D,SAAO,YAAY;AAAA,IACjB,YAAY,WAAW,2BAA2B;AAAA,IAClD,WAAW,MAAM;AACf,kBAAY,kBAAkB,EAAE,UAAU,YAAY,CAAC;AAAA,IACzD;AAAA,EACF,CAAC;AACH;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@greatapps/common",
-  "version": "1.1.658",
+  "version": "1.1.659",
   "description": "Shared library for GreatApps frontend applications",
   "main": "./dist/index.mjs",
   "types": "./src/index.ts",
@@ -16,18 +16,6 @@
     "./middleware": {
       "import": "./dist/middleware.mjs",
       "types": "./src/middleware.ts"
-    },
-    "./route": {
-      "import": "./dist/route.mjs",
-      "types": "./src/route.ts"
-    },
-    "./http": {
-      "import": "./dist/http.mjs",
-      "types": "./src/http.ts"
-    },
-    "./handlers": {
-      "import": "./dist/handlers.mjs",
-      "types": "./src/handlers.ts"
     }
   },
   "files": [
@@ -77,7 +65,6 @@
   },
   "devDependencies": {
     "@hookform/resolvers": "^5.2.2",
-    "zod": "^4.4.3",
     "@tanstack/react-query": "^5.95.2",
     "@tanstack/react-query-devtools": "^5.95.2",
     "@types/node": "^25.5.0",
@@ -90,6 +77,7 @@
     "react-hook-form": "^7.72.0",
     "tsup": "^8.5.1",
     "typescript": "^5.9.3",
+    "zod": "^4.3.6",
     "zustand": "^5.0.12"
   },
   "peerDependencies": {

package/src/components/account/sections/TokenSection.tsx

@@ -60,7 +60,7 @@ export function TokenSection() {
         </div>
 
         <a
-          href="https://documenter.getpostman.com/view/4861938/2sAYdoDmj4"
+          href="https://documenter.getpostman.com/view/4861938/T1Djiz8H"
           target="_blank"
           rel="noopener noreferrer"
           className="paragraph-small-medium text-gray-500 underline hover:text-gray-700 transition-colors w-fit"

package/src/components/embeds/CrispEmbed.tsx

@@ -55,23 +55,9 @@ export function showCrisp() {
 }
 
 const FREE_PLAN_ID = 5;
-const FREE_PLAN_WELCOME_SHOWN_KEY = 'crisp:free-plan-welcome:shown';
-const FREE_PLAN_WELCOME_QUERY_FLAG = 'createNew';
-const FREE_PLAN_WELCOME_MESSAGE = `Oi! Tenho uma novidade exclusiva para você 🎉
-
-Criamos o Plano Iniciante pensando exatamente em você: R$ 14,90/mês para quem já deu o primeiro passo e quer ir além.
-
-Com ele você conecta seu próprio domínio, publica até 3 páginas e libera recursos como scripts, API Meta, exportação de leads e possibilidade de contratar GreatAI.
-
-Acesse o menu "Assinaturas" e assine agora!`;
-
-export function sendCrispMessage(text: string) {
-  safeCrispPush(['do', 'message:show', ['text', text]]);
-}
-
-export function openCrispChat() {
-  crispDo('chat:open');
-}
+const FREE_PLAN_SIGNUP_QUERY_FLAG = 'createNew';
+const FREE_PLAN_SIGNUP_SEGMENT = 'cadastro_plano_free';
+const FREE_PLAN_SIGNUP_TAGGED_KEY = 'crisp:free-plan-signup:tagged';
 
 export function updateCrispUser(data: {
   email?: string;
@@ -181,32 +167,23 @@ export function CrispEmbed() {
   useEffect(() => {
     try {
       const params = new URLSearchParams(window.location.search);
-      if (params.get(FREE_PLAN_WELCOME_QUERY_FLAG) === 'true') {
+      if (params.get(FREE_PLAN_SIGNUP_QUERY_FLAG) === 'true') {
         setIsFreshSignup(true);
       }
     } catch {}
   }, []);
 
-  // Mostra mensagem de boas-vindas no Crisp para quem acabou de se cadastrar no plano free.
+  // Marca o usuário com o segment de cadastro free para o trigger do Crisp.
+  // A mensagem em si é configurada lá no Crisp (Message Trigger com condição
+  // session:segments contém 'cadastro_plano_free').
   useEffect(() => {
     if (!user || !shouldLoadCrisp || !isFreshSignup) return;
     if (subscription?.id_plan !== FREE_PLAN_ID) return;
     try {
-      const shownKey = `${FREE_PLAN_WELCOME_SHOWN_KEY}:${user.id}`;
-      if (window.localStorage.getItem(shownKey)) return;
-
-      // Defer to session:loaded para garantir que a Crisp está pronta antes
-      // de exibir a mensagem. Sem isso, comandos enfileirados pré-load podem
-      // ser descartados silenciosamente.
-      safeCrispPush([
-        'on',
-        'session:loaded',
-        () => {
-          sendCrispMessage(FREE_PLAN_WELCOME_MESSAGE);
-          openCrispChat();
-        },
-      ]);
-      window.localStorage.setItem(shownKey, '1');
+      const taggedKey = `${FREE_PLAN_SIGNUP_TAGGED_KEY}:${user.id}`;
+      if (window.localStorage.getItem(taggedKey)) return;
+      crispSegment(FREE_PLAN_SIGNUP_SEGMENT);
+      window.localStorage.setItem(taggedKey, '1');
     } catch {}
   }, [user, shouldLoadCrisp, isFreshSignup, subscription?.id_plan]);
 

package/src/modules/cards/hooks/card-by-id.hook.ts

@@ -1,9 +1,7 @@
 'use client';
 
 import { useQuery } from '@tanstack/react-query';
-import { apiFetch } from '../../../infra/http/api-fetch';
-import type { SuccessResult } from '../../../infra/api/types';
-import type { Card } from '../types';
+import { withAction } from '../../../utils/withAction';
 import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
 
 export function useCardById(id: number | undefined) {
@@ -11,7 +9,10 @@ export function useCardById(id: number | undefined) {
 
   return useQuery({
     queryKey: cardKey,
-    queryFn: ({ signal }) => apiFetch<SuccessResult<Card>>(`/api/cards/${id}`, { signal }),
+    queryFn: async () => {
+      const { findCardByIdAction } = await import('../actions/find-card-by-id.action');
+      return withAction(findCardByIdAction)(id!);
+    },
     enabled: id != null,
   });
 }

package/src/modules/cards/hooks/cards.hook.ts

@@ -1,9 +1,7 @@
 'use client';
 
 import { useQuery } from '@tanstack/react-query';
-import { apiFetch } from '../../../infra/http/api-fetch';
-import type { PaginatedSuccessResult } from '../../../infra/api/types';
-import type { Card } from '../types';
+import { withAction } from '../../../utils/withAction';
 import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
 
 export const CARDS_QUERY_KEY = ['cards'] as const;
@@ -13,7 +11,10 @@ export function useCards() {
 
   return useQuery({
     queryKey,
-    queryFn: ({ signal }) => apiFetch<PaginatedSuccessResult<Card>>('/api/cards', { signal }),
+    queryFn: async () => {
+      const { listCardsAction } = await import('../actions/list-cards.action');
+      return withAction(listCardsAction)();
+    },
     select: (result) => ({
       ...result,
       data: result.data.filter((card) => !card.deleted),

package/src/modules/charges/hooks/charge-by-id.hook.ts

@@ -1,10 +1,9 @@
 'use client';
 
 import { useQuery } from '@tanstack/react-query';
-import { apiFetch } from '../../../infra/http/api-fetch';
-import type { SuccessResult } from '../../../infra/api/types';
+import { withAction } from '../../../utils/withAction';
 import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
-import { Charge } from '../types/charge.type';
+import { findChargeByIdAction } from '../actions/find-charge-by-id.action';
 import { CHARGES_QUERY_KEY } from '../../subscriptions/constants/query-keys.constants';
 
 export function useChargeById(chargeId: string | number | null | undefined) {
@@ -12,8 +11,7 @@ export function useChargeById(chargeId: string | number | null | undefined) {
 
   return useQuery({
     queryKey: chargesKey,
-    queryFn: ({ signal }) =>
-      apiFetch<SuccessResult<Charge>>(`/api/charges/${chargeId}`, { signal }),
+    queryFn: () => withAction(findChargeByIdAction)(chargeId!),
     enabled: !!chargeId,
   });
 }

package/src/modules/charges/hooks/charges.hook.ts

@@ -1,10 +1,10 @@
 'use client';
 
 import { useQuery } from '@tanstack/react-query';
-import { apiFetch } from '../../../infra/http/api-fetch';
-import type { PaginatedSuccessResult } from '../../../infra/api/types';
+import { withAction } from '../../../utils/withAction';
 import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
-import { Charge, FindChargesParams } from '../types/charge.type';
+import { listChargesAction } from '../actions/list-charges.action';
+import { FindChargesParams } from '../types/charge.type';
 import { CHARGES_QUERY_KEY } from '../../subscriptions/constants/query-keys.constants';
 
 export function useCharges(params?: Partial<FindChargesParams>) {
@@ -12,8 +12,7 @@ export function useCharges(params?: Partial<FindChargesParams>) {
 
   return useQuery({
     queryKey: chargesKey,
-    queryFn: ({ signal }) =>
-      apiFetch<PaginatedSuccessResult<Charge>>('/api/charges', { params, signal }),
+    queryFn: () => withAction(listChargesAction)(params),
     staleTime: 10_000,
   });
 }

package/src/modules/ia-credits/hooks/ia-credits.hook.ts

@@ -2,10 +2,10 @@
 
 import { useMemo } from 'react';
 import { useQuery } from '@tanstack/react-query';
-import { apiFetch } from '../../../infra/http/api-fetch';
-import type { PaginatedSuccessResult } from '../../../infra/api/types';
+import { listIaCreditsAction } from '../actions/list-ia-credits.action';
 import type { IaCreditOperation, IaCreditsSummary } from '../types';
 import { useActiveSubscription } from '../../subscriptions/hooks/find-active-subscription.hook';
+import { withAction } from '../../../utils/withAction';
 import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
 
 function calculateSummary(operations: IaCreditOperation[]): IaCreditsSummary {
@@ -77,11 +77,7 @@ export function useIaCredits() {
 
   const query = useQuery({
     queryKey,
-    queryFn: ({ signal }) =>
-      apiFetch<PaginatedSuccessResult<IaCreditOperation>>(
-        `/api/subscriptions/${subscriptionId}/ia-credits`,
-        { signal }
-      ),
+    queryFn: withAction(() => listIaCreditsAction(subscriptionId!)),
     enabled: subscriptionId != null,
   });
 

package/src/modules/pages/hooks/count-pages.hook.ts

@@ -1,8 +1,9 @@
 'use client';
 
 import { useQuery } from '@tanstack/react-query';
-import { apiFetch } from '../../../infra/http/api-fetch';
+import { countPagesAction } from '../actions/count-pages.action';
 import { PAGES_QUERY_KEY } from '../constants/query-keys.constants';
+import { withAction } from '../../../utils/withAction';
 import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
 
 export const COUNT_PAGES_QUERY_KEY = [...PAGES_QUERY_KEY, 'count'] as const;
@@ -12,8 +13,8 @@ export function useCountPages() {
 
   return useQuery({
     queryKey,
-    queryFn: async ({ signal }) => {
-      const result = await apiFetch<{ total: number }>('/api/pages/count', { signal });
+    queryFn: async () => {
+      const result = await withAction(countPagesAction)();
       return result.total;
     },
     staleTime: 30_000,

package/src/modules/plans/hooks/list-plans.hook.ts

@@ -1,7 +1,8 @@
 'use client';
 
 import { useQuery } from '@tanstack/react-query';
-import { apiFetch } from '../../../infra/http/api-fetch';
+import { withAction } from '@greatapps/common';
+import { listPlansAction } from '../actions/list-plans.action';
 import type { Plan } from '../types/plan.type';
 import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
 
@@ -12,7 +13,7 @@ export function usePlans() {
 
   return useQuery<Plan[]>({
     queryKey,
-    queryFn: ({ signal }) => apiFetch<Plan[]>('/api/plans', { signal }),
+    queryFn: withAction(listPlansAction),
     staleTime: Infinity,
     gcTime: Infinity,
     refetchOnWindowFocus: false,

package/src/modules/plans/hooks/use-plan-by-id.hook.ts

@@ -1,8 +1,8 @@
 "use client";
 
 import { useQuery, useQueryClient } from "@tanstack/react-query";
-import { apiFetch } from "../../../infra/http/api-fetch";
-import type { SuccessResult } from "../../../infra/api/types";
+import { withAction } from "../../../utils/withAction";
+import { findPlanByIdAction } from "../actions/find-plan-by-id.action";
 import type { Plan } from "../types/plan.type";
 import { PLANS_QUERY_KEY } from "./list-plans.hook";
 import { useAuthQueryKey } from "../../../hooks/useAuthQueryKey";
@@ -13,8 +13,7 @@ export function usePlanById(idPlan?: number | string | null) {
 
   return useQuery({
     queryKey: [...plansKey, idPlan],
-    queryFn: ({ signal }) =>
-      apiFetch<SuccessResult<Plan>>(`/api/plans/${idPlan}`, { signal }),
+    queryFn: withAction(() => findPlanByIdAction(idPlan!)),
     initialData: () => {
       const queries = queryClient.getQueriesData<Plan[]>({
         queryKey: plansKey,

package/src/modules/projects/hooks/find-project.hook.ts

@@ -1,8 +1,8 @@
 'use client';
 
 import { useQuery } from '@tanstack/react-query';
-import { apiFetch } from '../../../infra/http/api-fetch';
-import type { Project } from '../types';
+import { findProjectAction } from '../actions/find-project.action';
+import { withAction } from '../../../utils/withAction';
 import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
 import { PROJECTS_BASE_KEY } from './list-projects.hook';
 
@@ -11,7 +11,7 @@ export function useProject(projectId: number | null) {
 
   return useQuery({
     queryKey,
-    queryFn: ({ signal }) => apiFetch<Project>(`/api/projects/${projectId}`, { signal }),
+    queryFn: () => withAction(() => findProjectAction(projectId!))(),
     enabled: projectId != null && projectId > 0,
     staleTime: 10_000,
   });

package/src/modules/projects/hooks/list-all-account-users.hook.ts

@@ -1,8 +1,8 @@
 'use client';
 
 import { useInfiniteQuery } from '@tanstack/react-query';
-import { apiFetch } from '../../../infra/http/api-fetch';
-import type { AccountUser, UsersPage } from '../types';
+import { listAllAccountUsersAction } from '../actions/list-all-account-users.action';
+import { withAction } from '../../../utils/withAction';
 import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
 
 const PAGE_SIZE = 20;
@@ -21,16 +21,15 @@ export function useListAllAccountUsers(search: string = '', projectId?: number)
 
   return useInfiniteQuery({
     queryKey,
-    queryFn: ({ pageParam, signal }) =>
-      apiFetch<UsersPage<AccountUser>>('/api/account/users', {
-        params: {
+    queryFn: ({ pageParam }) =>
+      withAction(() =>
+        listAllAccountUsersAction({
           search: search || undefined,
           page: pageParam as number,
           limit: PAGE_SIZE,
           inProject: projectId,
-        },
-        signal,
-      }),
+        })
+      )(),
     getNextPageParam: (lastPage, allPages) => {
       const loaded = allPages.reduce((sum, p) => sum + p.data.length, 0);
       return loaded < lastPage.total ? allPages.length + 1 : undefined;

package/src/modules/projects/hooks/list-available-users.hook.ts

@@ -1,8 +1,8 @@
 'use client';
 
 import { useInfiniteQuery } from '@tanstack/react-query';
-import { apiFetch } from '../../../infra/http/api-fetch';
-import type { AccountUser, UsersPage } from '../types';
+import { listAvailableUsersAction } from '../actions/list-available-users.action';
+import { withAction } from '../../../utils/withAction';
 import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
 
 const PAGE_SIZE = 20;
@@ -20,15 +20,14 @@ export function useListAvailableUsers(projectId: number, search: string = '') {
 
   return useInfiniteQuery({
     queryKey,
-    queryFn: ({ pageParam, signal }) =>
-      apiFetch<UsersPage<AccountUser>>(`/api/projects/${projectId}/available-users`, {
-        params: {
+    queryFn: ({ pageParam }) =>
+      withAction(() =>
+        listAvailableUsersAction(projectId, {
           search: search || undefined,
           page: pageParam as number,
           limit: PAGE_SIZE,
-        },
-        signal,
-      }),
+        })
+      )(),
     getNextPageParam: (lastPage, allPages) => {
       const loaded = allPages.reduce((sum, p) => sum + p.data.length, 0);
       return loaded < lastPage.total ? allPages.length + 1 : undefined;

package/src/modules/projects/hooks/list-infinite-projects.hook.ts

@@ -1,9 +1,9 @@
 "use client";
 
 import { useInfiniteQuery } from "@tanstack/react-query";
-import { apiFetch } from "../../../infra/http/api-fetch";
+import { listProjectsAction } from "../actions/list-projects.action";
 import type { ListProjectsActionParams } from "../actions/list-projects.action";
-import type { ProjectsPage } from "../types";
+import { withAction } from "../../../utils/withAction";
 import { useAuthQueryKey } from "../../../hooks/useAuthQueryKey";
 import { PROJECTS_BASE_KEY } from "./list-projects.hook";
 
@@ -21,15 +21,14 @@ export function useInfiniteProjects({
 
   return useInfiniteQuery({
     queryKey,
-    queryFn: ({ pageParam, signal }) =>
-      apiFetch<ProjectsPage>('/api/projects', {
-        params: {
+    queryFn: ({ pageParam }) =>
+      withAction(() =>
+        listProjectsAction({
           ...params,
           page: pageParam as number,
           limit,
-        },
-        signal,
-      }),
+        }),
+      )(),
     initialPageParam: 1,
     getNextPageParam: (lastPage, allPages) => {
       const loaded = allPages.reduce((sum, p) => sum + p.data.length, 0);