@capillarytech/creatives-library 8.0.65 → 8.0.67

package/v2Containers/Templates/reducer.js

@@ -180,12 +180,17 @@ function templatesReducer(state = initialState, action) {
       return state.set('fetchedOrgLevelCampaignSettings', false);
     case types.GET_SENDER_DETAILS_REQUEST:
       return state.set('senderDetails', { status: 'REQUEST' });
-    case types.GET_SENDER_DETAILS_SUCCESS:
+    case types.GET_SENDER_DETAILS_SUCCESS: {
+      const { channel, domainProperties = {} } = action?.payload || {};
+      const isMultiAccountChannel = ['WHATSAPP', 'ZALO'].includes(channel);
+      const senderDetailsKey = isMultiAccountChannel ? 'domainProperties' : 'hostName';
+      // For Whatsapp and Zalo we need to store domainProperties instead of only hostName
       return state.set('senderDetails', {
         status: 'SUCCESS',
-        hostName: action.payload,
+        [senderDetailsKey]: isMultiAccountChannel ? domainProperties : action?.payload,
         errors: [],
       });
+    }
     case types.GET_SENDER_DETAILS_FAILURE:
       return state.set('senderDetails', {
         status: 'FAILURE',

package/v2Containers/Templates/sagas.js

@@ -161,8 +161,13 @@ export function* getSenderDetails({
     if (!apiResponse?.errors?.length) {
       yield put({
         type: types.GET_SENDER_DETAILS_SUCCESS,
-        payload: get(apiResponse, `entity.${channel}[0].domainProperties.hostName`, ''),
+        payload: ['WHATSAPP', 'ZALO'].includes(channel) ?
+        { channel,
+          domainProperties: get(apiResponse, `entity.${channel}`, '')
+        } :
+        get(apiResponse, `entity.${channel}[0].domainProperties.hostName`, ''),
       });
+      
     } else {
       yield put({
         type: types.GET_SENDER_DETAILS_FAILURE,

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

@@ -10,11 +10,49 @@ exports[`Test Templates container Should render correct component for whatsapp c
     }
   }
 >
-  <FormattedMessage
-    defaultMessage="Whatsapp accounts are not setup for your brand"
-    id="creatives.containersV2.Templates.noAccountsPresentWhatsapp"
-    values={Object {}}
-  />
+  <div
+    style={
+      Object {
+        "overflowX": "auto",
+        "paddingBottom": "1.142rem",
+      }
+    }
+  >
+    <CapHeader
+      className="select-account-header"
+      description="Choose the account to send content"
+      descriptionClass=""
+      inline={false}
+      size="regular"
+      title="Whatsapp account"
+      titleClass=""
+    />
+    <CapRadioCard
+      cardHeight="48px"
+      cardWidth="276px"
+      className="select-account"
+      defaultValue=""
+      onChange={[Function]}
+      panes={
+        Array [
+          Object {
+            "icon": <CapIconAvatar
+              backgroundProps={Object {}}
+              height="2rem"
+              labelProps={Object {}}
+              text="W"
+              width="auto"
+            />,
+            "key": "abc12",
+            "title": "WhatsappAccount",
+            "value": "WhatsappAccount",
+          },
+        ]
+      }
+      selected=""
+      size="small"
+    />
+  </div>
 </CapSkeleton>
 `;
 
@@ -190,6 +228,30 @@ exports[`Test Templates container Should render temlates when whatsapp templates
         templateInProgress={false}
       >
         <div>
+          <CapHeader
+            description={
+              <React.Fragment>
+                <CapHeading
+                  type="h3"
+                >
+                  
+                   
+                   
+                </CapHeading>
+              </React.Fragment>
+            }
+            descriptionClass=""
+            inline={false}
+            size="regular"
+            title={
+              <CapHeading
+                type="h4"
+              >
+                Whatsapp account
+              </CapHeading>
+            }
+            titleClass=""
+          />
           <div
             className="action-container"
           >
@@ -423,6 +485,30 @@ exports[`Test Templates container Should render temlates when whatsapp templates
         templateInProgress={false}
       >
         <div>
+          <CapHeader
+            description={
+              <React.Fragment>
+                <CapHeading
+                  type="h3"
+                >
+                  
+                   
+                   
+                </CapHeading>
+              </React.Fragment>
+            }
+            descriptionClass=""
+            inline={false}
+            size="regular"
+            title={
+              <CapHeading
+                type="h4"
+              >
+                Whatsapp account
+              </CapHeading>
+            }
+            titleClass=""
+          />
           <div
             className="action-container"
           >
@@ -474,24 +560,6 @@ exports[`Test Templates container Should render temlates when whatsapp templates
                       />,
                       "value": "rejected",
                     },
-                    Object {
-                      "key": "pending",
-                      "label": <FormattedMessage
-                        defaultMessage="Pending"
-                        id="creatives.containersV2.Whatsapp.pending"
-                        values={Object {}}
-                      />,
-                      "value": "pending",
-                    },
-                    Object {
-                      "key": "paused",
-                      "label": <FormattedMessage
-                        defaultMessage="Paused"
-                        id="creatives.containersV2.Whatsapp.paused"
-                        values={Object {}}
-                      />,
-                      "value": "paused",
-                    },
                   ]
                 }
                 dropdownMaxHeight="320px"
@@ -800,6 +868,30 @@ exports[`Test Templates container Test max templates exceeded 1`] = `
         templateInProgress={false}
       >
         <div>
+          <CapHeader
+            description={
+              <React.Fragment>
+                <CapHeading
+                  type="h3"
+                >
+                  
+                   
+                   
+                </CapHeading>
+              </React.Fragment>
+            }
+            descriptionClass=""
+            inline={false}
+            size="regular"
+            title={
+              <CapHeading
+                type="h4"
+              >
+                Whatsapp account
+              </CapHeading>
+            }
+            titleClass=""
+          />
           <div
             className="action-container"
           >
@@ -851,24 +943,6 @@ exports[`Test Templates container Test max templates exceeded 1`] = `
                       />,
                       "value": "rejected",
                     },
-                    Object {
-                      "key": "pending",
-                      "label": <FormattedMessage
-                        defaultMessage="Pending"
-                        id="creatives.containersV2.Whatsapp.pending"
-                        values={Object {}}
-                      />,
-                      "value": "pending",
-                    },
-                    Object {
-                      "key": "paused",
-                      "label": <FormattedMessage
-                        defaultMessage="Paused"
-                        id="creatives.containersV2.Whatsapp.paused"
-                        values={Object {}}
-                      />,
-                      "value": "paused",
-                    },
                   ]
                 }
                 dropdownMaxHeight="320px"
@@ -1136,8 +1210,8 @@ Click {{unsubscribe}} to unsubscribe
                                   "base": Object {
                                     "content": Object {
                                       "whatsapp": Object {
-                                        "accessToken": "Bearer gDwEuRIm9icV6phixociSw==",
-                                        "accountId": "107499611940863",
+                                        "accessToken": "Bearer abcd",
+                                        "accountId": "12345",
                                         "buttonType": "CTA",
                                         "buttons": Array [
                                           Object {
@@ -1273,6 +1347,30 @@ exports[`Test Templates container Test max templates not exceeded 1`] = `
         templateInProgress={false}
       >
         <div>
+          <CapHeader
+            description={
+              <React.Fragment>
+                <CapHeading
+                  type="h3"
+                >
+                  
+                   
+                   
+                </CapHeading>
+              </React.Fragment>
+            }
+            descriptionClass=""
+            inline={false}
+            size="regular"
+            title={
+              <CapHeading
+                type="h4"
+              >
+                Whatsapp account
+              </CapHeading>
+            }
+            titleClass=""
+          />
           <div
             className="action-container"
           >
@@ -1324,24 +1422,6 @@ exports[`Test Templates container Test max templates not exceeded 1`] = `
                       />,
                       "value": "rejected",
                     },
-                    Object {
-                      "key": "pending",
-                      "label": <FormattedMessage
-                        defaultMessage="Pending"
-                        id="creatives.containersV2.Whatsapp.pending"
-                        values={Object {}}
-                      />,
-                      "value": "pending",
-                    },
-                    Object {
-                      "key": "paused",
-                      "label": <FormattedMessage
-                        defaultMessage="Paused"
-                        id="creatives.containersV2.Whatsapp.paused"
-                        values={Object {}}
-                      />,
-                      "value": "paused",
-                    },
                   ]
                 }
                 dropdownMaxHeight="320px"
@@ -1591,8 +1671,8 @@ Click {{unsubscribe}} to unsubscribe
                                   "base": Object {
                                     "content": Object {
                                       "whatsapp": Object {
-                                        "accessToken": "Bearer gDwEuRIm9icV6phixociSw==",
-                                        "accountId": "107499611940863",
+                                        "accessToken": "Bearer abcd",
+                                        "accountId": "12345",
                                         "buttonType": "CTA",
                                         "buttons": Array [
                                           Object {
@@ -1728,6 +1808,30 @@ exports[`Test Templates container Test max templates warning 1`] = `
         templateInProgress={false}
       >
         <div>
+          <CapHeader
+            description={
+              <React.Fragment>
+                <CapHeading
+                  type="h3"
+                >
+                  
+                   
+                   
+                </CapHeading>
+              </React.Fragment>
+            }
+            descriptionClass=""
+            inline={false}
+            size="regular"
+            title={
+              <CapHeading
+                type="h4"
+              >
+                Whatsapp account
+              </CapHeading>
+            }
+            titleClass=""
+          />
           <div
             className="action-container"
           >
@@ -1779,24 +1883,6 @@ exports[`Test Templates container Test max templates warning 1`] = `
                       />,
                       "value": "rejected",
                     },
-                    Object {
-                      "key": "pending",
-                      "label": <FormattedMessage
-                        defaultMessage="Pending"
-                        id="creatives.containersV2.Whatsapp.pending"
-                        values={Object {}}
-                      />,
-                      "value": "pending",
-                    },
-                    Object {
-                      "key": "paused",
-                      "label": <FormattedMessage
-                        defaultMessage="Paused"
-                        id="creatives.containersV2.Whatsapp.paused"
-                        values={Object {}}
-                      />,
-                      "value": "paused",
-                    },
                   ]
                 }
                 dropdownMaxHeight="320px"
@@ -2046,8 +2132,8 @@ Click {{unsubscribe}} to unsubscribe
                                   "base": Object {
                                     "content": Object {
                                       "whatsapp": Object {
-                                        "accessToken": "Bearer gDwEuRIm9icV6phixociSw==",
-                                        "accountId": "107499611940863",
+                                        "accessToken": "Bearer abcd",
+                                        "accountId": "12345",
                                         "buttonType": "CTA",
                                         "buttons": Array [
                                           Object {
@@ -2183,6 +2269,30 @@ exports[`Test Templates container Test removing all whatsapp filterss 1`] = `
         templateInProgress={false}
       >
         <div>
+          <CapHeader
+            description={
+              <React.Fragment>
+                <CapHeading
+                  type="h3"
+                >
+                  
+                   
+                   
+                </CapHeading>
+              </React.Fragment>
+            }
+            descriptionClass=""
+            inline={false}
+            size="regular"
+            title={
+              <CapHeading
+                type="h4"
+              >
+                Whatsapp account
+              </CapHeading>
+            }
+            titleClass=""
+          />
           <div
             className="action-container"
           >
@@ -2442,6 +2552,30 @@ exports[`Test Templates container Test removing all whatsapp filterss 2`] = `
         templateInProgress={false}
       >
         <div>
+          <CapHeader
+            description={
+              <React.Fragment>
+                <CapHeading
+                  type="h3"
+                >
+                  
+                   
+                   
+                </CapHeading>
+              </React.Fragment>
+            }
+            descriptionClass=""
+            inline={false}
+            size="regular"
+            title={
+              <CapHeading
+                type="h4"
+              >
+                Whatsapp account
+              </CapHeading>
+            }
+            titleClass=""
+          />
           <div
             className="action-container"
           >
@@ -2675,6 +2809,30 @@ exports[`Test Templates container Test removing single filter 1`] = `
         templateInProgress={false}
       >
         <div>
+          <CapHeader
+            description={
+              <React.Fragment>
+                <CapHeading
+                  type="h3"
+                >
+                  
+                   
+                   
+                </CapHeading>
+              </React.Fragment>
+            }
+            descriptionClass=""
+            inline={false}
+            size="regular"
+            title={
+              <CapHeading
+                type="h4"
+              >
+                Whatsapp account
+              </CapHeading>
+            }
+            titleClass=""
+          />
           <div
             className="action-container"
           >

package/v2Containers/Templates/tests/mockData.js

@@ -72,3 +72,34 @@ export const getAllTemplatesListFailure = {
   "message": "Resource Not Found",
   "error": {},
 };
+
+export const senderDetailsWhatsapp = {
+  channel: "WHATSAPP",
+  domainProperties: {
+    connectionProperties: {
+      account_sid: "testSourceAccount",
+      wabaId: "testSourceAccount",
+      userid: "testSourceAccount",
+      sourceAccountIdentifier: "testSourceAccount",
+    },
+    hostname: "testWhatsappHost",
+  },
+};
+
+export const senderDetailsZalo = {
+  channel: "ZALO",
+  domainProperties: {
+    connectionProperties: {
+      oa_id: "testSourceAccount",
+      sourceAccountIdentifier: "testSourceAccount",
+    },
+    hostname: "testZaloHost",
+  },
+};
+
+export const senderDetailsSMS = {
+  channel: "SMS",
+  hostName: "TestSMSHost",
+};
+
+export const errorMessage = ["Error fetching sender details"];

package/v2Containers/Templates/tests/reducer.test.js

@@ -48,3 +48,63 @@ describe("test reducer", () => {
     });
   });
 });
+
+
+describe("test reducer - sender details", () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it("should handle GET_SENDER_DETAILS_REQUEST", () => {
+    const action = { type: types.GET_SENDER_DETAILS_REQUEST };
+    expect(reducer(initialState, action).toJS()).toEqual({
+      ...initialState.toJS(),
+      senderDetails: { status: "REQUEST" },
+    });
+  });
+
+  it("should handle GET_SENDER_DETAILS_SUCCESS for WHATSAPP (multi-account channel)", () => {
+    const action = {
+      type: types.GET_SENDER_DETAILS_SUCCESS,
+      payload: mockData.senderDetailsWhatsapp,
+    };
+    expect(reducer(initialState, action).toJS()).toEqual({
+      ...initialState.toJS(),
+      senderDetails: {
+        status: "SUCCESS",
+        domainProperties: mockData.senderDetailsWhatsapp.domainProperties,
+        errors: [],
+      },
+    });
+  });
+
+  it("should handle GET_SENDER_DETAILS_SUCCESS for non-multi-account channel", () => {
+    const action = {
+      type: types.GET_SENDER_DETAILS_SUCCESS,
+      payload: mockData.senderDetailsSMS.hostName,
+    };
+    expect(reducer(initialState, action).toJS()).toEqual({
+      ...initialState.toJS(),
+      senderDetails: {
+        status: "SUCCESS",
+        hostName: mockData.senderDetailsSMS.hostName,
+        errors: [],
+      },
+    });
+  });
+
+  it("should handle GET_SENDER_DETAILS_FAILURE", () => {
+    const action = {
+      type: types.GET_SENDER_DETAILS_FAILURE,
+      payload: mockData.errorMessage,
+    };
+    expect(reducer(initialState, action).toJS()).toEqual({
+      ...initialState.toJS(),
+      senderDetails: {
+        status: "FAILURE",
+        hostName: "",
+        errors: mockData.errorMessage,
+      },
+    });
+  });
+});

package/v2Containers/Whatsapp/constants.js

@@ -144,32 +144,12 @@ export const TWILIO_CATEGORY_OPTIONS = [
   },
 ];
 
-export const ICS_CATEGORY_OPTIONS = [
-  {
-    key: 'utility',
-    value: WHATSAPP_CATEGORIES.utility,
-    label: <FormattedMessage {...messages.utility} />,
-    tooltipLabel: <FormattedMessage {...messages.utilityTooltip} />,
-    tagColor: CAP_PURPLE03,
-    tagTextColor: CAP_PURPLE02,
-  },
-  {
-    key: 'marketing',
-    value: WHATSAPP_CATEGORIES.marketing,
-    label: <FormattedMessage {...messages.marketing} />,
-    tooltipLabel: <FormattedMessage {...messages.marketingTooltip} />,
-    tagColor: CAP_ORANGE01,
-    tagTextColor: CAP_ORANGE,
-  },
-];
-
 export const WHATSAPP_STATUSES = {
   awaitingApproval: 'awaitingApproval',
   approved: 'approved',
   rejected: 'rejected',
   pending: 'pending',
   unsubmitted: 'unsubmitted',
-  paused: 'paused',
 };
 
 export const STATUS_OPTIONS = [
@@ -188,16 +168,6 @@ export const STATUS_OPTIONS = [
     value: WHATSAPP_STATUSES.rejected,
     label: <FormattedMessage {...messages.rejected} />,
   },
-  {
-    key: 'pending',
-    value: WHATSAPP_STATUSES.pending,
-    label: <FormattedMessage {...messages.pending} />,
-  },
-  {
-    key: 'paused',
-    value: WHATSAPP_STATUSES.paused,
-    label: <FormattedMessage {...messages.paused} />,
-  },
 ];
 
 export const TAG = 'TAG';
@@ -258,7 +228,6 @@ export const WHATSAPP_DOCUMENT_SIZE = 16000000; // 16MB
 export const HOST_TWILIO = 'twiliowhatsapptrans';
 export const HOST_KARIX = 'karixwhatsappbulk';
 export const HOST_GUPSHUP = 'gupshupwhatsappbulk';
-export const HOST_ICS = 'icswababulk';
 export const SIZE_UNITS = ['bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
 export const DOCUMENT_FORMAT = 'PDF';
 export const DOCUMENT_SIZE = '16 MB';
@@ -559,11 +528,4 @@ export const LANGUAGE_OPTIONS = [
 ];
 
 export const OTP_CONFIG_URI = "/org/setup/configurations/OTPConfigurations";
-export const AI_CONTENT_BOT_DISABLED = "AI_CONTENT_BOT_DISABLED";
-export const CORRECT_TEMPLATE_FORMAT_URL = "https://developers.facebook.com/docs/whatsapp/updates-to-pricing/new-template-guidelines";
-export const CATEGORY_OPTIONS_MAP = {
-  [HOST_TWILIO]: TWILIO_CATEGORY_OPTIONS,
-  [HOST_KARIX]: KARIX_GUPSHUP_CATEGORY_OPTIONS,
-  [HOST_GUPSHUP]: KARIX_GUPSHUP_CATEGORY_OPTIONS,
-  [HOST_ICS]: ICS_CATEGORY_OPTIONS,
-};
+export const AI_CONTENT_BOT_DISABLED = "AI_CONTENT_BOT_DISABLED";