@pushwoosh/smart-components-kit 1.17.2 → 1.17.4

package/ResendModal/hooks/mappers.d.ts

@@ -1,36 +1,32 @@
 import { type Message } from '@pushwoosh/rpc-v2-http-api-data/messages';
-export interface ResendEmailRequest {
-    request: {
+export type ResendEmailRequest = {
+    transaction_id: string;
+    segment: {
+        schedule: {
+            after: string;
+        };
+        expression: string;
         application: string;
-        notifications: Array<{
-            transactionId: string;
-            preset?: string;
-            campaign?: string;
-            subject?: string;
-            send_date: string;
-            timezone?: string;
-            devices_filter: string;
+        platforms: string[];
+        campaign?: string;
+        message_type: string;
+        email_payload: {
+            email_preset?: string;
+            subject: {
+                default: string;
+            };
             from: {
                 name: string;
                 email: string;
             };
-            'reply-to'?: {
+            reply_to?: {
                 name: string;
                 email: string;
             };
-            email_type: string;
             email_category?: string;
-            use_auto_registration?: boolean;
-            created_via?: string;
-            capping_days?: number;
-            capping_count?: number;
-            capping_exclude?: boolean;
-            capping_avoid?: boolean;
-            send_rate?: number;
-            send_rate_avoid?: boolean;
-        }>;
+        };
     };
-}
+};
 export declare class ResendEmailPayloadMapper {
     static getPayload(applicationCode: string, originalMessage: Message, newSubject: string): ResendEmailRequest;
 }

package/ResendModal/hooks/mappers.js

@@ -2,31 +2,33 @@ import { parseMessageProperties } from './helpers';
 export class ResendEmailPayloadMapper {
   static getPayload(applicationCode, originalMessage, newSubject) {
     const props = parseMessageProperties(originalMessage.properties);
-    const devicesFilter = `((Event("${applicationCode}", "PW_EmailSent", date daysago lte 365, count eq 1, attribute "message_code" eq "${originalMessage.code}")) \\ (Event("${applicationCode}", "PW_EmailOpen", date daysago lte 365, count eq 1, attribute "message_code" eq "${originalMessage.code}")))`;
+    const expression = `((Event("${applicationCode}", "PW_EmailSent", date daysago lte 365, count eq 1, attribute "message_code" eq "${originalMessage.code}")) \\ (Event("${applicationCode}", "PW_EmailOpen", date daysago lte 365, count eq 1, attribute "message_code" eq "${originalMessage.code}")))`;
     return {
-      request: {
+      transaction_id: crypto.randomUUID(),
+      segment: {
+        schedule: {
+          after: '0s'
+        },
+        expression,
         application: applicationCode,
-        notifications: [{
-          transactionId: crypto.randomUUID(),
-          preset: props.preset,
-          campaign: props.campaignCode,
-          subject: newSubject,
-          send_date: 'now',
-          timezone: props.timezone,
-          devices_filter: devicesFilter,
+        platforms: ['EMAIL'],
+        campaign: props.campaignCode,
+        message_type: props.email_type === 'transactional' ? 'MESSAGE_TYPE_TRANSACTIONAL' : 'MESSAGE_TYPE_MARKETING',
+        email_payload: {
+          email_preset: props.preset,
+          subject: {
+            default: newSubject
+          },
           from: {
             name: props.email_from_name || '',
             email: props.email_from_email || ''
           },
-          'reply-to': props.email_reply_email ? {
+          reply_to: props.email_reply_email ? {
             name: props.email_reply_name || '',
             email: props.email_reply_email
           } : undefined,
-          email_type: props.email_type || 'marketing',
-          email_category: props.email_category,
-          use_auto_registration: true,
-          created_via: 'email cp'
-        }]
+          email_category: props.email_category
+        }
       }
     };
   }

package/ResendModal/hooks/useResend.js

@@ -6,7 +6,7 @@ export const useResend = () => {
   const {
     httpClient,
     helpers: {
-      getJsonApiUrl
+      getApiOrigin
     }
   } = useSPAContext();
   const {
@@ -15,17 +15,10 @@ export const useResend = () => {
   const resendEmail = useCallback(async (applicationCode, originalMessage, newSubject) => {
     const payload = ResendEmailPayloadMapper.getPayload(applicationCode, originalMessage, newSubject);
     try {
-      const res = await httpClient.post(getJsonApiUrl('createEmailMessage'), {
-        body: payload.request,
+      await httpClient.post(`${getApiOrigin('messaging-api')}/messaging/v2/notify`, {
+        body: payload,
         withAuthorization: true
       });
-      if (res?.status_code !== 200) {
-        openToast({
-          title: res?.status_message || 'Failed to resend message',
-          type: 'error'
-        });
-        return false;
-      }
       openToast({
         title: 'Message resent successfully',
         type: 'success'
@@ -38,7 +31,7 @@ export const useResend = () => {
       });
       return false;
     }
-  }, [httpClient, getJsonApiUrl, openToast]);
+  }, [httpClient, getApiOrigin, openToast]);
   return {
     resendEmail
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushwoosh/smart-components-kit",
-  "version": "1.17.2",
+  "version": "1.17.4",
   "description": "Stateful, data-connected React components shared by Pushwoosh micro-frontends",
   "repository": {
     "type": "git",