@greatapps/common 1.1.412 → 1.1.414

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

@@ -1,15 +1,17 @@
 "use client";
 import { useQuery } from "@tanstack/react-query";
 import { listSubscriptionsAction } from "../actions/list-subscriptions.action";
+import { parseResult } from "../../../infra/utils/parser";
+import { SubscriptionSchema } from "../types/subscription.type";
 import { SUBSCRIPTIONS_QUERY_KEY } from "../constants/query-keys.constants";
 import { withAction } from "../../../utils/withAction";
 function useActiveSubscription() {
   return useQuery({
     queryKey: [...SUBSCRIPTIONS_QUERY_KEY, "active"],
-    queryFn: async () => {
-      const result = await withAction(listSubscriptionsAction)({ limit: 1 });
-      return result?.data?.[0];
-    }
+    queryFn: async () => parseResult(
+      SubscriptionSchema,
+      await withAction(() => listSubscriptionsAction({ active: true }))()
+    )
   });
 }
 export {

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 { listSubscriptionsAction } from \"../actions/list-subscriptions.action\";\nimport { SUBSCRIPTIONS_QUERY_KEY } from \"../constants/query-keys.constants\";\nimport { withAction } from \"../../../utils/withAction\";\n\nexport function useActiveSubscription() {\n  return useQuery({\n    queryKey: [...SUBSCRIPTIONS_QUERY_KEY, \"active\"],\n    queryFn: async () => {\n      const result = await withAction(listSubscriptionsAction)({ limit: 1 });\n      return result?.data?.[0];\n    },\n  });\n}\n"],"mappings":";AAEA,SAAS,gBAAgB;AACzB,SAAS,+BAA+B;AACxC,SAAS,+BAA+B;AACxC,SAAS,kBAAkB;AAEpB,SAAS,wBAAwB;AACtC,SAAO,SAAS;AAAA,IACd,UAAU,CAAC,GAAG,yBAAyB,QAAQ;AAAA,IAC/C,SAAS,YAAY;AACnB,YAAM,SAAS,MAAM,WAAW,uBAAuB,EAAE,EAAE,OAAO,EAAE,CAAC;AACrE,aAAO,QAAQ,OAAO,CAAC;AAAA,IACzB;AAAA,EACF,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 { parseResult } from '../../../infra/utils/parser';\nimport { SubscriptionSchema } from '../types/subscription.type';\nimport { SUBSCRIPTIONS_QUERY_KEY } from '../constants/query-keys.constants';\nimport { withAction } from '../../../utils/withAction';\n\nexport function useActiveSubscription() {\n  return useQuery({\n    queryKey: [...SUBSCRIPTIONS_QUERY_KEY, 'active'],\n    queryFn: async () =>\n      parseResult(\n        SubscriptionSchema,\n        await withAction(() => listSubscriptionsAction({ active: true }))()\n      ),\n  });\n}\n"],"mappings":";AAEA,SAAS,gBAAgB;AACzB,SAAS,+BAA+B;AACxC,SAAS,mBAAmB;AAC5B,SAAS,0BAA0B;AACnC,SAAS,+BAA+B;AACxC,SAAS,kBAAkB;AAEpB,SAAS,wBAAwB;AACtC,SAAO,SAAS;AAAA,IACd,UAAU,CAAC,GAAG,yBAAyB,QAAQ;AAAA,IAC/C,SAAS,YACP;AAAA,MACE;AAAA,MACA,MAAM,WAAW,MAAM,wBAAwB,EAAE,QAAQ,KAAK,CAAC,CAAC,EAAE;AAAA,IACpE;AAAA,EACJ,CAAC;AACH;","names":[]}

package/dist/modules/subscriptions/types/subscription.type.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/modules/subscriptions/types/subscription.type.ts"],"sourcesContent":["import z from 'zod';\r\n\r\nexport const SubscriptionItemSchema = z.object({\r\n  id: z.union([z.number(), z.string()]),\r\n  deleted: z.number(),\r\n  datetime_alt: z.coerce.date().nullable().optional(),\r\n  datetime_del: z.coerce.date().nullable().optional(),\r\n  datetime_add: z.coerce.date(),\r\n  id_wl: z.number(),\r\n  id_subscription: z.union([z.number(), z.string()]),\r\n  id_addon: z.number().nullable(),\r\n  addon_name: z.string().optional(),\r\n  value: z.number(),\r\n  currency: z.string(),\r\n  quantity: z.number(),\r\n  payment_status: z.number(),\r\n  id_charge: z.union([z.number(), z.string()]).nullable(),\r\n  trial: z.boolean(),\r\n  trial_ends_at: z.coerce.date().nullable().optional(),\r\n});\r\n\r\nexport type SubscriptionItem = z.infer<typeof SubscriptionItemSchema>;\r\n\r\nexport const SubscriptionSchema = z.object({\r\n  id: z.union([z.number(), z.string()]),\r\n  deleted: z.number(),\r\n  datetime_alt: z.coerce.date().nullable().optional(),\r\n  datetime_del: z.coerce.date().nullable().optional(),\r\n  datetime_add: z.coerce.date(),\r\n  id_wl: z.number(),\r\n  id_account: z.union([z.number(), z.string()]),\r\n  id_card: z.union([z.number(), z.string()]).nullable(),\r\n  id_coupon: z.union([z.number(), z.string()]).nullable(),\r\n  type: z.string(),\r\n  payment_method: z.number().nullable(),\r\n  periodicity: z.coerce.number().nullable(),\r\n  value: z.number().nullable(),\r\n  id_product: z.number(),\r\n  id_plan: z.number(),\r\n  plan_name: z.string().nullable().optional(),\r\n  id_gateway: z.union([z.number(), z.string()]).nullable(),\r\n  gateway_account: z.string().nullable(),\r\n  date_hiring: z.coerce.date().nullable(),\r\n  date_due: z.coerce.date(),\r\n  date_cancellation: z.coerce.date().nullable(),\r\n  date_verification: z.coerce.date().nullable(),\r\n  cancellation_reason: z.string().nullable(),\r\n  cancellation_description: z.string().nullable(),\r\n  active: z.boolean(),\r\n  charged: z.boolean(),\r\n  datetime_last_update_periodicity: z.coerce.date().nullable().optional(),\r\n  card_name: z.string().nullable().optional(),\r\n  card_brand: z.string().nullable().optional(),\r\n  card_number: z.string().nullable().optional(),\r\n  items: z.array(SubscriptionItemSchema),\r\n});\r\n\r\nexport type Subscription = z.infer<typeof SubscriptionSchema>;\r\n\r\nexport interface FindSubscriptionsParams {\r\n  active?: boolean;\r\n  trial?: boolean;\r\n  date_start?: string;\r\n  date_end?: string;\r\n  date_hiring_start?: string;\r\n  date_hiring_end?: string;\r\n  limit?: number;\r\n}\r\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../../../src/modules/subscriptions/types/subscription.type.ts"],"sourcesContent":["import z from 'zod';\r\n\r\nexport const SubscriptionItemSchema = z.object({\r\n  id: z.union([z.number(), z.string()]),\r\n  deleted: z.number(),\r\n  datetime_alt: z.coerce.date().nullable().optional(),\r\n  datetime_del: z.coerce.date().nullable().optional(),\r\n  datetime_add: z.coerce.date(),\r\n  id_wl: z.number(),\r\n  id_subscription: z.union([z.number(), z.string()]),\r\n  id_addon: z.number().nullable(),\r\n  addon_name: z.string().optional(),\r\n  value: z.number(),\r\n  currency: z.string(),\r\n  quantity: z.number(),\r\n  payment_status: z.number(),\r\n  id_charge: z.union([z.number(), z.string()]).nullable(),\r\n  trial: z.boolean(),\r\n  trial_ends_at: z.coerce.date().nullable().optional(),\r\n});\r\n\r\nexport type SubscriptionItem = z.infer<typeof SubscriptionItemSchema>;\r\n\r\nexport const SubscriptionSchema = z.object({\r\n  id: z.union([z.number(), z.string()]),\r\n  deleted: z.number(),\r\n  datetime_alt: z.coerce.date().nullable().optional(),\r\n  datetime_del: z.coerce.date().nullable().optional(),\r\n  datetime_add: z.coerce.date(),\r\n  id_wl: z.number(),\r\n  id_account: z.union([z.number(), z.string()]),\r\n  id_card: z.union([z.number(), z.string()]).nullable(),\r\n  id_coupon: z.union([z.number(), z.string()]).nullable(),\r\n  type: z.string(),\r\n  payment_method: z.number().nullable(),\r\n  periodicity: z.coerce.number().nullable(),\r\n  value: z.number().nullable(),\r\n  id_product: z.number(),\r\n  id_plan: z.number(),\r\n  plan_name: z.string().nullable().optional(),\r\n  id_gateway: z.union([z.number(), z.string()]).nullable(),\r\n  gateway_account: z.string().nullable(),\r\n  date_hiring: z.coerce.date().nullable(),\r\n  date_due: z.coerce.date(),\r\n  date_cancellation: z.coerce.date().nullable(),\r\n  date_verification: z.coerce.date().nullable(),\r\n  cancellation_reason: z.string().nullable(),\r\n  cancellation_description: z.string().nullable(),\r\n  active: z.boolean(),\r\n  charged: z.boolean(),\r\n  datetime_last_update_periodicity: z.coerce.date().nullable().optional(),\r\n  card_name: z.string().nullable().optional(),\r\n  card_brand: z.string().nullable().optional(),\r\n  card_number: z.string().nullable().optional(),\r\n  items: z.array(SubscriptionItemSchema),\r\n});\r\n\r\nexport type Subscription = z.infer<typeof SubscriptionSchema>;\r\n\r\nexport interface FindSubscriptionsParams {\r\n  active?: boolean;\r\n  trial?: boolean;\r\n  date_start?: string;\r\n  date_end?: string;\r\n  date_hiring_start?: string;\r\n  date_hiring_end?: string;\r\n}\r\n"],"mappings":"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","names":[]}

package/package.json

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

package/src/components/navigation/subcomponents/ProjectSelector.tsx

@@ -56,7 +56,7 @@ export function ProjectSelector({
   // Desktop and md: title + popover (aligned with NavBar logo + separator)
   if (breakpoint === 'desktop' || breakpoint === 'md') {
     return (
-      <div className="mt-[9.5px]">
+      <div className="mt-[7.5px]">
         <div className="flex items-center h-7">
           <ProjectSelectorPopover
             open={isPopoverOpen}

package/src/modules/subscriptions/hooks/find-active-subscription.hook.ts

@@ -9,8 +9,7 @@ export function useActiveSubscription() {
   return useQuery({
     queryKey: [...SUBSCRIPTIONS_QUERY_KEY, "active"],
     queryFn: async () => {
-      const result = await withAction(listSubscriptionsAction)({ limit: 1 });
-      return result?.data?.[0];
+      return await withAction(listSubscriptionsAction)({ limit: 1 });
     },
   });
 }