@capillarytech/creatives-library 8.0.65 → 8.0.67

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

@@ -6,10 +6,9 @@ import {
   bytesConversion,
   getWhatsappDocPreview,
   getWhatsappQuickReply,
-  getWhatsappAutoFill,
+  getWhatsappAutoFill
 } from '../utils';
 import mockdata from '../../mockdata';
-import { HOST_ICS } from '../constants';
 
 const {
   whatsappPreviewTemplateData,
@@ -17,7 +16,6 @@ const {
   whatsappPreviewTemplateDataVid,
   whatsappPreviewTemplateDataDoc,
   getWhatsappStatusOutput1,
-  getWhatsappStatusOutput2,
   getWhatsappCategoryOutput1,
   getWhatsappCategoryOutput2,
   getWhatsappDocPreviewOutput,
@@ -25,7 +23,7 @@ const {
   whatsappPreviewTemplateData3,
   whatsappPreviewTemplateData3Result,
   whatsappPreviewTemplateData3QuickReplyResult,
-  getWhatsappAutoFillData,
+  getWhatsappAutoFillData
 } = mockdata;
 
 describe('Test utils', () => {
@@ -60,8 +58,6 @@ describe('Test utils', () => {
 
   it('test getWhatsappStatus', () => {
     expect(getWhatsappStatus('approved')).toEqual(getWhatsappStatusOutput1);
-    expect(getWhatsappStatus('awaitingApproval')).toEqual(getWhatsappStatusOutput2);
-    expect(getWhatsappStatus('pending')).toEqual(getWhatsappStatusOutput2);
   });
 
   it('test getWhatsappCategory', () => {
@@ -71,9 +67,6 @@ describe('Test utils', () => {
     expect(getWhatsappCategory('UTILITY', 'karixwhatsappbulk')).toEqual(
       getWhatsappCategoryOutput2,
     );
-    expect(getWhatsappCategory('UTILITY', HOST_ICS)).toEqual(
-      getWhatsappCategoryOutput2,
-    );
   });
   it('test getWhatsappAutoFill', () => {
     expect(getWhatsappAutoFill({versions:{base:{content:{whatsapp:{category: 'AUTHENTICATION'}}}}})).toEqual(

package/v2Containers/Whatsapp/utils.js

@@ -12,7 +12,6 @@ import {
   TWILIO_CATEGORY_OPTIONS,
   KARIX_GUPSHUP_CATEGORY_OPTIONS,
   KARIX_GUPSHUP_OLDER_CATEGORY_OPTIONS,
-  ICS_CATEGORY_OPTIONS,
   WHATSAPP_STATUSES,
   PHONE_NUMBER,
   NONE,
@@ -20,8 +19,7 @@ import {
   WHATSAPP_MEDIA_TYPES,
   HOST_TWILIO,
   SIZE_UNITS,
-  QUICK_REPLY,
-  HOST_ICS,
+  QUICK_REPLY
 } from '../Whatsapp/constants';
 import './styles.scss';
 import pdfIcon from "../../assets/pdfIcon.svg";
@@ -206,16 +204,9 @@ export const getWhatsappAutoFill = (template) => {
   return <></>
 }
 
-export const getWhatsappCategory = (category, hostName) => {
-  const categoryMap = {
-    [HOST_TWILIO]: TWILIO_CATEGORY_OPTIONS,
-    [HOST_ICS]: ICS_CATEGORY_OPTIONS,
-  };
-
-  const categoryOptions = categoryMap[hostName] || [...KARIX_GUPSHUP_CATEGORY_OPTIONS, ...KARIX_GUPSHUP_OLDER_CATEGORY_OPTIONS];
-
-  return categoryOptions?.find((obj) => obj?.value === category);
-};
+export const getWhatsappCategory = (category, hostName) => (
+    hostName === HOST_TWILIO ? TWILIO_CATEGORY_OPTIONS : [...KARIX_GUPSHUP_CATEGORY_OPTIONS, ...KARIX_GUPSHUP_OLDER_CATEGORY_OPTIONS]
+  ).find((obj) => obj.value === category);
 
 export const getWhatsappStatus = (status) => {
   if ([WHATSAPP_STATUSES.pending, WHATSAPP_STATUSES.unsubmitted].includes(status)) {

package/v2Containers/Zalo/index.js

@@ -73,7 +73,8 @@ export const Zalo = (props) => {
     hostName: zaloHostName = '',
     eventContextTags,
   } = props || {};
-  const {hostName = zaloHostName || ''} = senderDetails;
+  // Since zalo supports now multiple accounts, we need to get the hostname from the selected account or passed props.
+  const hostName = selectedZaloAccount?.hostName || zaloHostName;
   const { formatMessage } = intl;
   const [oa_id, setOaId] = useState('');
   const [token, setToken] = useState('');

package/v2Containers/mockdata.js

@@ -12,15 +12,15 @@ export default {
       isActive: true,
       sourceTypeId: 19,
       configs: {
-        accessToken: "Bearer gDwEuRIm9icV6phixociSw==",
+        accessToken: "Bearer abcd",
         promotionalMessagingSSID: "",
         transactionalMessagingSSID: "",
       },
       hostName: "karixwhatsappbulk",
       toMirror: true,
       id: 12721,
-      uuid: "93c52a35824a4bea8650d7d0232b2e3c",
-      sourceAccountIdentifier: "107499611940863",
+      uuid: "abc12",
+      sourceAccountIdentifier: "12345",
       commChannels: ["whatsapp"],
     },
     getAllTemplatesInProgress: false,
@@ -28,6 +28,114 @@ export default {
     weCRMtemplates: [],
     senderDetails: {
       status: "SUCCESS",
+      domainProperties: [
+        {
+            "id": 249341,
+            "orgId": 50074,
+            "label": "",
+            "domainProperties": {
+                "id": 3972,
+                "domainName": "whatsapp_mobile_push",
+                "description": "whatsapp_mobile_push_karix",
+                "contactInfo": [
+                    {
+                        "id": 100776,
+                        "domainPropId": 3972,
+                        "messageClass": "WHATSAPP",
+                        "type": "gsm_sender_id",
+                        "label": "whatsapptesting",
+                        "value": "919611759663",
+                        "valid": true,
+                        "default": true
+                    },
+                    {
+                        "id": 102485,
+                        "domainPropId": 3972,
+                        "messageClass": "WHATSAPP",
+                        "type": "cdma_sender_id",
+                        "label": "whatsapptesting",
+                        "value": "919611759663",
+                        "valid": true,
+                        "default": true
+                    },
+                    {
+                        "id": 102486,
+                        "domainPropId": 3972,
+                        "messageClass": "WHATSAPP",
+                        "type": "cdma_sender_id",
+                        "label": "not_working",
+                        "value": "919876543210",
+                        "valid": true,
+                        "default": false
+                    },
+                    {
+                        "id": 102487,
+                        "domainPropId": 3972,
+                        "messageClass": "WHATSAPP",
+                        "type": "gsm_sender_id",
+                        "label": "not_working",
+                        "value": "919876543210",
+                        "valid": true,
+                        "default": false
+                    }
+                ],
+                "xengageEnabled": false,
+                "connectionProperties": {
+                    "919611759663_whatsapp_pool_id": "CAP001",
+                    "authToken": "Bearer abcd",
+                    "sourceAccountIdentifier": "12345",
+                    "wabaId": "12345",
+                    "whatsapp_pool_id": "CAP001"
+                },
+                "hostName": "karixwhatsappbulk"
+            },
+            "priority": 1,
+            "valid": true
+        },
+        {
+            "id": 276278,
+            "orgId": 50074,
+            "label": "",
+            "domainProperties": {
+                "id": 4294,
+                "domainName": "gupshup",
+                "description": "gupshup whatsapp test",
+                "contactInfo": [
+                    {
+                        "id": 101616,
+                        "domainPropId": 4294,
+                        "messageClass": "WHATSAPP",
+                        "type": "gsm_sender_id",
+                        "label": "gupshup test",
+                        "value": "gupshuptest",
+                        "description": "",
+                        "valid": true,
+                        "default": true
+                    },
+                    {
+                        "id": 101617,
+                        "domainPropId": 4294,
+                        "messageClass": "WHATSAPP",
+                        "type": "cdma_sender_id",
+                        "label": "gupshupt est",
+                        "value": "gupshuptest",
+                        "description": "",
+                        "valid": true,
+                        "default": true
+                    }
+                ],
+                "xengageEnabled": false,
+                "connectionProperties": {
+                    "password": "qrtCAJCz",
+                    "sourceAccountIdentifier": "123456",
+                    "userid": "123456"
+                },
+                "hostName": "gupshupwhatsappbulk"
+            },
+            "priority": 1,
+            "valid": true
+        },
+    ],
       hostName: "karixwhatsappbulk",
       errors: [],
     },
@@ -42,14 +150,14 @@ export default {
         isActive: true,
         sourceTypeId: 19,
         configs: {
-          accessToken: "Bearer gDwEuRIm9icV6phixociSw==",
+          accessToken: "Bearer abcd",
           promotionalMessagingSSID: "",
           transactionalMessagingSSID: "",
         },
         toMirror: true,
         id: 12721,
-        uuid: "93c52a35824a4bea8650d7d0232b2e3c",
-        sourceAccountIdentifier: "107499611940863",
+        uuid: "abc12",
+        sourceAccountIdentifier: "12345",
         commChannels: ["whatsapp"],
       },
     ],
@@ -68,8 +176,8 @@ export default {
                 status: "pending",
                 templateId: "720951875646523",
                 hostName: "karixwhatsappbulk",
-                accessToken: "Bearer gDwEuRIm9icV6phixociSw==",
-                accountId: "107499611940863",
+                accessToken: "Bearer abcd",
+                accountId: "12345",
                 templateEditor: false,
                 karixFileHandle:
                   "4::aW1hZ2UvanBlZw==:ARZpmm0pMfsBvKepIjR-HG2HIw_78ynisr-riY1s4xpi2noK9QsvtvVfnZb5hUxks5HM5JHG0gCn_ZtPuJzya1SH3eq4Upn3M0eqsDLr4CzdPw:e:1658404714:259409122277300:100066839164237:ARbbCRjU-2ksqoUOp4Y",
@@ -124,8 +232,8 @@ export default {
                 status: "pending",
                 templateId: "4916570121786087",
                 hostName: "karixwhatsappbulk",
-                accessToken: "Bearer gDwEuRIm9icV6phixociSw==",
-                accountId: "107499611940863",
+                accessToken: "Bearer abcd",
+                accountId: "12345",
                 templateEditor: false,
                 karixFileHandle:
                   "4::aW1hZ2UvanBlZw==:ARY0H4Z85fo_TTfmAYJpqpnSbBlE3VaIYyr9S_Exg7GV_EhOo-30AVAoe35d0ZH8Cx5ZaJ3U2RovzzqVHPUnMK_7wFY7RNngsTwWc4vnZ7bMoA:e:1658404539:259409122277300:100066839164237:ARaPlACD4a5lw9Wp4X4",
@@ -173,8 +281,8 @@ export default {
                 status: "pending",
                 templateId: "732848961277130",
                 hostName: "karixwhatsappbulk",
-                accessToken: "Bearer gDwEuRIm9icV6phixociSw==",
-                accountId: "107499611940863",
+                accessToken: "Bearer abcd",
+                accountId: "12345",
                 templateEditor: false,
                 karixFileHandle:
                   "4::aW1hZ2UvanBlZw==:ARYfsmvPHCeI0Q3ixfzpZ3gOIoYjrkx6STalsi58_twFIqB5rvPKsKPH7yL_eXMfbmXGq_X0qiLrL7FaSSFq_uzudytfoOj9Oh5ueb1uUV367A:e:1658404470:259409122277300:100066839164237:ARaaojq13hSRpe7h0Tw",
@@ -223,8 +331,8 @@ export default {
                 status: "pending",
                 templateId: "993272384701160",
                 hostName: "karixwhatsappbulk",
-                accessToken: "Bearer gDwEuRIm9icV6phixociSw==",
-                accountId: "107499611940863",
+                accessToken: "Bearer abcd",
+                accountId: "12345",
                 templateEditor: false,
                 karixFileHandle:
                   "4::aW1hZ2UvanBlZw==:ARa6WKa8LHjcJf2DBWokWtAvxkowam2zBaUJvEwxyWH2EamzQv7-GlX7bsf6IKkdWKLAATpfo_vkAgQ8mWLf2wvVNEVBmPWk3yyrWDnVI44_9A:e:1658404412:259409122277300:100066839164237:ARYyRilqCb6hSKHtjYQ",
@@ -264,8 +372,8 @@ export default {
                 status: "pending",
                 templateId: "1838206886365227",
                 hostName: "karixwhatsappbulk",
-                accessToken: "Bearer gDwEuRIm9icV6phixociSw==",
-                accountId: "107499611940863",
+                accessToken: "Bearer abcd",
+                accountId: "12345",
                 templateEditor: false,
                 mediaType: "TEXT",
                 languages: [
@@ -301,8 +409,8 @@ export default {
                 status: "pending",
                 templateId: "412858944197174",
                 hostName: "karixwhatsappbulk",
-                accessToken: "Bearer gDwEuRIm9icV6phixociSw==",
-                accountId: "107499611940863",
+                accessToken: "Bearer abcd",
+                accountId: "12345",
                 templateEditor: false,
                 mediaType: "TEXT",
                 languages: [
@@ -1150,7 +1258,7 @@ export default {
     channel: "EMAIL",
     validity: true,
   },
-  getWhatsappContentOutput: "1234567890\nClick {{unsubscribe}} to unsubscribe",
+  getWhatsappContentOutput: "123450\nClick {{unsubscribe}} to unsubscribe",
   getWhatsappStatusOutput1: {
     key: "approved",
     label: (
@@ -1162,17 +1270,6 @@ export default {
     ),
     value: "approved",
   },
-  getWhatsappStatusOutput2: {
-    key: "awaitingApproval",
-    label: (
-      <FormattedMessage
-        defaultMessage="Awaiting approval"
-        id="creatives.containersV2.Whatsapp.awaitingApproval"
-        values={{}}
-      />
-    ),
-    value: "awaitingApproval",
-  },
   getWhatsappCategoryOutput1: {
     key: "alertUpdate",
     label: (
@@ -1227,8 +1324,8 @@ export default {
             status: "approved",
             templateId: "720951875646523",
             hostName: "karixwhatsappbulk",
-            accessToken: "Bearer gDwEuRIm9icV6phixociSw==",
-            accountId: "107499611940863",
+            accessToken: "Bearer abcd",
+            accountId: "12345",
             templateEditor: false,
             karixFileHandle:
               "4::aW1hZ2UvanBlZw==:ARZpmm0pMfsBvKepIjR-HG2HIw_78ynisr-riY1s4xpi2noK9QsvtvVfnZb5hUxks5HM5JHG0gCn_ZtPuJzya1SH3eq4Upn3M0eqsDLr4CzdPw:e:1658404714:259409122277300:100066839164237:ARbbCRjU-2ksqoUOp4Y",
@@ -1285,8 +1382,8 @@ export default {
             status: "approved",
             templateId: "720951875646523",
             hostName: "karixwhatsappbulk",
-            accessToken: "Bearer gDwEuRIm9icV6phixociSw==",
-            accountId: "107499611940863",
+            accessToken: "Bearer abcd",
+            accountId: "12345",
             templateEditor: false,
             karixFileHandle:
               "4::aW1hZ2UvanBlZw==:ARZpmm0pMfsBvKepIjR-HG2HIw_78ynisr-riY1s4xpi2noK9QsvtvVfnZb5hUxks5HM5JHG0gCn_ZtPuJzya1SH3eq4Upn3M0eqsDLr4CzdPw:e:1658404714:259409122277300:100066839164237:ARbbCRjU-2ksqoUOp4Y",
@@ -1345,8 +1442,8 @@ export default {
             status: "approved",
             templateId: "720951875646523",
             hostName: "karixwhatsappbulk",
-            accessToken: "Bearer gDwEuRIm9icV6phixociSw==",
-            accountId: "107499611940863",
+            accessToken: "Bearer abcd",
+            accountId: "12345",
             templateEditor: false,
             karixFileHandle:
               "4::aW1hZ2UvanBlZw==:ARZpmm0pMfsBvKepIjR-HG2HIw_78ynisr-riY1s4xpi2noK9QsvtvVfnZb5hUxks5HM5JHG0gCn_ZtPuJzya1SH3eq4Upn3M0eqsDLr4CzdPw:e:1658404714:259409122277300:100066839164237:ARbbCRjU-2ksqoUOp4Y",