@capillarytech/creatives-library 8.0.110-alpha.0 → 8.0.110

package/package.json

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

package/v2Components/CapTagList/index.js

@@ -343,9 +343,14 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
     const {formatMessage} = intl;
     const { tagValue, expandedKeys, autoExpandParent, searchValue, visible, translationLang } = this.state;
     const options = [
+      {
+        value: "All",
+        label: formatMessage(messages.all),
+        key: 'all',
+      },
       {
         value: "Outbound",
-        label: formatMessage(messages.Standard),
+        label: formatMessage(messages.outbound),
         key: 'outbound',
       },
       {
@@ -365,7 +370,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
             getPopupContainer={(triggerNode) => triggerNode.parentNode}
             style={{width: '250px', marginBottom: '16px', minWidth: 'initial', display: 'inherit'}}
             onChange={this.props.onContextChange}
-            defaultValue={'Outbound'}
+            defaultValue={formatMessage(messages.all)}
             options={options}>
           </CapSelect> : ''}
         <CapTree

package/v2Components/CapTagList/messages.js

@@ -26,9 +26,9 @@ export default defineMessages({
     id: 'creatives.componentsV2.CapTagList.all',
     defaultMessage: 'All',
   },
-  "Standard": {
-    id: 'creatives.componentsV2.CapTagList.Standard',
-    defaultMessage: 'Standard',
+  "outbound": {
+    id: 'creatives.componentsV2.CapTagList.outbound',
+    defaultMessage: 'Outbound',
   },
   "loyalty": {
     id: 'creatives.componentsV2.CapTagList.loyalty',

package/v2Components/CapWhatsappCTA/constants.js

@@ -42,3 +42,4 @@ export const KARIX_GUPSHUP_URL_OPTIONS = [
 export const BTN_MAX_LENGTH = 20;
 export const PHONE_NUMBER_MAX_LENGTH = 15;
 export const URL_MAX_LENGTH = 2000;
+export const DYNAMIC_URL_SUFFIX = '{{1}}';

package/v2Components/CapWhatsappCTA/index.js

@@ -33,6 +33,7 @@ import {
   WEBSITE,
   DYNAMIC_URL,
   STATIC_URL,
+  DYNAMIC_URL_SUFFIX,
 } from './constants';
 import {
   INITIAL_CTA_DATA,
@@ -120,8 +121,8 @@ export const CapWhatsappCTA = (props) => {
 
   const ctaOptions = CTA_OPTIONS.map((option) => {
     const { value, label, tooltipLabel } = option;
-    //if button 1 is of type-> PHONE_NUMBER, it is disabled in second button
-    const isDisabled = ctaData.length === 2 && ctaData[0].ctaType === value;
+    //only disable PHONE_NUMBER if first button is also PHONE_NUMBER
+    const isDisabled = ctaData.length === 2 && ctaData[0].ctaType === PHONE_NUMBER && value === PHONE_NUMBER;
     return {
       value,
       label: renderCtaOptions(label, tooltipLabel, isDisabled),
@@ -162,7 +163,6 @@ export const CapWhatsappCTA = (props) => {
     let { value, id } = target;
     if (urlType === DYNAMIC_URL) {
       value = value.replace(invalidVarRegex, '');
-      value = `${value}{{1}}`;
     }
     let errorMessage = false;
     if (!isUrl(value)) {
@@ -190,6 +190,14 @@ export const CapWhatsappCTA = (props) => {
   };
 
   const saveCta = (index) => {
+    const clonedIndexCta = cloneDeep(ctaData[index]);
+    // If this is a website CTA with dynamic URL type, ensure {{1}} is added at the end
+    if (clonedIndexCta?.ctaType === WEBSITE && clonedIndexCta?.urlType === DYNAMIC_URL) {
+      if (!clonedIndexCta?.url?.includes(DYNAMIC_URL_SUFFIX)) {
+        clonedIndexCta.url += DYNAMIC_URL_SUFFIX;
+        ctaData[index] = clonedIndexCta;
+      }
+    }
     updateHelper('isSaved', true, index);
   };
   const editCta = (index) => {
@@ -391,6 +399,7 @@ export const CapWhatsappCTA = (props) => {
                   </CapHeading>
                   <CapInput
                     id={index}
+                    addonAfter={urlType === DYNAMIC_URL && !url.includes(DYNAMIC_URL_SUFFIX) && DYNAMIC_URL_SUFFIX}
                     className="whatsapp-cta-url"
                     onChange={(event) => onUrlChange(event, urlType)}
                     placeholder={