@capillarytech/creatives-library 7.14.29 → 7.14.31

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "7.14.29",
+  "version": "7.14.31",
   "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

@@ -1,31 +1,46 @@
-import { getSenderDetails, uploadFile, getCdnTransformationConfig } from "../api";
+import {
+  getSenderDetails,
+  uploadFile,
+  getCdnTransformationConfig,
+  createWhatsappTemplate
+} from '../api';
+import { mockData } from './mockData';
+const sampleFile = require('../../assets/line.png');
 
-describe("getSenderDetails -- Test with valid responses", () => {
-  it("Should return correct response", () =>
-    expect(getSenderDetails("WHATSAPP", -1)).toEqual(Promise.resolve()));
+describe('getSenderDetails -- Test with valid responses', () => {
+  it('Should return correct response', () =>
+    expect(getSenderDetails('WHATSAPP', -1)).toEqual(Promise.resolve()));
 });
 
-describe("getCdnTransformationConfigs -- Test with valid responses", () => {
-  it("Should return correct response", () =>
+describe('getCdnTransformationConfigs -- Test with valid responses', () => {
+  it('Should return correct response', () =>
     expect(getCdnTransformationConfig()).toEqual(Promise.resolve()));
 });
 
-describe("uploadFile -- whatsapp image upload", () => {
-  it("Should return correct response", () =>
+describe('uploadFile -- whatsapp image upload', () => {
+  it('Should return correct response', () =>
     expect(
       uploadFile({
         file: new Image(),
-        assetType: "image",
+        assetType: 'image',
         fileParams: {
           width: 275,
           height: 183,
           error: false,
         },
         whatsappParams: {
-          source: "whatsapp",
-          wabaId: "107499611940863",
-          accessToken: "Bearer gDwEuRIm9icV6phixociSw==",
+          source: 'whatsapp',
+          wabaId: '107499611940863',
+          accessToken: 'Bearer gDwEuRIm9icV6phixociSw==',
+          hostName: 'karixwhatsappbulk',
         },
-      })
+      }),
+    ).toEqual(Promise.resolve()));
+});
+
+describe('createWhatsappTemplate -- Test with valid responses', () => {
+  it('Should return correct response', () =>
+    expect(
+      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/v2Components/CapWhatsappCTA/tests/index.test.js

@@ -152,4 +152,20 @@ describe('CapWhatsappCTA', () => {
       screen.getByText(/https:\/\/www\.google\.co\.in/i),
     ).toBeInTheDocument();
   });
+  it('Test if gupshup CapWhatsappCTA component renders', () => {
+    initializeComponent([
+      {
+        index: 0,
+        ctaType: 'WEBSITE',
+        text: 'info',
+        phone_number: '',
+        urlType: 'STATIC_URL',
+        url: 'https://www.google.co.in',
+        isSaved: false,
+      },
+    ], false, 'gupshupwhatsappbulk');
+    expect(screen.getByText('Type of action')).toBeInTheDocument();
+    expect(screen.getByText('Button text')).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: /save/i })).toBeEnabled();
+  });
 });

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);
@@ -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 = () => {
@@ -1157,7 +1158,7 @@ export const Whatsapp = (props) => {
       <CapSelect
         id="select-whatsapp-category"
         options={
-          host === HOST_KARIX ? karixGupshupCategoryOptions : twilioCategoryOptions
+          host === HOST_TWILIO ? twilioCategoryOptions : karixGupshupCategoryOptions
         }
         onChange={onTemplateCategoryChange}
         value={templateCategory}

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;