@carlonicora/nextjs-jsonapi 5.6.0 → 5.7.0

package/src/features/billing/stripe-coupon/data/stripe-coupon.ts

@@ -124,10 +124,12 @@ export class StripeCoupon extends AbstractApiData implements StripeCouponInterfa
 
     const attributes = response.data.attributes;
     if (data.stripeCouponId) attributes.stripeCouponId = data.stripeCouponId;
-    if (data.percentOff !== undefined) attributes.percentOff = data.percentOff;
-    if (data.amountOff !== undefined) attributes.amountOff = data.amountOff;
-    if (data.currency) attributes.currency = data.currency;
-    if (data.durationInMonths !== undefined) attributes.durationInMonths = data.durationInMonths;
+    if (data.discountType === "percent_off") attributes.percentOff = data.percentOff;
+    else {
+      attributes.amountOff = data.amountOff;
+      attributes.currency = data.currency;
+    }
+    if (data.duration === "repeating") attributes.durationInMonths = data.durationInMonths;
     if (data.productIds && data.productIds.length > 0) attributes.productIds = data.productIds;
     if (data.redeemBy !== undefined) attributes.redeemBy = data.redeemBy.toISOString();
     if (data.maxRedemptions !== undefined) attributes.maxRedemptions = data.maxRedemptions;

package/src/features/billing/stripe-coupon/hooks/useStripeCouponCodeTableStructure.tsx

@@ -2,7 +2,7 @@
 
 import { ColumnDef } from "@tanstack/react-table";
 import { useTranslations } from "next-intl";
-import { useMemo } from "react";
+import { useMemo, useState } from "react";
 import { Badge } from "../../../../shadcnui";
 import { registerTableGenerator, TableContent, UseTableStructureHook } from "../../../../hooks";
 import { formatDate, useBillingFormatOptions } from "../../components/utils";
@@ -20,8 +20,12 @@ export type CouponCodeStatus = "active" | "inactive" | "expired" | "used_up";
  * they win over a plain inactive flag. Places follow the same rule as the
  * backend: the smaller of the code's and the coupon's remaining limits.
  */
-export function couponCodeStatus(code: StripeCouponCodeInterface, coupon?: StripeCouponInterface): CouponCodeStatus {
-  if (code.expiresAt && code.expiresAt.getTime() <= Date.now()) return "expired";
+export function couponCodeStatus(
+  code: StripeCouponCodeInterface,
+  coupon: StripeCouponInterface | undefined,
+  now: Date,
+): CouponCodeStatus {
+  if (code.expiresAt && code.expiresAt.getTime() <= now.getTime()) return "expired";
   const left = couponPlacesLeft(code, coupon ?? { maxRedemptions: undefined, timesRedeemed: 0 });
   if (left === 0) return "used_up";
   return code.active ? "active" : "inactive";
@@ -43,6 +47,9 @@ export const useStripeCouponCodeTableStructure: UseTableStructureHook<
   // The codes list is mounted on the coupon's own page, so the coupon whose
   // limits share the places is the context's, not whatever the code includes.
   const { coupon } = useCouponContext();
+  // Read once on mount: render stays pure, and "expired" is judged against the
+  // moment the list was opened.
+  const [now] = useState(() => new Date());
 
   const tableData = useMemo(() => {
     return params.data.map((code: StripeCouponCodeInterface) => {
@@ -61,7 +68,7 @@ export const useStripeCouponCodeTableStructure: UseTableStructureHook<
       header: t("billing.admin.coupons.fields.code"),
       cell: ({ row }: { row: TableContent<StripeCouponCodeInterface> }) => {
         const code: StripeCouponCodeInterface = row.original.jsonApiData;
-        return <span className="text-xs font-medium">{code.code}</span>;
+        return <span className="text-xs">{code.code}</span>;
       },
       enableSorting: false,
       enableHiding: false,
@@ -123,7 +130,7 @@ export const useStripeCouponCodeTableStructure: UseTableStructureHook<
       header: t("billing.admin.coupons.fields.status"),
       cell: ({ row }: { row: TableContent<StripeCouponCodeInterface> }) => {
         const code: StripeCouponCodeInterface = row.original.jsonApiData;
-        const status = couponCodeStatus(code, code.coupon ?? coupon);
+        const status = couponCodeStatus(code, code.coupon ?? coupon, now);
         return <Badge variant={STATUS_VARIANT[status]}>{t(`billing.admin.coupons.codes.status.${status}`)}</Badge>;
       },
       enableSorting: false,
@@ -135,7 +142,7 @@ export const useStripeCouponCodeTableStructure: UseTableStructureHook<
       header: "",
       cell: ({ row }: { row: TableContent<StripeCouponCodeInterface> }) => {
         const code: StripeCouponCodeInterface = row.original.jsonApiData;
-        return <CouponCodeActions code={code} status={couponCodeStatus(code, code.coupon ?? coupon)} />;
+        return <CouponCodeActions code={code} status={couponCodeStatus(code, code.coupon ?? coupon, now)} />;
       },
       enableSorting: false,
       enableHiding: false,
@@ -146,7 +153,7 @@ export const useStripeCouponCodeTableStructure: UseTableStructureHook<
     return params.fields.map((field) => fieldColumnMap[field]?.()).filter((col) => col !== undefined) as ColumnDef<
       TableContent<StripeCouponCodeInterface>
     >[];
-  }, [params.fields, fieldColumnMap, t, coupon]);
+  }, [params.fields, fieldColumnMap, t, coupon, now]);
 
   return useMemo(() => ({ data: tableData, columns: columns }), [tableData, columns]);
 };

package/src/features/billing/stripe-coupon/hooks/useStripeCouponTableStructure.tsx

@@ -4,10 +4,10 @@ import { ColumnDef } from "@tanstack/react-table";
 import { useTranslations } from "next-intl";
 import { useMemo } from "react";
 import { Badge, Link } from "../../../../shadcnui";
-import { Modules } from "../../../../core";
 import { registerTableGenerator, TableContent, usePageUrlGenerator, UseTableStructureHook } from "../../../../hooks";
 import { useBillingFormatOptions } from "../../components/utils";
 import { StripeCouponFields } from "../data/stripe-coupon.fields";
+import { STRIPE_COUPON_DETAIL_PAGE_URL } from "../stripe-coupon.module";
 import { StripeCouponInterface } from "../data/stripe-coupon.interface";
 import { formatCouponDiscount } from "../utils/format-coupon-discount";
 
@@ -35,7 +35,7 @@ export const useStripeCouponTableStructure: UseTableStructureHook<StripeCouponIn
       header: t("billing.admin.coupons.fields.name"),
       cell: ({ row }: { row: TableContent<StripeCouponInterface> }) => {
         const coupon: StripeCouponInterface = row.original.jsonApiData;
-        return <Link href={generateUrl({ page: Modules.StripeCoupon, id: coupon.id })}>{coupon.name}</Link>;
+        return <Link href={generateUrl({ page: STRIPE_COUPON_DETAIL_PAGE_URL, id: coupon.id })}>{coupon.name}</Link>;
       },
       enableSorting: false,
       enableHiding: false,

package/src/features/billing/stripe-coupon/stripe-coupon-code.module.ts

@@ -7,8 +7,9 @@ export const STRIPE_COUPON_CODE_AUTOMATIC_SEGMENT = "automatic";
 export const StripeCouponCodeModule = (factory: ModuleFactory) =>
   factory({
     name: "stripe-coupon-codes",
-    // Codes are managed on their coupon's page.
-    pageUrl: "/administration/coupons",
+    // Codes are listed on the products page (Codes tab), same value as
+    // StripeProductModule. A code has no page of its own.
+    pageUrl: "/administration/products",
     model: StripeCouponCode,
     moduleId: "85feb4c7-ff22-416a-b856-8dafcf28ff26",
   });

package/src/features/billing/stripe-coupon/stripe-coupon.module.ts

@@ -5,13 +5,20 @@ import { StripeCoupon } from "./data/stripe-coupon";
 /** The coupon endpoint's non-resource segment that re-reads its counts from Stripe. */
 export const STRIPE_COUPON_REFRESH_SEGMENT = "refresh";
 
+/**
+ * Route of a coupon's own page (`/administration/coupons/<id>`). It is not the
+ * module's pageUrl: there is no coupons list route, the list is the Codes tab of
+ * the products page. Links to one coupon build on this instead.
+ */
+export const STRIPE_COUPON_DETAIL_PAGE_URL = "/administration/coupons";
+
 export const StripeCouponModule = (factory: ModuleFactory) =>
   factory({
     name: "stripe-coupons",
-    // The administration route this entity is served at. `name` above stays the
-    // API endpoint; this drives generateUrl / rewriteUrl / EditorSheet
-    // navigation, so it must match the real Next.js route.
-    pageUrl: "/administration/coupons",
+    // The coupons list lives on the products page (Codes tab), so the module
+    // points there, same value as StripeProductModule. Links to a single coupon
+    // use STRIPE_COUPON_DETAIL_PAGE_URL.
+    pageUrl: "/administration/products",
     model: StripeCoupon,
     moduleId: "50bdb0d2-539c-4358-b609-d6beab248bdb",
     icon: TicketPercentIcon,

package/src/features/billing/stripe-promotion-code/components/PromoCodeInput.tsx

@@ -118,7 +118,7 @@ export function PromoCodeInput({
           <p className="text-success text-sm">{formatDuration(appliedCode)}</p>
         </div>
         <div className="space-y-2">
-          <p className="text-muted-foreground text-sm">{t("billing.ui.promo_code.use_different")}</p>
+          <p className="text-muted-foreground text-xs/relaxed">{t("billing.ui.promo_code.use_different")}</p>
           {codeInput}
         </div>
       </div>

package/src/features/billing/stripe-subscription/hooks/wizard-promotion.ts

@@ -19,8 +19,14 @@ export function shouldLookUpAutomatic(code: PromotionCodeValidationResult | null
   return !code || code.automatic === true;
 }
 
-function errorStatus(error: any): number | undefined {
-  return error?.status ?? error?.response?.status;
+/** `value[key]` when `value` is an object, else undefined. */
+function read(value: unknown, key: string): unknown {
+  return typeof value === "object" && value !== null ? Reflect.get(value, key) : undefined;
+}
+
+function errorStatus(error: unknown): number | undefined {
+  const status = read(error, "status") ?? read(read(error, "response"), "status");
+  return typeof status === "number" ? status : undefined;
 }
 
 /**
@@ -29,10 +35,11 @@ function errorStatus(error: any): number | undefined {
  * attaches to the thrown error as `body`:
  * `{ message, errors: [{ status, code, title, detail, meta: { context: { code } } }] }`.
  */
-function errorCode(error: any): string | undefined {
-  const body = error?.body;
-  const first = body?.errors?.[0];
-  const code = first?.code ?? first?.meta?.context?.code ?? body?.code;
+function errorCode(error: unknown): string | undefined {
+  const body = read(error, "body");
+  const errors = read(body, "errors");
+  const first = Array.isArray(errors) ? errors[0] : undefined;
+  const code = read(first, "code") ?? read(read(read(first, "meta"), "context"), "code") ?? read(body, "code");
   return typeof code === "string" ? code : undefined;
 }
 
@@ -40,7 +47,7 @@ function errorCode(error: any): string | undefined {
  * True when the API refused the payment because the automatic discount has no
  * places left (HTTP 410, code `discount_sold_out`). Nothing was charged.
  */
-export function isDiscountSoldOut(error: any): boolean {
+export function isDiscountSoldOut(error: unknown): boolean {
   return errorStatus(error) === 410 && errorCode(error) === "discount_sold_out";
 }
 
@@ -49,6 +56,6 @@ export function isDiscountSoldOut(error: any): boolean {
  * showed is no longer valid (HTTP 422, code `discount_unavailable`). Nothing was
  * charged.
  */
-export function isDiscountUnavailable(error: any): boolean {
+export function isDiscountUnavailable(error: unknown): boolean {
   return errorStatus(error) === 422 && errorCode(error) === "discount_unavailable";
 }