@capillarytech/creatives-library 7.12.13 → 7.12.15

package/v2Containers/TemplatesV2/index.js

@@ -28,7 +28,7 @@ import FTP from '../FTP';
 import Gallery from '../Assets/Gallery';
 import withStyles from '../../hoc/withStyles';
 import styles, { CapTabStyle } from './TemplatesV2.style';
-import { CREATIVES_UI_VIEW, LOYALTY, WHATSAPP, RCS } from '../App/constants';
+import { CREATIVES_UI_VIEW, LOYALTY, WHATSAPP } from '../App/constants';
 import AccessForbidden from '../../v2Components/AccessForbidden';
 import { getObjFromQueryParams } from '../../utils/v2common';
 
@@ -54,7 +54,6 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
 
     const defaultPanes = {
       sms: {content: <></>, tab: intl.formatMessage(messages.sms), key: 'sms'},
-      rcs: { content: <></>, tab: intl.formatMessage(messages.rcs), key: RCS },
       email: {content: <></>, tab: intl.formatMessage(messages.email), key: 'email'},
       weChat: {content: <></>, tab: intl.formatMessage(messages.wechat), key: 'wechat'},
       //'wechat': {content: this.getTemplatesComponent('wechat'), tab: 'Wechat', key: 'wechat'},
@@ -80,17 +79,9 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
         filteredPanes.push({content: <></>, tab: intl.formatMessage(messages.FTP), key: 'ftp'});
         defaultChannel = 'FTP';
       }
-      const commonChannels = ['sms', 'email', 'wechat', 'mobilepush', 'line', 'viber', 'facebook', 'call_task', 'ftp', 'assets'];
-
-      // we only show channels which other than commonChannels
-      // if it is coming in enableNewChannels array
-      filteredPanes.filter((item) => {
-        const channel = item.key;
-        if (!commonChannels.includes(channel)) {
-          return !enableNewChannels.includes(channel.toUpperCase());
-        }
-        return true;
-      });
+      if (!enableNewChannels.includes(WHATSAPP.toUpperCase())) {
+        filteredPanes.splice(7, 1);
+      }
     }
 
 

package/v2Containers/TemplatesV2/messages.js

@@ -58,10 +58,6 @@ export default defineMessages({
     id: 'creatives.containersV2.TemplatesV2.whatsapp',
     defaultMessage: 'WhatsApp',
   },
-  rcs: {
-    id: 'creatives.containersV2.TemplatesV2.rcs',
-    defaultMessage: 'RCS',
-  },
   gallery: {
     id: 'creatives.containersV2.TemplatesV2.gallery',
     defaultMessage: 'Gallery',

package/v2Containers/Whatsapp/constants.js

@@ -215,7 +215,7 @@ export const LANGUAGE_OPTIONS = [
     value: 'fr',
     label: <FormattedMessage {...messages.french} />,
   },
-  // commenting this as twilio api is thrwing some error on this lang
+  // commenting this as twilio api is throwing some error on this lang
   // will uncomment once this issue will be resolved by twilio api
   // {
   //   value: 'ka',
@@ -273,18 +273,22 @@ export const LANGUAGE_OPTIONS = [
     value: 'kk',
     label: <FormattedMessage {...messages.kazakh} />,
   },
-  {
-    value: 'rw_RW',
-    label: <FormattedMessage {...messages.kinyarwanda} />,
-  },
+   // commenting this as twilio api is throwing some error on this lang
+  // will uncomment once this issue will be resolved by twilio api
+  // {
+  //   value: 'rw_RW',
+  //   label: <FormattedMessage {...messages.kinyarwanda} />,
+  // },
   {
     value: 'ko',
     label: <FormattedMessage {...messages.korean} />,
   },
-  {
-    value: 'ky_KG',
-    label: <FormattedMessage {...messages.kyrgyz} />,
-  },
+   // commenting this as twilio api is throwing some error on this lang
+  // will uncomment once this issue will be resolved by twilio api
+  // {
+  //   value: 'ky_KG',
+  //   label: <FormattedMessage {...messages.kyrgyz} />,
+  // },
   {
     value: 'lo',
     label: <FormattedMessage {...messages.lao} />,
@@ -305,10 +309,12 @@ export const LANGUAGE_OPTIONS = [
     value: 'ms',
     label: <FormattedMessage {...messages.malay} />,
   },
-  {
-    value: 'ml',
-    label: <FormattedMessage {...messages.malayalam} />,
-  },
+   // commenting this as twilio api is throwing some error on this lang
+  // will uncomment once this issue will be resolved by twilio api
+  // {
+  //   value: 'ml',
+  //   label: <FormattedMessage {...messages.malayalam} />,
+  // },
   {
     value: 'mr',
     label: <FormattedMessage {...messages.marathi} />,

package/v2Containers/Whatsapp/index.js

@@ -433,9 +433,7 @@ export const Whatsapp = (props) => {
     //regex to accept only lowercase alphanumeric characters and underscores
     const templateNameRegex = /^[a-z0-9_]+$/;
     if (value === '') {
-      errorMessage = formatMessage(
-        globalMessages.emptyTemplateNameErrorMessage,
-      );
+      errorMessage = formatMessage(messages.emptyTemplateNameErrorMessage);
     } else if (!templateNameRegex.test(value)) {
       errorMessage = formatMessage(messages.templateNameRegexErrorMessage);
     }
@@ -897,7 +895,7 @@ export const Whatsapp = (props) => {
           suffix={
             templateStatus === WHATSAPP_STATUSES.approved && (
               <TagList
-                label={formatMessage(globalMessages.addLabels)}
+                label={formatMessage(messages.addLabels)}
                 onTagSelect={onTagSelect}
                 location={location}
                 tags={tags || []}

package/v2Containers/Whatsapp/messages.js

@@ -10,6 +10,10 @@ export default defineMessages({
     id: `${prefix}.templateNameTooltip`,
     defaultMessage: `Tip : Use a name that helps WhatsApp's reviewer understand the purpose of your message, for example "order_delivery" rather than "template_1"`,
   },
+  emptyTemplateNameErrorMessage: {
+    id: `${prefix}.emptyTemplateNameErrorMessage`,
+    defaultMessage: 'Template name cannot be empty',
+  },
   templateNameRegexErrorMessage: {
     id: `${prefix}.templateNameRegexErrorMessage`,
     defaultMessage:
@@ -131,6 +135,11 @@ export default defineMessages({
     id: `${prefix}.unsubscribeTextTooltip`,
     defaultMessage: 'This is non-editable',
   },
+  unsupportedTagsValidationError: {
+    id: `${prefix}.unsupportedTagsValidationError`,
+    defaultMessage:
+      'Unsupported tags: {unsupportedTags}. Please remove them from this message.',
+  },
   repetativeVars: {
     id: `${prefix}.repetativeVars`,
     defaultMessage: 'Variables cannot be repeated',
@@ -208,6 +217,10 @@ export default defineMessages({
     defaultMessage:
       'The template has been sent for approval at {date}, {time}. It takes up to 48 hrs to get approved.',
   },
+  addLabels: {
+    id: `${prefix}.addLabels`,
+    defaultMessage: 'Add labels',
+  },
   inputplaceHolderText: {
     id: `${prefix}.inputplaceHolderText`,
     defaultMessage: '{value} Add labels or text or combination of both',

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

@@ -23880,7 +23880,7 @@ Click {{3}} to unsubscribe'",
             Array [
               Object {
                 "defaultMessage": "Add labels",
-                "id": "creatives.containersV2.addLabels",
+                "id": "creatives.containersV2.Whatsapp.addLabels",
               },
             ],
             Array [
@@ -24050,7 +24050,7 @@ Click {{3}} to unsubscribe'",
             Array [
               Object {
                 "defaultMessage": "Add labels",
-                "id": "creatives.containersV2.addLabels",
+                "id": "creatives.containersV2.Whatsapp.addLabels",
               },
             ],
             Array [
@@ -30595,7 +30595,7 @@ Click {{3}} to unsubscribe'",
             Array [
               Object {
                 "defaultMessage": "Add labels",
-                "id": "creatives.containersV2.addLabels",
+                "id": "creatives.containersV2.Whatsapp.addLabels",
               },
             ],
             Array [
@@ -30765,7 +30765,7 @@ Click {{3}} to unsubscribe'",
             Array [
               Object {
                 "defaultMessage": "Add labels",
-                "id": "creatives.containersV2.addLabels",
+                "id": "creatives.containersV2.Whatsapp.addLabels",
               },
             ],
             Array [
@@ -38152,7 +38152,7 @@ Click {{3}} to unsubscribe'",
             Array [
               Object {
                 "defaultMessage": "Add labels",
-                "id": "creatives.containersV2.addLabels",
+                "id": "creatives.containersV2.Whatsapp.addLabels",
               },
             ],
             Array [
@@ -38322,7 +38322,7 @@ Click {{3}} to unsubscribe'",
             Array [
               Object {
                 "defaultMessage": "Add labels",
-                "id": "creatives.containersV2.addLabels",
+                "id": "creatives.containersV2.Whatsapp.addLabels",
               },
             ],
             Array [
@@ -46577,7 +46577,7 @@ Click {{3}} to unsubscribe'",
             Array [
               Object {
                 "defaultMessage": "Add labels",
-                "id": "creatives.containersV2.addLabels",
+                "id": "creatives.containersV2.Whatsapp.addLabels",
               },
             ],
             Array [
@@ -46747,7 +46747,7 @@ Click {{3}} to unsubscribe'",
             Array [
               Object {
                 "defaultMessage": "Add labels",
-                "id": "creatives.containersV2.addLabels",
+                "id": "creatives.containersV2.Whatsapp.addLabels",
               },
             ],
             Array [
@@ -48134,7 +48134,7 @@ Click {{3}} to unsubscribe'",
             Array [
               Object {
                 "defaultMessage": "Add labels",
-                "id": "creatives.containersV2.addLabels",
+                "id": "creatives.containersV2.Whatsapp.addLabels",
               },
             ],
             Array [
@@ -48304,7 +48304,7 @@ Click {{3}} to unsubscribe'",
             Array [
               Object {
                 "defaultMessage": "Add labels",
-                "id": "creatives.containersV2.addLabels",
+                "id": "creatives.containersV2.Whatsapp.addLabels",
               },
             ],
             Array [
@@ -48474,7 +48474,7 @@ Click {{3}} to unsubscribe'",
             Array [
               Object {
                 "defaultMessage": "Add labels",
-                "id": "creatives.containersV2.addLabels",
+                "id": "creatives.containersV2.Whatsapp.addLabels",
               },
             ],
             Array [
@@ -185288,7 +185288,7 @@ exports[`Creatives Whatsapp test/> template name change 2`] = `
             Array [
               Object {
                 "defaultMessage": "Template name cannot be empty",
-                "id": "creatives.containersV2.emptyTemplateNameErrorMessage",
+                "id": "creatives.containersV2.Whatsapp.emptyTemplateNameErrorMessage",
               },
             ],
             Array [
@@ -196599,7 +196599,7 @@ exports[`Creatives Whatsapp test/> template name change 3`] = `
             Array [
               Object {
                 "defaultMessage": "Template name cannot be empty",
-                "id": "creatives.containersV2.emptyTemplateNameErrorMessage",
+                "id": "creatives.containersV2.Whatsapp.emptyTemplateNameErrorMessage",
               },
             ],
             Array [

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

@@ -1,39 +1,33 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Test utils test getWhatsappContent 1`] = `
-Object {
-  "charCount": 46,
-  "templateMsg": <React.Fragment>
-    <CapLabel
-      type="label9"
-    >
-      1234567890
-
-    </CapLabel>
-    <CapLabel
-      type="label1"
-    >
-      Click {{unsubscribe}} to unsubscribe
-    </CapLabel>
-  </React.Fragment>,
-}
+<React.Fragment>
+  <CapLabel
+    type="label9"
+  >
+    1234567890
+  </CapLabel>
+  <CapLabel
+    type="label1"
+  >
+    
+Click {{unsubscribe}} to unsubscribe
+  </CapLabel>
+</React.Fragment>
 `;
 
 exports[`Test utils test getWhatsappContent for preview 1`] = `
-Object {
-  "charCount": 46,
-  "templateMsg": <React.Fragment>
-    <CapLabel
-      type="label5"
-    >
-      1234567890
-
-    </CapLabel>
-    <CapLabel
-      type="label11"
-    >
-      Click {{unsubscribe}} to unsubscribe
-    </CapLabel>
-  </React.Fragment>,
-}
+<React.Fragment>
+  <CapLabel
+    type="label5"
+  >
+    1234567890
+  </CapLabel>
+  <CapLabel
+    type="label11"
+  >
+    
+Click {{unsubscribe}} to unsubscribe
+  </CapLabel>
+</React.Fragment>
 `;