@carlonicora/nextjs-jsonapi 1.34.0 → 1.36.0

package/src/features/billing/stripe-price/components/forms/PriceEditor.tsx

@@ -38,6 +38,7 @@ type PriceFormValues = {
   usageType?: "licensed" | "metered";
   nickname?: string;
   active: boolean;
+  isTrial: boolean;
   description?: string;
   features: string[];
   token: string;
@@ -75,6 +76,7 @@ export function PriceEditor({ productId, price, open, onOpenChange, onSuccess }:
     usageType: z.enum(["licensed", "metered"]).optional(),
     nickname: z.string().optional(),
     active: z.boolean(),
+    isTrial: z.boolean(),
     description: z.string().optional(),
     features: z.array(z.string()),
     token: z.string(),
@@ -102,6 +104,7 @@ export function PriceEditor({ productId, price, open, onOpenChange, onSuccess }:
       usageType: price?.recurring?.usageType || "licensed",
       nickname: price?.nickname || "",
       active: price?.active ?? true,
+      isTrial: price?.isTrial ?? false,
       description: price?.description || "",
       features: price?.features || [],
       token: price?.token?.toString() ?? "",
@@ -126,6 +129,7 @@ export function PriceEditor({ productId, price, open, onOpenChange, onSuccess }:
         usageType: price?.recurring?.usageType || "licensed",
         nickname: price?.nickname || "",
         active: price?.active ?? true,
+        isTrial: price?.isTrial ?? false,
         description: price?.description || "",
         features: price?.features || [],
         token: price?.token?.toString() ?? "",
@@ -145,15 +149,15 @@ export function PriceEditor({ productId, price, open, onOpenChange, onSuccess }:
       const unitAmountInCents = Math.round(values.unitAmount * 100);
 
       if (isEditMode) {
-        // Update existing price (nickname, description, features, token can be updated - Stripe fields are limited)
+        // Update existing price (nickname, description, features, token, isTrial can be updated - Stripe fields are limited)
         await StripePriceService.updatePrice({
           id: price.id,
           nickname: values.nickname || undefined,
           description: values.description || undefined,
           features: values.features.filter((f) => f.trim()) || undefined,
           token: values.token ? parseInt(values.token, 10) : undefined,
-          // Only include featureIds for recurring prices (one-time prices don't support platform features)
-          ...(price?.priceType === "recurring" ? { featureIds: values.featureIds } : {}),
+          // Only include isTrial and featureIds for recurring prices
+          ...(price?.priceType === "recurring" ? { isTrial: values.isTrial, featureIds: values.featureIds } : {}),
         });
       } else {
         // Create new price
@@ -190,9 +194,12 @@ export function PriceEditor({ productId, price, open, onOpenChange, onSuccess }:
           createInput.token = parseInt(values.token, 10);
         }
 
-        // Add platform feature IDs only for recurring prices (Neo4j only, not sent to Stripe)
-        if (isRecurring && values.featureIds.length > 0) {
-          createInput.featureIds = values.featureIds;
+        // Add isTrial and platform feature IDs only for recurring prices (Neo4j only, not sent to Stripe)
+        if (isRecurring) {
+          createInput.isTrial = values.isTrial;
+          if (values.featureIds.length > 0) {
+            createInput.featureIds = values.featureIds;
+          }
         }
 
         await StripePriceService.createPrice(createInput);
@@ -403,6 +410,15 @@ export function PriceEditor({ productId, price, open, onOpenChange, onSuccess }:
 
             <FormCheckbox form={form} id="active" name="Active" />
 
+            {isRecurring && (
+              <FormCheckbox
+                form={form}
+                id="isTrial"
+                name="Trial Price"
+                description="Mark this as the trial subscription plan (only one price should be marked as trial)"
+              />
+            )}
+
             <CommonEditorButtons isEdit={isEditMode} form={form} disabled={isSubmitting} setOpen={onOpenChange} />
           </form>
         </Form>

package/src/features/billing/stripe-price/data/stripe-price.interface.ts

@@ -21,6 +21,7 @@ export interface StripePriceInterface extends ApiDataInterface {
   get description(): string | undefined;
   get features(): string[] | undefined;
   get token(): number | undefined;
+  get isTrial(): boolean | undefined;
   get priceFeatures(): FeatureInterface[]; // Platform Feature entities linked to this price
 }
 
@@ -49,5 +50,6 @@ export type StripePriceInput = {
   description?: string;
   features?: string[];
   token?: number;
+  isTrial?: boolean;
   featureIds?: string[]; // Feature entity IDs to link (Neo4j only, NOT sent to Stripe)
 };

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

@@ -18,6 +18,7 @@ export class StripePrice extends AbstractApiData implements StripePriceInterface
   private _description?: string;
   private _features?: string[];
   private _token?: number;
+  private _isTrial?: boolean;
   private _priceFeatures: FeatureInterface[] = []; // Platform Feature entities
 
   get stripePriceId(): string {
@@ -80,6 +81,10 @@ export class StripePrice extends AbstractApiData implements StripePriceInterface
     return this._token;
   }
 
+  get isTrial(): boolean | undefined {
+    return this._isTrial;
+  }
+
   get priceFeatures(): FeatureInterface[] {
     return this._priceFeatures;
   }
@@ -120,6 +125,7 @@ export class StripePrice extends AbstractApiData implements StripePriceInterface
       : undefined;
 
     this._token = data.jsonApi.attributes.token;
+    this._isTrial = data.jsonApi.attributes.isTrial;
 
     // Hydrate product relationship
     this._product = this._readIncluded(data, "product", Modules.StripeProduct) as StripeProductInterface;
@@ -169,6 +175,9 @@ export class StripePrice extends AbstractApiData implements StripePriceInterface
     if ("token" in data && data.token !== undefined) {
       response.data.attributes.token = data.token;
     }
+    if ("isTrial" in data && data.isTrial !== undefined) {
+      response.data.attributes.isTrial = data.isTrial;
+    }
 
     // Convert featureIds to JSON:API relationships format
     if (data.featureIds && data.featureIds.length > 0) {

package/src/features/billing/stripe-subscription/components/widgets/ProductPricingList.tsx

@@ -84,6 +84,9 @@ export function ProductPricingList({
           pricesToFilter = pricesToFilter.filter((price) => price.priceType !== "one_time");
         }
 
+        // Filter out trial prices - users shouldn't manually select trial plans
+        pricesToFilter = pricesToFilter.filter((price) => !price.isTrial);
+
         const filteredPrices = getFilteredPrices(pricesToFilter, selectedInterval);
 
         if (filteredPrices.length === 0) {

package/src/features/company/components/forms/CompanyDeleter.tsx

@@ -5,7 +5,7 @@ import { useTranslations } from "next-intl";
 import { useState } from "react";
 import { errorToast } from "../../../../components";
 import { Modules } from "../../../../core";
-import { useI18nRouter } from "../../../../i18n";
+import { usePageUrlGenerator } from "../../../../hooks";
 import { Action } from "../../../../permissions";
 import { getRoleId } from "../../../../roles";
 import {
@@ -19,6 +19,7 @@ import {
   Input,
   Label,
 } from "../../../../shadcnui";
+import { AuthService } from "../../../auth/data";
 import { UserInterface } from "../../../user";
 import { useCurrentUserContext } from "../../../user/contexts";
 import { CompanyInterface } from "../../data";
@@ -28,97 +29,183 @@ type CompanyDeleterProps = {
   company: CompanyInterface;
 };
 
-function CompanyDeleterInternal({ company }: CompanyDeleterProps) {
+type CompanyDeleterInternalProps = CompanyDeleterProps & {
+  isAdministrator: boolean;
+};
+
+function CompanyDeleterInternal({ company, isAdministrator }: CompanyDeleterInternalProps) {
   const t = useTranslations();
-  const router = useI18nRouter();
+  const generateUrl = usePageUrlGenerator();
   const [open, setOpen] = useState<boolean>(false);
+  const [finalWarningOpen, setFinalWarningOpen] = useState<boolean>(false);
   const [isDeleting, setIsDeleting] = useState<boolean>(false);
   const [companyName, setCompanyName] = useState<string>("");
 
-  const handleDelete = async () => {
+  const handleProceedToFinalWarning = () => {
+    console.log("[CompanyDeleter] Proceeding to final warning dialog");
+    console.log("[CompanyDeleter] Company name entered:", companyName);
+    console.log("[CompanyDeleter] Expected company name:", company.name);
+    setOpen(false);
+    setFinalWarningOpen(true);
+  };
+
+  const handleFinalDelete = async () => {
+    console.log("[CompanyDeleter] handleFinalDelete called");
+    console.log("[CompanyDeleter] isAdministrator:", isAdministrator);
+    console.log("[CompanyDeleter] company.id:", company.id);
+    console.log("[CompanyDeleter] company.name:", company.name);
+
     setIsDeleting(true);
     try {
-      await CompanyService.delete({ companyId: company.id });
-      router.push("/");
+      if (isAdministrator) {
+        console.log("[CompanyDeleter] Using Administrator delete endpoint");
+        await CompanyService.delete({ companyId: company.id });
+      } else {
+        console.log("[CompanyDeleter] Using CompanyAdministrator self-delete endpoint");
+        await CompanyService.selfDelete({ companyId: company.id });
+      }
+      console.log("[CompanyDeleter] Delete successful, logging out user");
+      await AuthService.logout();
+      window.location.href = generateUrl({ page: `/` });
     } catch (error) {
+      console.error("[CompanyDeleter] Delete failed with error:", error);
+      console.error("[CompanyDeleter] Error details:", JSON.stringify(error, null, 2));
       errorToast({ title: t(`common.errors.delete`), error: error });
+      setIsDeleting(false);
     }
-    setIsDeleting(false);
+  };
+
+  const handleGoBack = () => {
+    setFinalWarningOpen(false);
+    setCompanyName("");
   };
 
   return (
-    <AlertDialog open={open} onOpenChange={setOpen}>
-      <AlertDialogTrigger>
-        <Button size="sm" variant={"destructive"}>
-          <Trash2Icon className="mr-3 h-3.5 w-3.5" />
-          {t(`ui.buttons.delete`)}
-        </Button>
-      </AlertDialogTrigger>
-      <AlertDialogContent className={`flex max-h-[70vh] max-w-3xl flex-col overflow-y-auto`}>
-        <AlertDialogHeader>
-          <AlertDialogTitle>
-            {t(`common.delete.title`, { type: t(`entities.companies`, { count: 1 }) })}
-          </AlertDialogTitle>
-          <AlertDialogDescription>
-            {t(`common.delete.subtitle`, { type: t(`entities.companies`, { count: 1 }) })}
-          </AlertDialogDescription>
-        </AlertDialogHeader>
-        <div className="text-destructive p-4 text-sm">
-          {t(`common.delete.description`, { type: t(`entities.companies`, { count: 1 }) })}
-        </div>
-        <div className="flex w-full flex-col gap-y-2">
-          <div>{t(`common.delete.confirmation`, { type: t(`entities.companies`, { count: 1 }) })}</div>
-          <div className="flex w-full flex-col">
-            <Label className="flex items-center">
-              {t(`company.fields.name.label`)}
-              <span className="text-destructive ml-2 font-semibold">*</span>
-            </Label>
-            <Input
-              className={`w-full`}
-              placeholder={t(`company.fields.name.placeholder`)}
-              onChange={(e) => setCompanyName(e.target.value)}
-            />
-          </div>
-        </div>
-        <div className="flex justify-end">
+    <>
+      {/* Dialog 1: Company Name Confirmation */}
+      <AlertDialog open={open} onOpenChange={setOpen}>
+        <AlertDialogTrigger>
           <Button
-            className="mr-2"
-            variant={"outline"}
-            type={`button`}
-            onClick={() => setOpen(false)}
-            disabled={isDeleting}
+            render={<div />}
+            nativeButton={false}
+            size="sm"
+            variant="ghost"
+            className="text-muted-foreground hover:text-destructive"
           >
-            {t(`ui.buttons.cancel`)}
+            <Trash2Icon />
           </Button>
-          <Button
-            type="submit"
-            onClick={(e) => {
-              e.preventDefault();
-              handleDelete();
-            }}
-            variant={"destructive"}
-            disabled={company.name !== companyName || isDeleting}
-          >
-            {isDeleting ? (
-              <>
-                {t(`ui.buttons.deleting`)}
-                <LoaderCircleIcon className="animate-spin-slow h-5 w-5" />
-              </>
-            ) : (
-              t(`ui.buttons.delete`)
-            )}
-          </Button>
-        </div>
-      </AlertDialogContent>
-    </AlertDialog>
+        </AlertDialogTrigger>
+        <AlertDialogContent className={`flex max-h-[70vh] max-w-3xl flex-col overflow-y-auto`}>
+          <AlertDialogHeader>
+            <AlertDialogTitle>
+              {t(`common.delete.title`, { type: t(`entities.companies`, { count: 1 }) })}
+            </AlertDialogTitle>
+            <AlertDialogDescription>
+              {t(`common.delete.subtitle`, { type: t(`entities.companies`, { count: 1 }) })}
+            </AlertDialogDescription>
+          </AlertDialogHeader>
+          <div className="text-destructive p-4 text-sm">
+            {t(`common.delete.description`, { type: t(`entities.companies`, { count: 1 }) })}
+          </div>
+          <div className="flex w-full flex-col gap-y-2">
+            <div>{t(`common.delete.confirmation`, { type: t(`entities.companies`, { count: 1 }) })}</div>
+            <div className="flex w-full flex-col">
+              <Label className="flex items-center">
+                {t(`company.fields.name.label`)}
+                <span className="text-destructive ml-2 font-semibold">*</span>
+              </Label>
+              <Input
+                className={`w-full`}
+                placeholder={t(`company.fields.name.placeholder`)}
+                onChange={(e) => setCompanyName(e.target.value)}
+              />
+            </div>
+          </div>
+          <div className="flex justify-end">
+            <Button className="mr-2" variant={"outline"} type={`button`} onClick={() => setOpen(false)}>
+              {t(`ui.buttons.cancel`)}
+            </Button>
+            <Button
+              type="submit"
+              onClick={(e) => {
+                e.preventDefault();
+                handleProceedToFinalWarning();
+              }}
+              variant={"destructive"}
+              disabled={company.name !== companyName}
+            >
+              {t(`ui.buttons.delete`)}
+            </Button>
+          </div>
+        </AlertDialogContent>
+      </AlertDialog>
+
+      {/* Dialog 2: Final Warning */}
+      <AlertDialog open={finalWarningOpen} onOpenChange={setFinalWarningOpen}>
+        <AlertDialogContent className={`flex max-h-[70vh] max-w-3xl flex-col overflow-y-auto`}>
+          <AlertDialogHeader>
+            <AlertDialogTitle>{t(`common.delete.finalWarning.title`)}</AlertDialogTitle>
+            <AlertDialogDescription>{t(`common.delete.finalWarning.subtitle`)}</AlertDialogDescription>
+          </AlertDialogHeader>
+          <div className="bg-destructive/10 border-destructive text-destructive rounded-md border p-4 text-sm">
+            <p className="mb-3 font-semibold">{t(`common.delete.finalWarning.description`)}</p>
+            <ul className="list-disc space-y-1 pl-5">
+              <li>{t(`common.delete.finalWarning.bullet1`)}</li>
+              <li>{t(`common.delete.finalWarning.bullet2`)}</li>
+              <li>{t(`common.delete.finalWarning.bullet3`)}</li>
+              <li>{t(`common.delete.finalWarning.bullet4`)}</li>
+              <li>{t(`common.delete.finalWarning.bullet5`)}</li>
+            </ul>
+          </div>
+          <div className="flex justify-end">
+            <Button className="mr-2" variant={"outline"} type={`button`} onClick={handleGoBack} disabled={isDeleting}>
+              {t(`ui.buttons.go_back`)}
+            </Button>
+            <Button
+              type="submit"
+              onClick={(e) => {
+                e.preventDefault();
+                handleFinalDelete();
+              }}
+              variant={"destructive"}
+              disabled={isDeleting}
+            >
+              {isDeleting ? (
+                <>
+                  {t(`ui.buttons.deleting`)}
+                  <LoaderCircleIcon className="animate-spin-slow h-5 w-5" />
+                </>
+              ) : (
+                t(`ui.buttons.delete_forever`)
+              )}
+            </Button>
+          </div>
+        </AlertDialogContent>
+      </AlertDialog>
+    </>
   );
 }
 
 export function CompanyDeleter({ company }: CompanyDeleterProps) {
   const { hasPermissionToModule, hasRole } = useCurrentUserContext<UserInterface>();
 
-  if (!hasRole(getRoleId().Administrator) && !hasPermissionToModule({ module: Modules.Company, action: Action.Delete }))
+  const isAdministrator = hasRole(getRoleId().Administrator);
+  const isCompanyAdministrator = hasRole(getRoleId().CompanyAdministrator);
+  const hasDeletePermission = hasPermissionToModule({ module: Modules.Company, action: Action.Delete });
+
+  console.log("[CompanyDeleter] Role check:", {
+    isAdministrator,
+    isCompanyAdministrator,
+    hasDeletePermission,
+    companyId: company.id,
+    companyName: company.name,
+  });
+
+  if (!isAdministrator && !isCompanyAdministrator && !hasDeletePermission) {
+    console.log("[CompanyDeleter] Access denied - no delete permissions");
     return null;
+  }
 
-  return <CompanyDeleterInternal company={company} />;
+  console.log("[CompanyDeleter] Access granted, rendering with isAdministrator:", isAdministrator);
+  return <CompanyDeleterInternal company={company} isAdministrator={isAdministrator} />;
 }

package/src/features/company/contexts/CompanyContext.tsx

@@ -62,7 +62,7 @@ export const CompanyProvider = ({ children, dehydratedCompany }: CompanyProvider
 
     if (
       company &&
-      hasRole(getRoleId().Administrator) &&
+      (hasRole(getRoleId().Administrator) || hasRole(getRoleId().CompanyAdministrator)) &&
       hasPermissionToModule({ module: Modules.Company, action: Action.Delete })
     )
       functions.push(<CompanyDeleter key="companyDeleter" company={company} />);

package/src/features/company/data/company.service.ts

@@ -31,6 +31,29 @@ export class CompanyService extends AbstractService {
     });
   }
 
+  static async selfDelete(params: { companyId: string }): Promise<void> {
+    const endpoint = new EndpointCreator({
+      endpoint: Modules.Company,
+      id: params.companyId,
+      childEndpoint: "self-delete",
+    }).generate();
+
+    console.log("[CompanyService.selfDelete] Called with companyId:", params.companyId);
+    console.log("[CompanyService.selfDelete] Generated endpoint:", endpoint);
+
+    try {
+      await this.callApi({
+        type: Modules.Company,
+        method: HttpMethod.DELETE,
+        endpoint: endpoint,
+      });
+      console.log("[CompanyService.selfDelete] API call successful");
+    } catch (error) {
+      console.error("[CompanyService.selfDelete] API call failed:", error);
+      throw error;
+    }
+  }
+
   static async create(params: CompanyInput): Promise<CompanyInterface> {
     return this.callApi({
       type: Modules.Company,

package/src/features/onboarding/components/OnboardingCard.tsx

@@ -0,0 +1,45 @@
+"use client";
+
+import { X } from "lucide-react";
+import { Button, Card, CardContent, CardHeader, CardTitle } from "../../../shadcnui";
+import { OnboardingCardRenderProps } from "../interfaces";
+
+// Matches a360ai ShepherdCard design exactly
+export function OnboardingCard({
+  step,
+  currentIndex,
+  totalSteps,
+  labels,
+  onNext,
+  onPrevious,
+  onClose,
+  isFirst,
+  isLast,
+}: OnboardingCardRenderProps) {
+  return (
+    <Card className="w-[320px] relative" data-shepherd-card>
+      <Button
+        variant="ghost"
+        size="icon"
+        className="absolute right-2 top-2"
+        onClick={onClose}
+        aria-label={labels.close}
+      >
+        <X className="h-4 w-4" />
+      </Button>
+      <CardHeader>
+        <CardTitle className="flex items-center gap-2">{step.title}</CardTitle>
+        <p className="text-xs text-muted-foreground">{labels.stepCounter(currentIndex + 1, totalSteps)}</p>
+      </CardHeader>
+      <CardContent className="space-y-4">
+        <div>{step.content}</div>
+        <div className="flex justify-between">
+          <Button variant="outline" onClick={onPrevious} disabled={isFirst}>
+            {labels.previous}
+          </Button>
+          <Button onClick={isLast ? onClose : onNext}>{isLast ? labels.finish : labels.next}</Button>
+        </div>
+      </CardContent>
+    </Card>
+  );
+}

package/src/features/onboarding/components/index.ts

@@ -0,0 +1 @@
+export * from "./OnboardingCard";