@capillarytech/creatives-library 8.0.353-alpha.6 → 8.0.354

package/v2Containers/WeChat/MapTemplates/test/saga.test.js

@@ -11,7 +11,7 @@ describe('WeChat Template Management Sagas', () => {
   describe('getDefaultWeChatTemplates Saga', () => {
     const params = { channel: 'WeChat', queryParams: { type: 'default' } };
 
-    it('handles fetching default WeChat templates successfully', () => {
+    it.concurrent('handles fetching default WeChat templates successfully', () => {
       const fakeResponse = {
         response: {
           unMapped: [{ id: 1, name: 'Template One' }],
@@ -31,7 +31,7 @@ describe('WeChat Template Management Sagas', () => {
         .run();
     });
 
-    it('handles failure in fetching default WeChat templates', () => {
+    it.concurrent('handles failure in fetching default WeChat templates', () => {
       const error = new Error('Fetch failed');
 
       return expectSaga(sagas.getDefaultWeChatTemplates, params)
@@ -48,7 +48,7 @@ describe('WeChat Template Management Sagas', () => {
 
   describe('createTemplate Saga', () => {
     const template = { name: 'New WeChat Template' };
-    test('handles creating a WeChat template successfully', () => {
+    test.concurrent('handles creating a WeChat template successfully', () => {
       const fakeResponse = {
         response: template,
         status: { code: 200 }
@@ -64,7 +64,7 @@ describe('WeChat Template Management Sagas', () => {
         })
         .run();
     });
-    test('handles failure when creating a WeChat template', () => {
+    test.concurrent('handles failure when creating a WeChat template', () => {
       const error = new Error('Creation failed');
       return expectSaga(sagas.createTemplate, template)
         .provide([
@@ -79,7 +79,7 @@ describe('WeChat Template Management Sagas', () => {
   });
 
   describe('fetchWeCrmAccounts Saga', () => {
-    it('handles fetching WeCrm accounts successfully', () => {
+    it.concurrent('handles fetching WeCrm accounts successfully', () => {
       const fakeResponse = {
         response: [{ id: 1, name: 'Account One' }]
       };
@@ -95,7 +95,7 @@ describe('WeChat Template Management Sagas', () => {
         .run();
     });
 
-    it('handles failure in fetching WeCrm accounts', () => {
+    it.concurrent('handles failure in fetching WeCrm accounts', () => {
       const error = new Error('Fetch failed');
 
       return expectSaga(sagas.fetchWeCrmAccounts)
@@ -113,7 +113,7 @@ describe('WeChat Template Management Sagas', () => {
   describe('getTemplateDetails Saga', () => {
     const id = '123';
 
-    it('handles fetching template details successfully', () => {
+    it.concurrent('handles fetching template details successfully', () => {
       const fakeResponse = {
         response: { id: 123, name: 'Detailed Template' }
       };
@@ -129,7 +129,7 @@ describe('WeChat Template Management Sagas', () => {
         .run();
     });
 
-    it('handles failure in fetching template details', () => {
+    it.concurrent('handles failure in fetching template details', () => {
       const error = new Error('Fetch failed');
 
       return expectSaga(sagas.getTemplateDetails, id)
@@ -148,7 +148,7 @@ describe('WeChat Template Management Sagas', () => {
 
   // Test combined saga
   describe('Combined v2WechatMapTemplatesSagas', () => {
-    it('should initialize all WeChat-related watcher sagas without error', () => {
+    it.concurrent('should initialize all WeChat-related watcher sagas without error', () => {
       return expectSaga(v2WechatMapTemplatesSagas)
         .run();
     });

package/v2Containers/Whatsapp/index.js

@@ -119,7 +119,6 @@ import { ANDROID } from '../../v2Components/CommonTestAndPreview/constants';
 import CapImageUpload from '../../v2Components/CapImageUpload';
 import TagList from '../TagList';
 import { validateTags } from '../../utils/tagValidations';
-import { splitContentByOrderedVarTokens } from '../../utils/templateVarUtils';
 import { capitalizeString } from '../../utils/Formatter';
 import CapWhatsappCTA from '../../v2Components/CapWhatsappCTA';
 import {
@@ -497,10 +496,28 @@ export const Whatsapp = (props) => {
     );
   };
 
+  const converStringToVarArr = (validVarArr, content) => {
+    const templateVarArray = [];
+    while (content?.length !== 0) {
+      //converting content string to an array split at var
+      const index = content.indexOf(validVarArr?.[0]);
+      if (index !== -1) {
+        templateVarArray.push(content.substring(0, index)); //push string before var
+        templateVarArray.push(validVarArr?.[0]); //push var
+        content = content.substring(index + validVarArr?.[0]?.length, content?.length); //remaining str
+        validVarArr?.shift(); //remove considered var
+      } else {
+        templateVarArray.push(content); //remaining str
+        break;
+      }
+    }
+    return templateVarArray;
+  }
+
   const computeTextMessage = (msg, varMap, regex) => {
     const validVarArr = msg?.match(regex) || [];
     //conerting msg string to variable arr
-    const templateHeaderArray = splitContentByOrderedVarTokens(validVarArr, msg);
+    const templateHeaderArray = converStringToVarArr(validVarArr, msg);
     if (templateHeaderArray?.length !== 0) {
       let clonedVarMap = {};
       if (!isEmpty(varMap)) {
@@ -554,7 +571,7 @@ export const Whatsapp = (props) => {
       setUnsubscribeRequired(true);
     }
     //converting msg string to variable arr
-    const templateMessageArray = splitContentByOrderedVarTokens(validVarArr, msg);
+    const templateMessageArray = converStringToVarArr(validVarArr, msg);
     updateTempMsgArray(templateMessageArray.filter((i) => i === 0 || i));
   };