@capillarytech/creatives-library 7.12.34 → 7.12.36

package/config/app.js

@@ -17,6 +17,7 @@ const config = {
   },
   development: {
     api_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/arya/api/v1/creatives',
+    //api_endpoint: 'http://localhost:2022/arya/api/v1/creatives',
     campaigns_api_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/iris/v2/campaigns',
     campaigns_api_org_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/iris/v2/org/campaign',
     auth_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/arya/api/v1/auth',

package/package.json

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

package/v2Components/CapWhatsappCTA/index.js

@@ -13,6 +13,7 @@ import CapInput from '@capillarytech/cap-ui-library/CapInput';
 import CapButton from '@capillarytech/cap-ui-library/CapButton';
 import CapLabel from '@capillarytech/cap-ui-library/CapLabel';
 import CapIcon from '@capillarytech/cap-ui-library/CapIcon';
+import CapTooltip from '@capillarytech/cap-ui-library/CapTooltip';
 import globalMessages from '../../v2Containers/Cap/messages';
 import whatsappMsg from '../../v2Containers/Whatsapp/messages';
 import messages from './messages';
@@ -274,13 +275,24 @@ export const CapWhatsappCTA = (props) => {
               </CapRow>
             )}
             <CapRow className="whatsapp-cta-save-delete-btn">
-              <CapButton
-                onClick={() => saveCta(index)}
-                disabled={ctaSaveDisabled(index)}
-                className="whatsapp-cta-save-btn"
+              <CapTooltip
+                title={
+                  ctaSaveDisabled(index)
+                    ? formatMessage(messages.ctaSaveDisabled)
+                    : ''
+                }
+                placement={'bottom'}
               >
-                {formatMessage(globalMessages.save)}
-              </CapButton>
+                <div className="button-disabled-tooltip-wrapper">
+                  <CapButton
+                    onClick={() => saveCta(index)}
+                    disabled={ctaSaveDisabled(index)}
+                    className="whatsapp-cta-save-btn"
+                  >
+                    {formatMessage(globalMessages.save)}
+                  </CapButton>
+                </div>
+              </CapTooltip>
               <CapButton
                 onClick={() => deleteHandler(index)}
                 className="whatsapp-cta-delete-btn"
@@ -299,16 +311,27 @@ export const CapWhatsappCTA = (props) => {
       ctaData.length < 2 &&
         renderArray.push(
           <CapRow>
-            <CapButton
-              type="flat"
-              id="whatsapp-cta-add-button"
-              disabled={ctaData?.length === 1 && !ctaData[0].isSaved}
-              className="margin-t-12 margin-l-24"
-              isAddBtn
-              onClick={addCta}
+            <CapTooltip
+              title={
+                ctaData.length === 1 && !ctaData[0].isSaved
+                  ? formatMessage(messages.ctaAddDisabled)
+                  : ''
+              }
+              placement={'right'}
             >
-              {formatMessage(messages.addButton)}
-            </CapButton>
+              <div className="button-disabled-tooltip-wrapper">
+                <CapButton
+                  type="flat"
+                  id="whatsapp-cta-add-button"
+                  disabled={ctaData.length === 1 && !ctaData[0].isSaved}
+                  className="margin-t-12 margin-l-24"
+                  isAddBtn
+                  onClick={addCta}
+                >
+                  {formatMessage(messages.addButton)}
+                </CapButton>
+              </div>
+            </CapTooltip>
           </CapRow>,
         );
     }

package/v2Components/CapWhatsappCTA/messages.js

@@ -53,4 +53,13 @@ export default defineMessages({
     id: `${prefix}.addButton`,
     defaultMessage: 'Add button',
   },
+  ctaSaveDisabled: {
+    id: `${prefix}.ctaSaveDisabled`,
+    defaultMessage: 'Please complete the above fields to enable button',
+  },
+  ctaAddDisabled: {
+    id: `${prefix}.ctaAddDisabled`,
+    defaultMessage:
+      'Please save the first button before proceeding to create second button',
+  },
 });

package/v2Components/TemplatePreview/_templatePreview.scss

@@ -266,7 +266,6 @@
     margin: 8px 0;
   }
   .whatsapp-cta-preview{
-    margin-bottom: 8px;
     font-size: 10px;
     text-align: center;
   }

package/v2Containers/CreativesContainer/index.js

@@ -375,8 +375,18 @@ export class Creatives extends React.Component {
               language,
               category,
               mediaType,
+              whatsappButtonType : buttonType = 'NONE',
+              buttons = [],
             } = {},
           } = templateData;
+          const modifiedButtons = cloneDeep(buttons).map((btn) => {
+            if (btn.type === 'PHONE_NUMBER') {
+              btn.phone_number = btn.phoneNumber;
+              delete btn.phoneNumber;
+              return btn;
+            }
+            return btn;
+          });
           creativesTemplateData = {
             _id: id,
             type: constants.WHATSAPP,
@@ -390,6 +400,8 @@ export class Creatives extends React.Component {
                     category,
                     varMapped,
                     mediaType,
+                    buttonType,
+                    buttons : modifiedButtons,
                     languages: [
                       {
                         language,
@@ -576,7 +588,17 @@ export class Creatives extends React.Component {
             category,
             templateEditor,
             varMapped,
+            buttonType : whatsappButtonType = 'NONE',
+            buttons = [],
           } = cloneDeep(versions.base.content.whatsapp);
+          const modifiedButtons = cloneDeep(buttons).map((btn) => {
+            if (btn.type === 'PHONE_NUMBER') {
+              btn.phoneNumber = btn.phone_number;
+              delete btn.phone_number;
+              return btn;
+            }
+            return btn;
+          });
           templateData = {
             channel,
             accountId,
@@ -590,6 +612,8 @@ export class Creatives extends React.Component {
               category,
               language: languages[0].language,
               mediaType,
+              whatsappButtonType,
+              buttons : modifiedButtons,
             },
           };
         }