@carlonicora/nextjs-jsonapi 1.29.4 → 1.29.6

package/dist/index.mjs

@@ -9,7 +9,7 @@ import {
   getStripePublishableKey,
   getTrackablePages,
   isRolesConfigured
-} from "./chunk-GR4QPP36.mjs";
+} from "./chunk-C62JXXUX.mjs";
 import {
   AVAILABLE_OAUTH_SCOPES,
   AbstractApiData,
@@ -98,6 +98,7 @@ import {
   composeRefs,
   configureAuth,
   createJsonApiInclusion,
+  dismissToast,
   entityObjectSchema,
   exists,
   formatDate,
@@ -117,10 +118,13 @@ import {
   rehydrateList,
   setClientGlobalErrorHandler,
   setGlobalErrorHandler,
+  showCustomToast,
+  showError,
+  showToast,
   useComposedRefs,
   useIsMobile,
   userObjectSchema
-} from "./chunk-NYNLJEPF.mjs";
+} from "./chunk-WQ3KF6BG.mjs";
 import "./chunk-AUXK7QSA.mjs";
 import "./chunk-C7C7VY4F.mjs";
 import {
@@ -230,6 +234,7 @@ export {
   configureLogin,
   configureRoles,
   createJsonApiInclusion,
+  dismissToast,
   entityObjectSchema,
   exists,
   formatDate,
@@ -259,6 +264,9 @@ export {
   setBootstrapper,
   setClientGlobalErrorHandler,
   setGlobalErrorHandler,
+  showCustomToast,
+  showError,
+  showToast,
   translateData,
   translateResponse,
   tryBootstrap,

package/dist/server/index.js

@@ -15,7 +15,7 @@ var _chunk3ZPK4QOBjs = require('../chunk-3ZPK4QOB.js');
 
 
 
-var _chunkUYBCHXXLjs = require('../chunk-UYBCHXXL.js');
+var _chunk5KQXRLK3js = require('../chunk-5KQXRLK3.js');
 require('../chunk-LXKSUWAV.js');
 require('../chunk-IBS6NI7D.js');
 
@@ -86,7 +86,7 @@ var ServerSession = class {
     if (!rawModules) return false;
     const modules = JSON.parse(_pako2.default.ungzip(Buffer.from(rawModules, "base64"), { to: "string" }));
     const selectedModule = modules.find((module) => module.id === params.module.moduleId);
-    return _chunkUYBCHXXLjs.checkPermissionsFromServer.call(void 0, {
+    return _chunk5KQXRLK3js.checkPermissionsFromServer.call(void 0, {
       module: params.module,
       action: params.action,
       data: params.data,
@@ -296,5 +296,5 @@ _chunk7QVYU63Ejs.__name.call(void 0, ServerJsonApiDelete, "ServerJsonApiDelete")
 
 
 
-exports.ServerAuthService = _chunkUYBCHXXLjs.AuthService; exports.ServerCompanyService = _chunkUYBCHXXLjs.CompanyService; exports.ServerContentService = _chunkUYBCHXXLjs.ContentService; exports.ServerFeatureService = _chunkUYBCHXXLjs.FeatureService; exports.ServerJsonApiDelete = ServerJsonApiDelete; exports.ServerJsonApiGet = ServerJsonApiGet; exports.ServerJsonApiPatch = ServerJsonApiPatch; exports.ServerJsonApiPost = ServerJsonApiPost; exports.ServerJsonApiPut = ServerJsonApiPut; exports.ServerNotificationService = _chunkUYBCHXXLjs.NotificationService; exports.ServerPushService = _chunkUYBCHXXLjs.PushService; exports.ServerRoleService = _chunkUYBCHXXLjs.RoleService; exports.ServerS3Service = _chunkUYBCHXXLjs.S3Service; exports.ServerSession = ServerSession; exports.ServerUserService = _chunkUYBCHXXLjs.UserService; exports.configureServerJsonApi = configureServerJsonApi; exports.getServerApiUrl = getServerApiUrl; exports.getServerAppUrl = getServerAppUrl; exports.getServerToken = _chunkYUO55Q5Ajs.getServerToken; exports.getServerTrackablePages = getServerTrackablePages; exports.invalidateCacheTag = invalidateCacheTag; exports.invalidateCacheTags = invalidateCacheTags; exports.serverRequest = _chunk3ZPK4QOBjs.serverRequest;
+exports.ServerAuthService = _chunk5KQXRLK3js.AuthService; exports.ServerCompanyService = _chunk5KQXRLK3js.CompanyService; exports.ServerContentService = _chunk5KQXRLK3js.ContentService; exports.ServerFeatureService = _chunk5KQXRLK3js.FeatureService; exports.ServerJsonApiDelete = ServerJsonApiDelete; exports.ServerJsonApiGet = ServerJsonApiGet; exports.ServerJsonApiPatch = ServerJsonApiPatch; exports.ServerJsonApiPost = ServerJsonApiPost; exports.ServerJsonApiPut = ServerJsonApiPut; exports.ServerNotificationService = _chunk5KQXRLK3js.NotificationService; exports.ServerPushService = _chunk5KQXRLK3js.PushService; exports.ServerRoleService = _chunk5KQXRLK3js.RoleService; exports.ServerS3Service = _chunk5KQXRLK3js.S3Service; exports.ServerSession = ServerSession; exports.ServerUserService = _chunk5KQXRLK3js.UserService; exports.configureServerJsonApi = configureServerJsonApi; exports.getServerApiUrl = getServerApiUrl; exports.getServerAppUrl = getServerAppUrl; exports.getServerToken = _chunkYUO55Q5Ajs.getServerToken; exports.getServerTrackablePages = getServerTrackablePages; exports.invalidateCacheTag = invalidateCacheTag; exports.invalidateCacheTags = invalidateCacheTags; exports.serverRequest = _chunk3ZPK4QOBjs.serverRequest;
 //# sourceMappingURL=index.js.map

package/dist/server/index.mjs

@@ -15,7 +15,7 @@ import {
   S3Service,
   UserService,
   checkPermissionsFromServer
-} from "../chunk-NYNLJEPF.mjs";
+} from "../chunk-WQ3KF6BG.mjs";
 import "../chunk-AUXK7QSA.mjs";
 import "../chunk-C7C7VY4F.mjs";
 import {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carlonicora/nextjs-jsonapi",
-  "version": "1.29.4",
+  "version": "1.29.6",
   "description": "Next.js JSON:API client with server/client support and caching",
   "author": "Carlo Nicora",
   "license": "GPL-3.0-or-later",

package/src/components/errors/errorToast.ts

@@ -1,9 +1,7 @@
-// import { toast } from "@/hooks/use-toast";
-
-import { toast } from "sonner";
+import { showError } from "../../utils/toast";
 
 export function errorToast(params: { title?: string; error: any }) {
-  toast.error(params?.title ?? "Error", {
+  showError(params?.title ?? "Error", {
     description: params.error instanceof Error ? params.error.message : String(params.error),
   });
 }

package/src/components/forms/CommonAssociationForm.tsx

@@ -2,7 +2,7 @@
 
 import { useTranslations } from "next-intl";
 import { ReactNode, useCallback, useEffect, useRef, useState } from "react";
-import { toast } from "sonner";
+import { showToast } from "../../utils/toast";
 import { DataListRetriever, useDebounce } from "../../hooks";
 import {
   Button,
@@ -128,7 +128,7 @@ export const triggerAssociationToast = (params: {
   level?: string;
 }) => {
   if (params.level) {
-    toast.message(
+    showToast(
       params.t(`common.association.label`, {
         source: params.source,
         destination: params.destination,
@@ -144,7 +144,7 @@ export const triggerAssociationToast = (params: {
       },
     );
   } else {
-    toast.message(
+    showToast(
       params.t(`common.association.label`, {
         source: params.source,
         destination: params.destination,

package/src/components/forms/FileUploader.tsx

@@ -14,7 +14,7 @@ import {
   useState,
 } from "react";
 import { DropzoneOptions, DropzoneState, FileRejection, useDropzone } from "react-dropzone";
-import { toast } from "sonner";
+import { showError } from "../../utils/toast";
 import { buttonVariants, Input } from "../../shadcnui";
 import { cn } from "../../utils";
 
@@ -124,7 +124,7 @@ export const FileUploader = forwardRef<HTMLDivElement, FileUploaderProps & React
         const files = acceptedFiles;
 
         if (!files) {
-          toast.error(t("common.errors.file"), {
+          showError(t("common.errors.file"), {
             description: t("common.errors.file_large"),
           });
           return;
@@ -147,13 +147,13 @@ export const FileUploader = forwardRef<HTMLDivElement, FileUploaderProps & React
         if (rejectedFiles.length > 0) {
           for (let i = 0; i < rejectedFiles.length; i++) {
             if (rejectedFiles[i].errors[0]?.code === "file-too-large") {
-              toast.error(t("common.errors.file"), {
+              showError(t("common.errors.file"), {
                 description: t(`common.errors.file_max`, { size: maxSize / 1024 / 1024 }),
               });
               break;
             }
             if (rejectedFiles[i].errors[0]?.message) {
-              toast.error(t(`common.errors.file`), {
+              showError(t(`common.errors.file`), {
                 description: rejectedFiles[i].errors[0].message,
               });
               break;

package/src/features/auth/components/forms/AcceptInvitation.tsx

@@ -5,7 +5,7 @@ import { useTranslations } from "next-intl";
 import Image from "next/image";
 import { useEffect, useState } from "react";
 import { SubmitHandler, useForm } from "react-hook-form";
-import { toast } from "sonner";
+import { showToast } from "../../../../utils/toast";
 import { z } from "zod";
 import { errorToast, FormPassword } from "../../../../components";
 import { Button, CardContent, CardDescription, CardHeader, CardTitle, Form } from "../../../../shadcnui";
@@ -74,7 +74,7 @@ export function AcceptInvitation() {
       await AuthService.acceptInvitation(payload);
       setShowConfirmation(true);
 
-      toast.success(t("auth.account_activated"), {
+      showToast(t("auth.account_activated"), {
         description: t("auth.account_activated_description"),
       });
 

package/src/features/auth/components/forms/ActivateAccount.tsx

@@ -3,7 +3,7 @@
 import { useTranslations } from "next-intl";
 import Image from "next/image";
 import { useEffect, useState } from "react";
-import { toast } from "sonner";
+import { showToast } from "../../../../utils/toast";
 import { errorToast } from "../../../../components";
 import { CardContent, CardDescription, CardHeader, CardTitle } from "../../../../shadcnui";
 import { useAuthContext } from "../../contexts";
@@ -28,7 +28,7 @@ export function ActivateAccount() {
 
         setParams(undefined);
 
-        toast.success(t("auth.account_activated"), {
+        showToast(t("auth.account_activated"), {
           description: t("auth.account_activated_description"),
         });
 

package/src/features/auth/components/forms/ResetPassword.tsx

@@ -5,7 +5,7 @@ import { useTranslations } from "next-intl";
 import Image from "next/image";
 import { useEffect, useState } from "react";
 import { SubmitHandler, useForm } from "react-hook-form";
-import { toast } from "sonner";
+import { showToast } from "../../../../utils/toast";
 import { z } from "zod";
 import { errorToast, FormPassword } from "../../../../components";
 import { Button, CardContent, CardDescription, CardHeader, CardTitle, Form } from "../../../../shadcnui";
@@ -74,7 +74,7 @@ export function ResetPassword() {
       await AuthService.resetPassword(payload);
       setShowConfirmation(true);
 
-      toast.success(t(`auth.reset_success`), {
+      showToast(t(`auth.reset_success`), {
         description: t(`auth.reset_success_description`),
       });
 

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

@@ -5,7 +5,7 @@ import { Settings2Icon } from "lucide-react";
 import { useTranslations } from "next-intl";
 import { useEffect, useMemo, useState } from "react";
 import { SubmitHandler, useForm } from "react-hook-form";
-import { toast } from "sonner";
+import { showToast } from "../../../../utils/toast";
 import z from "zod";
 import { CommonEditorButtons, errorToast } from "../../../../components";
 import { getRoleId } from "../../../../roles";
@@ -89,7 +89,7 @@ function CompanyConfigurationEditorInternal({ company }: CompanyConfigurationEdi
         setUser(fullUser);
       }
 
-      toast.message("Configurations Updated", {
+      showToast("Configurations Updated", {
         description: `The system configurations have been updated successfully.`,
       });
       close();

package/src/features/notification/components/modals/NotificationModal.tsx

@@ -1,7 +1,7 @@
 import { BellIcon } from "lucide-react";
 import { useTranslations } from "next-intl";
 import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { toast } from "sonner";
+import { showToast } from "../../../../utils/toast";
 import { useSocketContext } from "../../../../contexts";
 import { usePageUrlGenerator } from "../../../../hooks";
 import {
@@ -116,7 +116,7 @@ function NotificationModalContent({ isOpen, setIsOpen }: NotificationModalProps)
           addNotification(notification);
           const toastNotification = generateToastNotification(notification, t, generateUrl);
 
-          toast.message(toastNotification.title, {
+          showToast(toastNotification.title, {
             description: toastNotification.description,
             action: toastNotification.action,
           });

package/src/features/notification/contexts/NotificationContext.tsx

@@ -1,12 +1,15 @@
 "use client";
 
 import { useTranslations } from "next-intl";
-import React, { createContext, ReactElement, useCallback, useContext, useState } from "react";
+import React, { createContext, ReactElement, useCallback, useContext, useEffect, useState } from "react";
 import { SharedProvider } from "../../../contexts";
 import { Modules } from "../../../core";
 import { useI18nRouter } from "../../../i18n";
 import { BreadcrumbItemData } from "../../../interfaces";
 import { NotificationMenuItem, NotificationToast } from "../components/notifications/Notification";
+import { getRoleId, isRolesConfigured } from "../../../roles";
+import { RoleInterface } from "../../role";
+import { useCurrentUserContext } from "../../user/contexts/CurrentUserContext";
 import { NotificationInterface } from "../data";
 import { NotificationService } from "../data/notification.service";
 
@@ -50,6 +53,10 @@ export const NotificationContextProvider = ({ children }: NotificationContextPro
   const [isLoading, setIsLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
   const [lastLoaded, setLastLoaded] = useState(0);
+  const [hasInitiallyLoaded, setHasInitiallyLoaded] = useState(false);
+
+  // Access current user for initial load check
+  const { currentUser } = useCurrentUserContext();
 
   // Calculate shouldRefresh (5 minute cache)
   const shouldRefresh = Date.now() - lastLoaded > 5 * 60 * 1000;
@@ -88,6 +95,25 @@ export const NotificationContextProvider = ({ children }: NotificationContextPro
     }
   }, []);
 
+  // Initial load - runs once per session when user is available and not admin
+  useEffect(() => {
+    if (hasInitiallyLoaded || !currentUser) return;
+
+    // Skip for admin users
+    if (isRolesConfigured()) {
+      const isAdmin = currentUser.roles?.some(
+        (role: RoleInterface) => role.id === getRoleId().Administrator,
+      );
+      if (isAdmin) {
+        setHasInitiallyLoaded(true);
+        return;
+      }
+    }
+
+    loadNotifications();
+    setHasInitiallyLoaded(true);
+  }, [currentUser, hasInitiallyLoaded, loadNotifications]);
+
   const markNotificationsAsRead = useCallback(async (ids: string[]) => {
     setIsLoading(true);
     setError(null);

package/src/features/role/components/forms/UserRoleAdd.tsx

@@ -3,7 +3,7 @@
 import { PlusCircle } from "lucide-react";
 import { useTranslations } from "next-intl";
 import { useCallback, useEffect, useRef, useState } from "react";
-import { toast } from "sonner";
+import { showToast } from "../../../../utils/toast";
 import { useDebounce } from "../../../../hooks";
 import {
   Button,
@@ -39,7 +39,7 @@ export function UserRoleAdd({ user, refresh }: UserRoleAddProps) {
     });
     setRoles(roles.filter((u) => u.id !== role.id));
 
-    toast.message(
+    showToast(
       t(`common.association.label`, {
         source: t(`entities.roles`, { count: 1 }),
         destination: t(`entities.users`, { count: 1 }),

package/src/features/user/components/forms/UserResentInvitationEmail.tsx

@@ -3,7 +3,7 @@
 import { MailIcon } from "lucide-react";
 import { useTranslations } from "next-intl";
 import { useState } from "react";
-import { toast } from "sonner";
+import { showToast } from "../../../../utils/toast";
 import { errorToast } from "../../../../components";
 import { Modules } from "../../../../core";
 import { Action } from "../../../../permissions";
@@ -36,7 +36,7 @@ function UserResentInvitationEmailInternal({ user }: UserResentInvitationEmailPr
       await UserService.sendInvitation({ userId: user.id, companyId: user.company!.id });
 
       setOpen(false);
-      toast.message(t(`user.resend_activation.email_sent`), {
+      showToast(t(`user.resend_activation.email_sent`), {
         description: t(`user.resend_activation.email_sent_description`, { email: user.email }),
       });
     } catch (error) {

package/src/index.ts

@@ -26,3 +26,6 @@ export type { RoleIdConfig } from "./roles";
 // Auth configuration
 export { configureAuth, getTokenHandler } from "./features/auth/config";
 export type { TokenHandler, TokenParams } from "./features/auth/config";
+
+// Toast utilities
+export { showToast, showError, dismissToast, showCustomToast, type ToastOptions } from "./utils/toast";

package/src/shadcnui/ui/sonner.tsx

@@ -1,32 +1,22 @@
-"use client"
+"use client";
 
-import { useTheme } from "next-themes"
-import { Toaster as Sonner, type ToasterProps } from "sonner"
-import { CircleCheckIcon, InfoIcon, TriangleAlertIcon, OctagonXIcon, Loader2Icon } from "lucide-react"
+import { useTheme } from "next-themes";
+import { Toaster as Sonner, type ToasterProps } from "sonner";
+import { CircleCheckIcon, InfoIcon, TriangleAlertIcon, OctagonXIcon, Loader2Icon } from "lucide-react";
 
 const Toaster = ({ ...props }: ToasterProps) => {
-  const { theme = "system" } = useTheme()
+  const { theme = "system" } = useTheme();
 
   return (
     <Sonner
       theme={theme as ToasterProps["theme"]}
       className="toaster group"
       icons={{
-        success: (
-          <CircleCheckIcon className="size-4" />
-        ),
-        info: (
-          <InfoIcon className="size-4" />
-        ),
-        warning: (
-          <TriangleAlertIcon className="size-4" />
-        ),
-        error: (
-          <OctagonXIcon className="size-4" />
-        ),
-        loading: (
-          <Loader2Icon className="size-4 animate-spin" />
-        ),
+        success: <CircleCheckIcon className="size-4" />,
+        info: <InfoIcon className="size-4" />,
+        warning: <TriangleAlertIcon className="size-4" />,
+        error: <OctagonXIcon className="size-4" />,
+        loading: <Loader2Icon className="size-4 animate-spin" />,
       }}
       style={
         {
@@ -43,7 +33,7 @@ const Toaster = ({ ...props }: ToasterProps) => {
       }}
       {...props}
     />
-  )
-}
+  );
+};
 
-export { Toaster }
+export { Toaster };

package/src/utils/index.ts

@@ -14,3 +14,6 @@ export { entityObjectSchema, userObjectSchema, type EntityObject, type UserObjec
 export * from "./blocknote-diff.util";
 export * from "./blocknote-word-diff-renderer.util";
 export * from "./icons";
+
+// Toast utilities
+export { showToast, showError, dismissToast, showCustomToast, type ToastOptions } from "./toast";

package/src/utils/toast.ts

@@ -0,0 +1,39 @@
+import { toast as sonnerToast, type ExternalToast } from "sonner";
+import type { ReactElement, JSXElementConstructor, ReactNode } from "react";
+
+export type ToastOptions = {
+  description?: ReactNode;
+  duration?: number;
+  id?: string;
+  onDismiss?: () => void;
+  action?: ExternalToast["action"];
+  dismissible?: boolean;
+};
+
+/** Standard toast - neutral/white */
+export function showToast(message: string, options?: ToastOptions) {
+  return sonnerToast(message, options as ExternalToast);
+}
+
+/** Error toast - destructive red */
+export function showError(message: string, options?: ToastOptions) {
+  return sonnerToast.error(message, options as ExternalToast);
+}
+
+/** Dismiss toast(s) */
+export function dismissToast(toastId?: string | number) {
+  return sonnerToast.dismiss(toastId);
+}
+
+/** Custom toast - ONLY for complex UI like upload progress */
+export function showCustomToast(
+  render: (id: string | number) => ReactElement<unknown, string | JSXElementConstructor<unknown>>,
+  options?: {
+    id?: string | number;
+    duration?: number;
+    dismissible?: boolean;
+    onDismiss?: () => void;
+  },
+) {
+  return sonnerToast.custom(render, options);
+}