@greatapps/common 1.1.490 → 1.1.491

package/dist/modules/users/action/list-messages.action.mjs

@@ -1,10 +1,22 @@
 "use server";
 import { safeServerAction } from "../../../utils/safeServerAction";
 import { messagesService } from "../services/messages.service";
+import { findWhitelabel } from "../../whitelabel/actions/find-whitelabel.action";
 async function listMessagesAction(params) {
   return safeServerAction(async () => {
-    const result = await messagesService.listMessages(params);
-    return { data: result.data, total: result.total, totalUnread: result.totalUnread };
+    const [result, whitelabel] = await Promise.all([
+      messagesService.listMessages(params),
+      findWhitelabel()
+    ]);
+    const urlMap = {
+      pages_url: whitelabel?.pages_url ?? "",
+      accounts_url: whitelabel?.accounts_url ?? "",
+      editor_url: whitelabel?.editor_url ?? ""
+    };
+    return { data: result.data.map((message) => ({
+      ...message,
+      url: message.url.replace(/\{(pages_url|accounts_url|editor_url)\}/g, (_, key) => urlMap[key] ?? "")
+    })), total: result.total, totalUnread: result.totalUnread };
   });
 }
 export {

package/dist/modules/users/action/list-messages.action.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/modules/users/action/list-messages.action.ts"],"sourcesContent":["'use server';\n\nimport { safeServerAction } from '../../../utils/safeServerAction';\nimport { messagesService } from '../services/messages.service';\nimport type { FindMessagesParams } from '../schema/messages.schema';\n\nexport async function listMessagesAction(params?: Partial<FindMessagesParams>) {\n  return safeServerAction(async () => {\n    const result = await messagesService.listMessages(params);\n    return { data: result.data, total: result.total, totalUnread: result.totalUnread };\n  });\n}\n"],"mappings":";AAEA,SAAS,wBAAwB;AACjC,SAAS,uBAAuB;AAGhC,eAAsB,mBAAmB,QAAsC;AAC7E,SAAO,iBAAiB,YAAY;AAClC,UAAM,SAAS,MAAM,gBAAgB,aAAa,MAAM;AACxD,WAAO,EAAE,MAAM,OAAO,MAAM,OAAO,OAAO,OAAO,aAAa,OAAO,YAAY;AAAA,EACnF,CAAC;AACH;","names":[]}
+{"version":3,"sources":["../../../../src/modules/users/action/list-messages.action.ts"],"sourcesContent":["'use server';\n\nimport { safeServerAction } from '../../../utils/safeServerAction';\nimport { messagesService } from '../services/messages.service';\nimport type { FindMessagesParams } from '../schema/messages.schema';\nimport { findWhitelabel } from '../../whitelabel/actions/find-whitelabel.action';\n\nexport async function listMessagesAction(params?: Partial<FindMessagesParams>) {\n  return safeServerAction(async () => {\n    const [result, whitelabel] = await Promise.all([\n      messagesService.listMessages(params),\n      findWhitelabel(),\n    ]);\n\n    const urlMap: Record<string, string> = {\n      pages_url: whitelabel?.pages_url ?? '',\n      accounts_url: whitelabel?.accounts_url ?? '',\n      editor_url: whitelabel?.editor_url ?? '',\n    };\n\n    return { data: result.data.map((message) => ({\n      ...message,\n      url: message.url.replace(/\\{(pages_url|accounts_url|editor_url)\\}/g, (_, key) => urlMap[key] ?? ''),\n    })), total: result.total, totalUnread: result.totalUnread };\n  });\n}\n"],"mappings":";AAEA,SAAS,wBAAwB;AACjC,SAAS,uBAAuB;AAEhC,SAAS,sBAAsB;AAE/B,eAAsB,mBAAmB,QAAsC;AAC7E,SAAO,iBAAiB,YAAY;AAClC,UAAM,CAAC,QAAQ,UAAU,IAAI,MAAM,QAAQ,IAAI;AAAA,MAC7C,gBAAgB,aAAa,MAAM;AAAA,MACnC,eAAe;AAAA,IACjB,CAAC;AAED,UAAM,SAAiC;AAAA,MACrC,WAAW,YAAY,aAAa;AAAA,MACpC,cAAc,YAAY,gBAAgB;AAAA,MAC1C,YAAY,YAAY,cAAc;AAAA,IACxC;AAEA,WAAO,EAAE,MAAM,OAAO,KAAK,IAAI,CAAC,aAAa;AAAA,MAC3C,GAAG;AAAA,MACH,KAAK,QAAQ,IAAI,QAAQ,4CAA4C,CAAC,GAAG,QAAQ,OAAO,GAAG,KAAK,EAAE;AAAA,IACpG,EAAE,GAAG,OAAO,OAAO,OAAO,aAAa,OAAO,YAAY;AAAA,EAC5D,CAAC;AACH;","names":[]}

package/dist/modules/users/services/messages.service.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/modules/users/services/messages.service.ts"],"sourcesContent":["import 'server-only';\n\nimport { api } from '../../../infra/api/client';\nimport { buildQueryParams } from '../../../infra/utils/params';\nimport { getUserContext } from '../../auth/utils/get-user-context';\nimport {\n  FindMessagesParams,\n  ListMessagesApiResponse,\n  MarkAsReadApiResponse,\n  MarkAllAsReadApiResponse,\n} from '../schema/messages.schema';\n\nclass MessagesService {\n  async listMessages(\n    params?: Partial<FindMessagesParams>\n  ): Promise<ListMessagesApiResponse> {\n    const { id_account, id_user } = await getUserContext();\n\n    const query = buildQueryParams({\n      id_account,\n      id_user,\n      type: 'notification',\n      limit: 20,\n      page: 1,\n      order: 'desc',\n      ...params,\n    });\n\n    const url = `/accounts/${id_account}/messages${query ? `?${query}` : ''}`;\n    return api.apps.get<ListMessagesApiResponse>(url);\n  }\n\n  async markAsRead(messageId: string): Promise<MarkAsReadApiResponse> {\n    const { id_account } = await getUserContext();\n\n    const url = `/accounts/${id_account}/messages/${messageId}/action/markAsRead`;\n    return api.apps.put<MarkAsReadApiResponse>(url);\n  }\n\n  async markAllAsRead(): Promise<MarkAllAsReadApiResponse> {\n    const { id_account, id_user } = await getUserContext();\n\n    const url = `/accounts/${id_account}/messages/action/markAllAsRead`;\n    return api.apps.put<MarkAllAsReadApiResponse>(url, { id_user });\n  }\n}\n\nexport const messagesService = new MessagesService();\n"],"mappings":"AAAA,OAAO;AAEP,SAAS,WAAW;AACpB,SAAS,wBAAwB;AACjC,SAAS,sBAAsB;AAQ/B,MAAM,gBAAgB;AAAA,EACpB,MAAM,aACJ,QACkC;AAClC,UAAM,EAAE,YAAY,QAAQ,IAAI,MAAM,eAAe;AAErD,UAAM,QAAQ,iBAAiB;AAAA,MAC7B;AAAA,MACA;AAAA,MACA,MAAM;AAAA,MACN,OAAO;AAAA,MACP,MAAM;AAAA,MACN,OAAO;AAAA,MACP,GAAG;AAAA,IACL,CAAC;AAED,UAAM,MAAM,aAAa,UAAU,YAAY,QAAQ,IAAI,KAAK,KAAK,EAAE;AACvE,WAAO,IAAI,KAAK,IAA6B,GAAG;AAAA,EAClD;AAAA,EAEA,MAAM,WAAW,WAAmD;AAClE,UAAM,EAAE,WAAW,IAAI,MAAM,eAAe;AAE5C,UAAM,MAAM,aAAa,UAAU,aAAa,SAAS;AACzD,WAAO,IAAI,KAAK,IAA2B,GAAG;AAAA,EAChD;AAAA,EAEA,MAAM,gBAAmD;AACvD,UAAM,EAAE,YAAY,QAAQ,IAAI,MAAM,eAAe;AAErD,UAAM,MAAM,aAAa,UAAU;AACnC,WAAO,IAAI,KAAK,IAA8B,KAAK,EAAE,QAAQ,CAAC;AAAA,EAChE;AACF;AAEO,MAAM,kBAAkB,IAAI,gBAAgB;","names":[]}
+{"version":3,"sources":["../../../../src/modules/users/services/messages.service.ts"],"sourcesContent":["import 'server-only';\n\nimport { api } from '../../../infra/api/client';\nimport { buildQueryParams } from '../../../infra/utils/params';\nimport { getUserContext } from '../../auth/utils/get-user-context';\nimport {\n  FindMessagesParams,\n  ListMessagesApiResponse,\n  MarkAsReadApiResponse,\n  MarkAllAsReadApiResponse,\n} from '../schema/messages.schema';\n\nclass MessagesService {\n  async listMessages(\n    params?: Partial<FindMessagesParams>\n  ): Promise<ListMessagesApiResponse> {\n    const { id_account, id_user } = await getUserContext();\n\n    const query = buildQueryParams({\n      id_account,\n      id_user,\n      type: 'notification',\n      limit: 20,\n      page: 1,\n      order: 'desc',\n      ...params,\n    });\n\n    const url = `/accounts/${id_account}/messages${query ? `?${query}` : ''}`;\n\n    return api.apps.get<ListMessagesApiResponse>(url);\n  }\n\n  async markAsRead(messageId: string): Promise<MarkAsReadApiResponse> {\n    const { id_account } = await getUserContext();\n\n    const url = `/accounts/${id_account}/messages/${messageId}/action/markAsRead`;\n    return api.apps.put<MarkAsReadApiResponse>(url);\n  }\n\n  async markAllAsRead(): Promise<MarkAllAsReadApiResponse> {\n    const { id_account, id_user } = await getUserContext();\n\n    const url = `/accounts/${id_account}/messages/action/markAllAsRead`;\n    return api.apps.put<MarkAllAsReadApiResponse>(url, { id_user });\n  }\n}\n\nexport const messagesService = new MessagesService();\n"],"mappings":"AAAA,OAAO;AAEP,SAAS,WAAW;AACpB,SAAS,wBAAwB;AACjC,SAAS,sBAAsB;AAQ/B,MAAM,gBAAgB;AAAA,EACpB,MAAM,aACJ,QACkC;AAClC,UAAM,EAAE,YAAY,QAAQ,IAAI,MAAM,eAAe;AAErD,UAAM,QAAQ,iBAAiB;AAAA,MAC7B;AAAA,MACA;AAAA,MACA,MAAM;AAAA,MACN,OAAO;AAAA,MACP,MAAM;AAAA,MACN,OAAO;AAAA,MACP,GAAG;AAAA,IACL,CAAC;AAED,UAAM,MAAM,aAAa,UAAU,YAAY,QAAQ,IAAI,KAAK,KAAK,EAAE;AAEvE,WAAO,IAAI,KAAK,IAA6B,GAAG;AAAA,EAClD;AAAA,EAEA,MAAM,WAAW,WAAmD;AAClE,UAAM,EAAE,WAAW,IAAI,MAAM,eAAe;AAE5C,UAAM,MAAM,aAAa,UAAU,aAAa,SAAS;AACzD,WAAO,IAAI,KAAK,IAA2B,GAAG;AAAA,EAChD;AAAA,EAEA,MAAM,gBAAmD;AACvD,UAAM,EAAE,YAAY,QAAQ,IAAI,MAAM,eAAe;AAErD,UAAM,MAAM,aAAa,UAAU;AACnC,WAAO,IAAI,KAAK,IAA8B,KAAK,EAAE,QAAQ,CAAC;AAAA,EAChE;AACF;AAEO,MAAM,kBAAkB,IAAI,gBAAgB;","names":[]}

package/package.json

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

package/src/modules/users/action/list-messages.action.ts

@@ -3,10 +3,24 @@
 import { safeServerAction } from '../../../utils/safeServerAction';
 import { messagesService } from '../services/messages.service';
 import type { FindMessagesParams } from '../schema/messages.schema';
+import { findWhitelabel } from '../../whitelabel/actions/find-whitelabel.action';
 
 export async function listMessagesAction(params?: Partial<FindMessagesParams>) {
   return safeServerAction(async () => {
-    const result = await messagesService.listMessages(params);
-    return { data: result.data, total: result.total, totalUnread: result.totalUnread };
+    const [result, whitelabel] = await Promise.all([
+      messagesService.listMessages(params),
+      findWhitelabel(),
+    ]);
+
+    const urlMap: Record<string, string> = {
+      pages_url: whitelabel?.pages_url ?? '',
+      accounts_url: whitelabel?.accounts_url ?? '',
+      editor_url: whitelabel?.editor_url ?? '',
+    };
+
+    return { data: result.data.map((message) => ({
+      ...message,
+      url: message.url.replace(/\{(pages_url|accounts_url|editor_url)\}/g, (_, key) => urlMap[key] ?? ''),
+    })), total: result.total, totalUnread: result.totalUnread };
   });
 }

package/src/modules/users/services/messages.service.ts

@@ -27,6 +27,7 @@ class MessagesService {
     });
 
     const url = `/accounts/${id_account}/messages${query ? `?${query}` : ''}`;
+
     return api.apps.get<ListMessagesApiResponse>(url);
   }