@capillarytech/creatives-library 7.14.30 → 7.14.32

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "7.14.30",
+  "version": "7.14.32",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

package/services/api.js

@@ -477,10 +477,10 @@ export const checkBulkDuplicates = (data) => {
   return request(url, getAPICallObject('POST', data));
 };
 
-export const createWhatsappTemplate = ({gupshupMediaFile, payload }) => {
+export const createWhatsappTemplate = ({payload, gupshupMediaFile }) => {
   const data = new FormData();
-  data.append('gupshupMediaFile', gupshupMediaFile);
   data.append('payload', JSON.stringify(payload));
+  data.append('gupshupMediaFile', gupshupMediaFile);
   const url = `${API_ENDPOINT}/templates/WHATSAPP`;
   return request(url, getAPICallObject('POST', data, true));
 };

package/services/tests/api.test.js

@@ -4,6 +4,7 @@ import {
   getCdnTransformationConfig,
   createWhatsappTemplate
 } from '../api';
+import { mockData } from './mockData';
 const sampleFile = require('../../assets/line.png');
 
 describe('getSenderDetails -- Test with valid responses', () => {
@@ -40,49 +41,6 @@ describe('uploadFile -- whatsapp image upload', () => {
 describe('createWhatsappTemplate -- Test with valid responses', () => {
   it('Should return correct response', () =>
     expect(
-      createWhatsappTemplate(sampleFile, {
-        name: 'mar_15_10_9',
-        versions: {
-          base: {
-            content: {
-              whatsapp: {
-                category: 'TRANSACTIONAL',
-                languages: [
-                  {
-                    language: 'en',
-                    content:
-                      'Hey {{1}}, your appointment for {{2}} is confirmed.\nClick {{3}} to unsubscribe',
-                  },
-                ],
-                buttonType: 'CTA',
-                buttons: [
-                  {
-                    index: 0,
-                    type: 'PHONE_NUMBER',
-                    text: 'call',
-                    phone_number: '+919738751234',
-                  },
-                  {
-                    index: 1,
-                    type: 'DYNAMIC_URL',
-                    text: 'info',
-                    url: 'https://github.com/Capillary/{{1}}',
-                  },
-                ],
-                mediaType: 'IMAGE',
-                imageUrl:
-                  'https://storage.crm.n.content-cdn.io/cdn-cgi/image/quality=70,/intouch_creative_assets/7e167b76-7276-4de3-a767-3d1ae9ae.jpg',
-                karixFileHandle: '',
-                varMapped: {},
-                templateEditor: false,
-                accountId: '2000222347',
-                accessToken: 'DTpZEh4VK',
-                hostName: 'gupshupwhatsappbulk',
-              },
-            },
-          },
-        },
-        type: 'WHATSAPP',
-      }),
+      createWhatsappTemplate(sampleFile, mockData.createWhatsappPayload),
     ).toEqual(Promise.resolve()));
 });

package/services/tests/mockData.js

@@ -0,0 +1,46 @@
+export const mockData = {
+  createWhatsappPayload: {
+    name: 'mar_15_10_9',
+    versions: {
+      base: {
+        content: {
+          whatsapp: {
+            category: 'TRANSACTIONAL',
+            languages: [
+              {
+                language: 'en',
+                content:
+                  'Hey {{1}}, your appointment for {{2}} is confirmed.\nClick {{3}} to unsubscribe',
+              },
+            ],
+            buttonType: 'CTA',
+            buttons: [
+              {
+                index: 0,
+                type: 'PHONE_NUMBER',
+                text: 'call',
+                phone_number: '+919738751234',
+              },
+              {
+                index: 1,
+                type: 'DYNAMIC_URL',
+                text: 'info',
+                url: 'https://github.com/Capillary/{{1}}',
+              },
+            ],
+            mediaType: 'IMAGE',
+            imageUrl:
+              'https://storage.crm.n.content-cdn.io/cdn-cgi/image/quality=70,/intouch_creative_assets/7e167b76-7276-4de3-a767-3d1ae9ae.jpg',
+            karixFileHandle: '',
+            varMapped: {},
+            templateEditor: false,
+            accountId: '2000222347',
+            accessToken: 'DTpZEh4VK',
+            hostName: 'gupshupwhatsappbulk',
+          },
+        },
+      },
+    },
+    type: 'WHATSAPP',
+  },
+};

package/v2Containers/Whatsapp/actions.js

@@ -8,12 +8,12 @@ import {
   CLEAR_WHATSAPP_ASSET,
 } from './constants';
 
-export function createWhatsappTemplate(gupshupMediaFile, payload, callback) {
+export function createWhatsappTemplate(payload, callback, gupshupMediaFile) {
   return {
     type: TEMPLATE_CREATE_REQUEST,
-    gupshupMediaFile,
     payload,
     callback,
+    gupshupMediaFile,
   };
 }
 export function clearCreateResponse() {

package/v2Containers/Whatsapp/index.js

@@ -60,6 +60,7 @@ import {
   WHATSAPP_IMG_SIZE,
   HOST_TWILIO,
   HOST_KARIX,
+  HOST_GUPSHUP,
   ALLOWED_EXTENSIONS_VIDEO_REGEX,
   ALLOWED_EXTENSIONS_DOCUMENT_REGEX,
   WHATSAPP_DOCUMENT_SIZE,
@@ -715,7 +716,7 @@ export const Whatsapp = (props) => {
       accessToken,
       hostName: host,
     };
-    if (isFullMode && !isEditFlow && host !== HOST_KARIX) {
+    if (isFullMode && !isEditFlow && host === HOST_GUPSHUP) {
       setGupshupMediaFile(file);
     }
     actions.uploadWhatsappAsset(file, type, fileParams, 0, whatsappParams);
@@ -965,7 +966,7 @@ export const Whatsapp = (props) => {
     switch (templateMediaType) {
       case WHATSAPP_MEDIA_TYPES.IMAGE:
         mediaParams = {
-          imageUrl: getCdnUrl({url: whatsappImageSrc, channelName: WHATSAPP }),
+          imageUrl: host === HOST_GUPSHUP ? whatsappImageSrc : getCdnUrl({url: whatsappImageSrc, channelName: WHATSAPP }),
           karixFileHandle,
         };
         break;
@@ -1035,14 +1036,14 @@ export const Whatsapp = (props) => {
 
   const createApprovalHandler = () => {
     setSpin(true);
-    actions.createWhatsappTemplate(gupshupMediaFile, createPayload(), (resp, errorMessage) => {
+    actions.createWhatsappTemplate(createPayload(), (resp, errorMessage) => {
       actionCallback({ resp, errorMessage });
       if (!errorMessage) {
         onCreateComplete();
       } else {
         setSpin(false);
       }
-    });
+    }, gupshupMediaFile);
   };
 
   const onDoneCallback = () => {

package/v2Containers/Whatsapp/sagas.js

@@ -36,10 +36,10 @@ function* watchUploadWhatsappAsset() {
   yield cancel(watcher);
 }
 
-export function* sendForApprovalCreate({ gupshupMediaFile, payload, callback }) {
+export function* sendForApprovalCreate({ payload, callback, gupshupMediaFile }) {
   let errorMsg;
   try {
-    const result = yield call(Api.createWhatsappTemplate, { gupshupMediaFile, payload });
+    const result = yield call(Api.createWhatsappTemplate, { payload, gupshupMediaFile });
     if (result?.status?.code && result.status.code >= 400) {
       errorMsg = result?.message || result.status.code;
       throw errorMsg;

package/v2Containers/Whatsapp/tests/__snapshots__/index.test.js.snap

@@ -411621,7 +411621,6 @@ exports[`Creatives Whatsapp test2/> set all valid values and send for approval 2
         "createWhatsappTemplate": [MockFunction] {
           "calls": Array [
             Array [
-              undefined,
               Object {
                 "name": "template_name",
                 "type": "WHATSAPP",
@@ -411658,6 +411657,7 @@ undefined",
                 },
               },
               [Function],
+              undefined,
             ],
           ],
           "results": Array [
@@ -431197,7 +431197,6 @@ exports[`Creatives Whatsapp test2/> set all valid values and send for approval 3
         "createWhatsappTemplate": [MockFunction] {
           "calls": Array [
             Array [
-              undefined,
               Object {
                 "name": "template_name",
                 "type": "WHATSAPP",
@@ -431240,6 +431239,7 @@ undefined",
                 },
               },
               [Function],
+              undefined,
             ],
           ],
           "results": Array [

package/v2Containers/Whatsapp/tests/actions.test.js

@@ -30,12 +30,12 @@ describe('Test whatsapp actions', () => {
     };
     const expected = {
       type: types.TEMPLATE_CREATE_REQUEST,
-      gupshupMediaFile: undefined,
       payload,
       callback: undefined,
+      gupshupMediaFile: undefined,
     };
     expect(
-      actions.createWhatsappTemplate(undefined, payload, undefined),
+      actions.createWhatsappTemplate(payload, undefined, undefined),
     ).toStrictEqual(expected);
   });
 });

package/v2Containers/Whatsapp/tests/index.test.js

@@ -309,7 +309,7 @@ describe('Creatives Whatsapp test2/>', () => {
     constants.INITIAL_CTA_DATA = [];
     renderHelper({});
     let event = { target: { value: 'template_name' } };
-    createWhatsappTemplate.mockImplementation((undefined, obj, callback) => {
+    createWhatsappTemplate.mockImplementation((obj, callback, undefined) => {
       callback();
     });
 
@@ -359,7 +359,7 @@ describe('Creatives Whatsapp test2/>', () => {
     ];
     renderHelper({});
     let event = { target: { value: 'template_name' } };
-    createWhatsappTemplate.mockImplementation((undefined, obj, callback) => {
+    createWhatsappTemplate.mockImplementation((obj, callback, undefined) => {
       callback();
     });
 
@@ -419,7 +419,7 @@ describe('Creatives Whatsapp test2/>', () => {
     ];
     renderHelper({});
     let event = { target: { value: 'template_name' } };
-    createWhatsappTemplate.mockImplementation((undefined, obj, callback) => {
+    createWhatsappTemplate.mockImplementation((obj, callback, undefined) => {
       callback();
     });