@greatapps/common 1.1.441 → 1.1.442

package/dist/modules/plans/actions/list-plans.action.mjs

@@ -1,6 +1,5 @@
 "use server";
 import { plansService, safeServerAction } from "@greatapps/common/server";
-import { mapApiPlanToUiPlan } from "../utils/map-api-plan-to-ui";
 async function listPlansAction() {
   return safeServerAction(async () => {
     const { data: apiPlans } = await plansService.listPlans({
@@ -9,15 +8,7 @@ async function listPlansAction() {
       sort: "id:ASC"
     });
     if (!apiPlans?.length) return [];
-    const sorted = [...apiPlans].sort((a, b) => a.value - b.value);
-    return sorted.map((plan) => {
-      const popular = plan.id === 2 || plan.id_plan === 2;
-      return mapApiPlanToUiPlan(plan, {
-        planId: plan.id_plan ?? plan.id,
-        isPopular: popular,
-        buttonVariant: popular ? "brand" : void 0
-      });
-    });
+    return [...apiPlans].sort((a, b) => a.value - b.value);
   });
 }
 export {

package/dist/modules/plans/actions/list-plans.action.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/modules/plans/actions/list-plans.action.ts"],"sourcesContent":["'use server';\n\nimport { plansService, safeServerAction } from '@greatapps/common/server';\nimport type { UiPlan } from '../types/plan.type';\nimport { mapApiPlanToUiPlan } from '../utils/map-api-plan-to-ui';\n\nexport async function listPlansAction() {\n  return safeServerAction(async () => {\n    const { data: apiPlans } = await plansService.listPlans({\n      active: true,\n      search: 'client',\n      sort: 'id:ASC',\n    });\n\n    if (!apiPlans?.length) return [] as UiPlan[];\n\n    const sorted = [...apiPlans].sort((a, b) => a.value - b.value);\n\n    return sorted.map((plan) => {\n      const popular = plan.id === 2 || plan.id_plan === 2;\n      return mapApiPlanToUiPlan(plan, {\n        planId: plan.id_plan ?? plan.id,\n        isPopular: popular,\n        buttonVariant: popular ? 'brand' : undefined,\n      });\n    });\n  });\n}\n"],"mappings":";AAEA,SAAS,cAAc,wBAAwB;AAE/C,SAAS,0BAA0B;AAEnC,eAAsB,kBAAkB;AACtC,SAAO,iBAAiB,YAAY;AAClC,UAAM,EAAE,MAAM,SAAS,IAAI,MAAM,aAAa,UAAU;AAAA,MACtD,QAAQ;AAAA,MACR,QAAQ;AAAA,MACR,MAAM;AAAA,IACR,CAAC;AAED,QAAI,CAAC,UAAU,OAAQ,QAAO,CAAC;AAE/B,UAAM,SAAS,CAAC,GAAG,QAAQ,EAAE,KAAK,CAAC,GAAG,MAAM,EAAE,QAAQ,EAAE,KAAK;AAE7D,WAAO,OAAO,IAAI,CAAC,SAAS;AAC1B,YAAM,UAAU,KAAK,OAAO,KAAK,KAAK,YAAY;AAClD,aAAO,mBAAmB,MAAM;AAAA,QAC9B,QAAQ,KAAK,WAAW,KAAK;AAAA,QAC7B,WAAW;AAAA,QACX,eAAe,UAAU,UAAU;AAAA,MACrC,CAAC;AAAA,IACH,CAAC;AAAA,EACH,CAAC;AACH;","names":[]}
+{"version":3,"sources":["../../../../src/modules/plans/actions/list-plans.action.ts"],"sourcesContent":["'use server';\n\nimport { plansService, safeServerAction } from '@greatapps/common/server';\n\nexport async function listPlansAction() {\n  return safeServerAction(async () => {\n    const { data: apiPlans } = await plansService.listPlans({\n      active: true,\n      search: 'client',\n      sort: 'id:ASC',\n    });\n\n    if (!apiPlans?.length) return [];\n\n    return [...apiPlans].sort((a, b) => a.value - b.value);\n  });\n}\n"],"mappings":";AAEA,SAAS,cAAc,wBAAwB;AAE/C,eAAsB,kBAAkB;AACtC,SAAO,iBAAiB,YAAY;AAClC,UAAM,EAAE,MAAM,SAAS,IAAI,MAAM,aAAa,UAAU;AAAA,MACtD,QAAQ;AAAA,MACR,QAAQ;AAAA,MACR,MAAM;AAAA,IACR,CAAC;AAED,QAAI,CAAC,UAAU,OAAQ,QAAO,CAAC;AAE/B,WAAO,CAAC,GAAG,QAAQ,EAAE,KAAK,CAAC,GAAG,MAAM,EAAE,QAAQ,EAAE,KAAK;AAAA,EACvD,CAAC;AACH;","names":[]}

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/modules/plans/hooks/list-plans.hook.ts"],"sourcesContent":["'use client';\n\nimport { useQuery } from '@tanstack/react-query';\nimport { withAction } from '@greatapps/common';\nimport { listPlansAction } from '../actions/list-plans.action';\nimport type { UiPlan } from '../types/plan.type';\n\nexport const PLANS_QUERY_KEY = ['plans'];\n\nexport function usePlans() {\n  return useQuery<UiPlan[]>({\n    queryKey: [...PLANS_QUERY_KEY],\n    queryFn: withAction(listPlansAction),\n    staleTime: Infinity,\n    gcTime: Infinity,\n    refetchOnWindowFocus: false,\n    refetchOnReconnect: false,\n    refetchOnMount: false,\n    retry: 1,\n  });\n}\n"],"mappings":";AAEA,SAAS,gBAAgB;AACzB,SAAS,kBAAkB;AAC3B,SAAS,uBAAuB;AAGzB,MAAM,kBAAkB,CAAC,OAAO;AAEhC,SAAS,WAAW;AACzB,SAAO,SAAmB;AAAA,IACxB,UAAU,CAAC,GAAG,eAAe;AAAA,IAC7B,SAAS,WAAW,eAAe;AAAA,IACnC,WAAW;AAAA,IACX,QAAQ;AAAA,IACR,sBAAsB;AAAA,IACtB,oBAAoB;AAAA,IACpB,gBAAgB;AAAA,IAChB,OAAO;AAAA,EACT,CAAC;AACH;","names":[]}
+{"version":3,"sources":["../../../../src/modules/plans/hooks/list-plans.hook.ts"],"sourcesContent":["'use client';\n\nimport { useQuery } from '@tanstack/react-query';\nimport { withAction } from '@greatapps/common';\nimport { listPlansAction } from '../actions/list-plans.action';\nimport type { Plan } from '../types/plan.type';\n\nexport const PLANS_QUERY_KEY = ['plans'];\n\nexport function usePlans() {\n  return useQuery<Plan[]>({\n    queryKey: [...PLANS_QUERY_KEY],\n    queryFn: withAction(listPlansAction),\n    staleTime: Infinity,\n    gcTime: Infinity,\n    refetchOnWindowFocus: false,\n    refetchOnReconnect: false,\n    refetchOnMount: false,\n    retry: 1,\n  });\n}\n"],"mappings":";AAEA,SAAS,gBAAgB;AACzB,SAAS,kBAAkB;AAC3B,SAAS,uBAAuB;AAGzB,MAAM,kBAAkB,CAAC,OAAO;AAEhC,SAAS,WAAW;AACzB,SAAO,SAAiB;AAAA,IACtB,UAAU,CAAC,GAAG,eAAe;AAAA,IAC7B,SAAS,WAAW,eAAe;AAAA,IACnC,WAAW;AAAA,IACX,QAAQ;AAAA,IACR,sBAAsB;AAAA,IACtB,oBAAoB;AAAA,IACpB,gBAAgB;AAAA,IAChB,OAAO;AAAA,EACT,CAAC;AACH;","names":[]}

package/dist/modules/plans/hooks/use-plan-by-id.hook.mjs

@@ -13,10 +13,13 @@ function usePlanById(idPlan) {
         queryKey: [...PLANS_QUERY_KEY]
       });
       for (const [, data] of queries) {
-        if (!data) continue;
-        const plan = (Array.isArray(data) ? data : data.data)?.find((p) => p.idPlan === idPlan);
+        if (!data || !Array.isArray(data)) continue;
+        const numericId = Number(idPlan);
+        const plan = data.find(
+          (p) => p.id === numericId || p.id_plan === numericId
+        );
         if (plan) {
-          return plan;
+          return { success: true, data: plan };
         }
       }
       return void 0;

package/dist/modules/plans/hooks/use-plan-by-id.hook.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/modules/plans/hooks/use-plan-by-id.hook.ts"],"sourcesContent":["\"use client\";\n\nimport { useQuery, useQueryClient } from \"@tanstack/react-query\";\nimport { withAction } from \"../../../utils/withAction\";\nimport { findPlanByIdAction } from \"../actions/find-plan-by-id.action\";\nimport { Plan } from \"../types/plan.type\";\nimport { PLANS_QUERY_KEY } from \"./list-plans.hook\";\nimport { PaginatedSuccessResult } from \"../../../infra/api/types\";\n\nexport function usePlanById(idPlan: number | string | undefined) {\n  const queryClient = useQueryClient();\n  \n  return useQuery({\n    queryKey: [...PLANS_QUERY_KEY, idPlan],\n    queryFn: withAction(() => findPlanByIdAction(idPlan!)),\n    initialData: () => {\n      const queries = queryClient.getQueriesData<PaginatedSuccessResult<Plan>>({\n        queryKey: [...PLANS_QUERY_KEY],\n      });\n\n      for (const [, data] of queries) {\n        if (!data) continue;\n        const plan = (Array.isArray(data) ? data : data.data)?.find((p) => p.idPlan === idPlan);\n        if (plan) {\n          return plan;\n        }\n      }\n\n      return undefined;\n    },\n    initialDataUpdatedAt: 0,\n    enabled: !!idPlan,\n  });\n}\n"],"mappings":";AAEA,SAAS,UAAU,sBAAsB;AACzC,SAAS,kBAAkB;AAC3B,SAAS,0BAA0B;AAEnC,SAAS,uBAAuB;AAGzB,SAAS,YAAY,QAAqC;AAC/D,QAAM,cAAc,eAAe;AAEnC,SAAO,SAAS;AAAA,IACd,UAAU,CAAC,GAAG,iBAAiB,MAAM;AAAA,IACrC,SAAS,WAAW,MAAM,mBAAmB,MAAO,CAAC;AAAA,IACrD,aAAa,MAAM;AACjB,YAAM,UAAU,YAAY,eAA6C;AAAA,QACvE,UAAU,CAAC,GAAG,eAAe;AAAA,MAC/B,CAAC;AAED,iBAAW,CAAC,EAAE,IAAI,KAAK,SAAS;AAC9B,YAAI,CAAC,KAAM;AACX,cAAM,QAAQ,MAAM,QAAQ,IAAI,IAAI,OAAO,KAAK,OAAO,KAAK,CAAC,MAAM,EAAE,WAAW,MAAM;AACtF,YAAI,MAAM;AACR,iBAAO;AAAA,QACT;AAAA,MACF;AAEA,aAAO;AAAA,IACT;AAAA,IACA,sBAAsB;AAAA,IACtB,SAAS,CAAC,CAAC;AAAA,EACb,CAAC;AACH;","names":[]}
+{"version":3,"sources":["../../../../src/modules/plans/hooks/use-plan-by-id.hook.ts"],"sourcesContent":["\"use client\";\n\nimport { useQuery, useQueryClient } from \"@tanstack/react-query\";\nimport { withAction } from \"../../../utils/withAction\";\nimport { findPlanByIdAction } from \"../actions/find-plan-by-id.action\";\nimport type { Plan } from \"../types/plan.type\";\nimport { PLANS_QUERY_KEY } from \"./list-plans.hook\";\n\nexport function usePlanById(idPlan: number | string | undefined) {\n  const queryClient = useQueryClient();\n\n  return useQuery({\n    queryKey: [...PLANS_QUERY_KEY, idPlan],\n    queryFn: withAction(() => findPlanByIdAction(idPlan!)),\n    initialData: () => {\n      const queries = queryClient.getQueriesData<Plan[]>({\n        queryKey: [...PLANS_QUERY_KEY],\n      });\n\n      for (const [, data] of queries) {\n        if (!data || !Array.isArray(data)) continue;\n        const numericId = Number(idPlan);\n        const plan = data.find(\n          (p) => p.id === numericId || p.id_plan === numericId\n        );\n        if (plan) {\n          return { success: true as const, data: plan };\n        }\n      }\n\n      return undefined;\n    },\n    initialDataUpdatedAt: 0,\n    enabled: !!idPlan,\n  });\n}\n"],"mappings":";AAEA,SAAS,UAAU,sBAAsB;AACzC,SAAS,kBAAkB;AAC3B,SAAS,0BAA0B;AAEnC,SAAS,uBAAuB;AAEzB,SAAS,YAAY,QAAqC;AAC/D,QAAM,cAAc,eAAe;AAEnC,SAAO,SAAS;AAAA,IACd,UAAU,CAAC,GAAG,iBAAiB,MAAM;AAAA,IACrC,SAAS,WAAW,MAAM,mBAAmB,MAAO,CAAC;AAAA,IACrD,aAAa,MAAM;AACjB,YAAM,UAAU,YAAY,eAAuB;AAAA,QACjD,UAAU,CAAC,GAAG,eAAe;AAAA,MAC/B,CAAC;AAED,iBAAW,CAAC,EAAE,IAAI,KAAK,SAAS;AAC9B,YAAI,CAAC,QAAQ,CAAC,MAAM,QAAQ,IAAI,EAAG;AACnC,cAAM,YAAY,OAAO,MAAM;AAC/B,cAAM,OAAO,KAAK;AAAA,UAChB,CAAC,MAAM,EAAE,OAAO,aAAa,EAAE,YAAY;AAAA,QAC7C;AACA,YAAI,MAAM;AACR,iBAAO,EAAE,SAAS,MAAe,MAAM,KAAK;AAAA,QAC9C;AAAA,MACF;AAEA,aAAO;AAAA,IACT;AAAA,IACA,sBAAsB;AAAA,IACtB,SAAS,CAAC,CAAC;AAAA,EACb,CAAC;AACH;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@greatapps/common",
-  "version": "1.1.441",
+  "version": "1.1.442",
   "description": "Shared library for GreatApps frontend applications",
   "main": "./dist/index.mjs",
   "types": "./src/index.ts",

package/src/modules/plans/actions/list-plans.action.ts

@@ -1,8 +1,6 @@
 'use server';
 
 import { plansService, safeServerAction } from '@greatapps/common/server';
-import type { UiPlan } from '../types/plan.type';
-import { mapApiPlanToUiPlan } from '../utils/map-api-plan-to-ui';
 
 export async function listPlansAction() {
   return safeServerAction(async () => {
@@ -12,17 +10,8 @@ export async function listPlansAction() {
       sort: 'id:ASC',
     });
 
-    if (!apiPlans?.length) return [] as UiPlan[];
+    if (!apiPlans?.length) return [];
 
-    const sorted = [...apiPlans].sort((a, b) => a.value - b.value);
-
-    return sorted.map((plan) => {
-      const popular = plan.id === 2 || plan.id_plan === 2;
-      return mapApiPlanToUiPlan(plan, {
-        planId: plan.id_plan ?? plan.id,
-        isPopular: popular,
-        buttonVariant: popular ? 'brand' : undefined,
-      });
-    });
+    return [...apiPlans].sort((a, b) => a.value - b.value);
   });
 }

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

@@ -3,12 +3,12 @@
 import { useQuery } from '@tanstack/react-query';
 import { withAction } from '@greatapps/common';
 import { listPlansAction } from '../actions/list-plans.action';
-import type { UiPlan } from '../types/plan.type';
+import type { Plan } from '../types/plan.type';
 
 export const PLANS_QUERY_KEY = ['plans'];
 
 export function usePlans() {
-  return useQuery<UiPlan[]>({
+  return useQuery<Plan[]>({
     queryKey: [...PLANS_QUERY_KEY],
     queryFn: withAction(listPlansAction),
     staleTime: Infinity,

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

@@ -3,26 +3,28 @@
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { withAction } from "../../../utils/withAction";
 import { findPlanByIdAction } from "../actions/find-plan-by-id.action";
-import { Plan } from "../types/plan.type";
+import type { Plan } from "../types/plan.type";
 import { PLANS_QUERY_KEY } from "./list-plans.hook";
-import { PaginatedSuccessResult } from "../../../infra/api/types";
 
 export function usePlanById(idPlan: number | string | undefined) {
   const queryClient = useQueryClient();
-  
+
   return useQuery({
     queryKey: [...PLANS_QUERY_KEY, idPlan],
     queryFn: withAction(() => findPlanByIdAction(idPlan!)),
     initialData: () => {
-      const queries = queryClient.getQueriesData<PaginatedSuccessResult<Plan>>({
+      const queries = queryClient.getQueriesData<Plan[]>({
         queryKey: [...PLANS_QUERY_KEY],
       });
 
       for (const [, data] of queries) {
-        if (!data) continue;
-        const plan = (Array.isArray(data) ? data : data.data)?.find((p) => p.idPlan === idPlan);
+        if (!data || !Array.isArray(data)) continue;
+        const numericId = Number(idPlan);
+        const plan = data.find(
+          (p) => p.id === numericId || p.id_plan === numericId
+        );
         if (plan) {
-          return plan;
+          return { success: true as const, data: plan };
         }
       }