@carlonicora/nextjs-jsonapi 1.114.0 → 1.116.0

package/src/core/abstracts/AbstractService.ts

@@ -146,6 +146,7 @@ export abstract class AbstractService {
     responseType?: ApiRequestDataTypeInterface;
     files?: { [key: string]: File | Blob } | File | Blob;
     token?: string;
+    suppressGlobalError?: boolean;
   }): Promise<T> {
     // Dynamic import to avoid bundling issues
     const { JsonApiGet, JsonApiPost, JsonApiPut, JsonApiPatch, JsonApiDelete } =
@@ -222,7 +223,7 @@ export abstract class AbstractService {
     }
 
     if (!apiResponse.ok) {
-      if (globalErrorHandler && typeof window !== "undefined") {
+      if (globalErrorHandler && typeof window !== "undefined" && !params.suppressGlobalError) {
         globalErrorHandler(apiResponse.response, apiResponse.error);
         return undefined as any;
       } else {
@@ -257,6 +258,7 @@ export abstract class AbstractService {
     overridesJsonApiCreation?: boolean;
     responseType?: ApiRequestDataTypeInterface;
     files?: { [key: string]: File | Blob } | File | Blob;
+    suppressGlobalError?: boolean;
   }): Promise<{ data: T; meta?: Record<string, any> }> {
     // Dynamic import to avoid bundling issues
     const { JsonApiGet, JsonApiPost, JsonApiPut, JsonApiPatch, JsonApiDelete } =
@@ -332,7 +334,7 @@ export abstract class AbstractService {
     }
 
     if (!apiResponse.ok) {
-      if (globalErrorHandler && typeof window !== "undefined") {
+      if (globalErrorHandler && typeof window !== "undefined" && !params.suppressGlobalError) {
         globalErrorHandler(apiResponse.response, apiResponse.error);
         return { data: undefined as any, meta: undefined };
       } else {
@@ -357,6 +359,7 @@ export abstract class AbstractService {
     method: HttpMethod;
     endpoint: string;
     companyId?: string;
+    suppressGlobalError?: boolean;
   }): Promise<any> {
     const { JsonApiGet } = await import("../../unified/JsonApiRequest");
 
@@ -378,7 +381,7 @@ export abstract class AbstractService {
     });
 
     if (!apiResponse.ok) {
-      if (globalErrorHandler && typeof window !== "undefined") {
+      if (globalErrorHandler && typeof window !== "undefined" && !params.suppressGlobalError) {
         globalErrorHandler(apiResponse.response, apiResponse.error);
         return undefined as any;
       } else {

package/src/features/notification/data/notification.interface.ts

@@ -1,5 +1,4 @@
 import { ApiDataInterface } from "../../../core";
-import { UserInterface } from "../../user";
 
 export type NotificationInput = {
   id: string;
@@ -12,5 +11,6 @@ export interface NotificationInterface extends ApiDataInterface {
   get message(): string | undefined;
   get actionUrl(): string | undefined;
 
-  get actor(): UserInterface | undefined;
+  get actor(): ApiDataInterface | undefined;
+  get subject(): ApiDataInterface | undefined;
 }

package/src/features/notification/data/notification.ts

@@ -1,5 +1,4 @@
-import { AbstractApiData, JsonApiHydratedDataInterface, Modules } from "../../../core";
-import { UserInterface } from "../../user";
+import { AbstractApiData, ApiDataInterface, JsonApiHydratedDataInterface, Modules } from "../../../core";
 import { NotificationInput, NotificationInterface } from "./notification.interface";
 
 export class Notification extends AbstractApiData implements NotificationInterface {
@@ -8,7 +7,8 @@ export class Notification extends AbstractApiData implements NotificationInterfa
   private _message?: string;
   private _actionUrl?: string;
 
-  private _actor?: UserInterface;
+  private _actor?: ApiDataInterface;
+  private _subject?: ApiDataInterface;
 
   get notificationType(): string {
     if (this._notificationType === undefined) throw new Error("notificationType is not set");
@@ -27,10 +27,14 @@ export class Notification extends AbstractApiData implements NotificationInterfa
     return this._actionUrl;
   }
 
-  get actor(): UserInterface | undefined {
+  get actor(): ApiDataInterface | undefined {
     return this._actor;
   }
 
+  get subject(): ApiDataInterface | undefined {
+    return this._subject;
+  }
+
   rehydrate(data: JsonApiHydratedDataInterface): this {
     super.rehydrate(data);
 
@@ -39,7 +43,19 @@ export class Notification extends AbstractApiData implements NotificationInterfa
     this._message = data.jsonApi.attributes.message;
     this._actionUrl = data.jsonApi.attributes.actionUrl;
 
-    this._actor = this._readIncluded(data, "actor", Modules.User) as UserInterface;
+    const rels = (data.jsonApi.relationships ?? {}) as Record<string, { data?: { type: string; id: string } }>;
+
+    const actorType = rels.actor?.data?.type;
+    this._actor = actorType
+      ? (this._readIncluded(data, "actor", Modules.findByName(actorType)) as ApiDataInterface)
+      : undefined;
+
+    const subjectName = Object.keys(rels).find((name) => name !== "actor" && rels[name]?.data?.type);
+    const subjectType = subjectName ? rels[subjectName]?.data?.type : undefined;
+    this._subject =
+      subjectName && subjectType
+        ? (this._readIncluded(data, subjectName, Modules.findByName(subjectType)) as ApiDataInterface)
+        : undefined;
 
     return this;
   }