@capillarytech/creatives-library 7.17.91-alpha.0 → 7.17.92-alpha.0

package/containers/App/constants.js

@@ -15,7 +15,6 @@ export const EXTENDED_TAG = 'ExtendedTagMessage';
 export const BADGES_UI_ENABLED = 'BADGES_UI_ENABLED';
 export const JP_LOCALE_HIDE_FEATURE = 'JP_LOCALE_HIDE_FEATURE';
 export const ENABLE_CUSTOMER_BARCODE_TAG = "ENABLE_CUSTOMER_BARCODE_TAG";
-export const EMAIL_UNSUBSCRIBE_TAG_MANDATORY = "EMAIL_UNSUBSCRIBE_TAG_MANDATORY";
 
 export const CARD_RELATED_TAGS = [
   'card_series',
@@ -74,6 +73,7 @@ export const PROMO_ENGINE_RELATED_TAGS = [
 
 export const BADGES_RELATED_TAGS = [
   "Badge_expiry_date",
+  "badges_issue_expiry_date",
   "badge_expiry_mm_slash_dd_slash_yyyy",
   "badge_expiry_dd_slash_mm_slash_yyyy",
   "badge_expiry_yyyy_hyphen_mm_hyphen_dd",
@@ -92,8 +92,18 @@ export const BADGES_RELATED_TAGS = [
   "badges_enroll_expiry_date.FORMAT_7",
   "badges_enroll_expiry_date.FORMAT_8",
   "badges_enroll_expiring_in_days",
+  "badges_issue_expiry_date.FORMAT_1",
+  "badges_issue_expiry_date.FORMAT_2",
+  "badges_issue_expiry_date.FORMAT_3",
+  "badges_issue_expiry_date.FORMAT_4",
+  "badges_issue_expiry_date.FORMAT_5",
+  "badges_issue_expiry_date.FORMAT_6",
+  "badges_issue_expiry_date.FORMAT_7",
+  "badges_issue_expiry_date.FORMAT_8",
+  "badges_issue_expiring_in_days",
 ];
 export const BADGES_ENROLL = 'BADGES_ENROLL';
+export const BADGES_ISSUE = 'BADGES_ISSUE';
 
 export const CUSTOMER_BARCODE_TAG = "customer_barcode";
 export const COPY_OF = "Copy of";

package/containers/Ebill/index.js

@@ -956,7 +956,6 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
         }
         temp.injectedEvents = {};
         _.forEach(col.supportedEvents, (event) => {
-          console.log('injected event for ', col, event, this.getMappedEvent(col.id, event));
           temp.injectedEvents[event] = this.getMappedEvent(col.id, event);
         });
         

package/containers/MobilePush/Edit/index.js

@@ -1779,7 +1779,6 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
           temp.content.appName = this.props.Templates.selectedWeChatAccount.name;
         }
         _.forEach(col.supportedEvents, (event) => {
-          console.log('injected event for ', col, event, this.getMappedEvent(col.id, event));
           temp.injectedEvents[event] = this.getMappedEvent(col.id, event);
         });
         return true;

package/package.json

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

package/utils/common.js

@@ -17,7 +17,7 @@ import {
   ENABLE_CUSTOMER_BARCODE_TAG,
   BADGES_UI_ENABLED,
   BADGES_ENROLL,
-  EMAIL_UNSUBSCRIBE_TAG_MANDATORY,
+  BADGES_ISSUE,
 } from '../containers/App/constants';
 import { apiMessageFormatHandler } from './commonUtils';
 
@@ -105,10 +105,6 @@ export const hasCustomerBarcodeFeatureEnabled = Auth.hasFeatureAccess.bind(
   ENABLE_CUSTOMER_BARCODE_TAG,
 );
 
-export const hasRemoveEmailUnsubscribeTag = Auth.hasFeatureAccess.bind(
-  null,
-  EMAIL_UNSUBSCRIBE_TAG_MANDATORY,
-);
 //filtering tags based on scope
 export const filterTags = (tagsToFilter, tagsList) => tagsList?.filter(
     (tag) => !tagsToFilter?.includes(tag?.definition?.value)
@@ -182,7 +178,7 @@ export function getTreeStructuredTags({tagsList, userLocale = 'en', offerDetails
   });
   let combinedTags = result;
   if (offerDetails?.length) {
-    if (offerDetails?.[0]?.type === BADGES_ENROLL) {
+    if ([BADGES_ENROLL, BADGES_ISSUE].includes(offerDetails?.[0]?.type)) {
       combinedTags = transformBadgeTags(offerDetails, result);
     } else {
       combinedTags = transformCouponTags(offerDetails, result);

package/utils/tests/common.mockdata.js

@@ -115,8 +115,10 @@ export const badgesTags = [
       "value": "Badge",
       "subtags": [
         "Badge_expiry_date",
+        "badges_issue_expiry_date",
         "Days_until_expiry",
         "badges_enroll_expiring_in_days",
+        "badges_issue_expiring_in_days",
       ],
       "tag-header": true,
       "supportedModules": [
@@ -234,6 +236,15 @@ export const badgesTags = [
         "badges_enroll_expiry_date.FORMAT_6",
         "badges_enroll_expiry_date.FORMAT_7",
         "badges_enroll_expiry_date.FORMAT_8",
+        "badges_issue_expiry_date.FORMAT_1",
+        "badges_issue_expiry_date.FORMAT_2",
+        "badges_issue_expiry_date.FORMAT_3",
+        "badges_issue_expiry_date.FORMAT_4",
+        "badges_issue_expiry_date.FORMAT_5",
+        "badges_issue_expiry_date.FORMAT_6",
+        "badges_issue_expiry_date.FORMAT_7",
+        "badges_issue_expiry_date.FORMAT_8",
+        "badges_issue_expiring_in_days",
       ],
       "tag-header": true,
       "supportedModules": [

package/v2Components/FormBuilder/index.js

@@ -55,7 +55,6 @@ import { AI_SUGGESTION_API_URL, CONTENT_RECOMMENDATION_BOT } from './constants';
 import { GET_TRANSLATION_MAPPED } from '../../containers/TagList/constants';
 import moment from 'moment';
 import { CUSTOMER_BARCODE_TAG , COPY_OF} from '../../containers/App/constants';
-import { hasRemoveEmailUnsubscribeTag } from '../../utils/common';
 const TabPane = Tabs.TabPane;
 const {Column} = Table;
 const {TextArea} = CapInput;
@@ -215,9 +214,10 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
           this.setState({usingTabContainer: true});
         }
       }
-      // if (nextProps.currentTab) {
-      //   this.setState({currentTab: nextProps.currentTab});
-      // }
+      //currentTab represents whether its Android or IOS tab , 1 for Android and 2 for IOS
+      if (nextProps.currentTab && _.get(this.props, 'schema.channel') === MOBILE_PUSH) {
+        this.setState({currentTab: nextProps.currentTab});
+      }
     } else if (!_.isEmpty(nextProps.formData) &&
       ( !this.state.usingTabContainer || (this.state.usingTabContainer && nextProps.tabKey !== ''))
       && !_.isEqual(nextProps.formData, this.state.formData) &&
@@ -988,9 +988,6 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                 if (tagValidationResponse.isBraceError){
                   errorString += this.props.intl.formatMessage(globalMessages.unbalanacedCurlyBraces);
                 }
-                if (tagValidationResponse.isContentEmpty) {
-                  errorString += this.props.intl.formatMessage(messages.emailBodyEmptyError);
-                }
               }
             }
           }
@@ -1129,8 +1126,6 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
     response.missingTags = [];
     response.unsupportedTags = [];
     response.isBraceError = false;
-    response.isContentEmpty = false;
-    const contentForValidation = isEmail ? convert(content) : content ;
     if(tags && tags.length) {
       _.forEach(tags, (tag) => {
         _.forEach(tag.definition.supportedModules, (module) => {
@@ -1148,19 +1143,6 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
       let matchImg = regexImgSrc.exec(content);
       const regexCustomerBarcode = /{{customer_barcode}}(?![^<]*>)/g;
       let matchCustomerBarcode = regexCustomerBarcode.exec(content);
-      // \S matches anything other than a space, a tab, a newline, or a carriage return.
-      const validString= /\S/.test(contentForValidation);
-      if (hasRemoveEmailUnsubscribeTag() && isEmail) {
-        const missingTagIndex = response.missingTags.indexOf("unsubscribe");
-        if(missingTagIndex != -1) { //skip regex tags for mandatory tags also
-          response.missingTags.splice(missingTagIndex, 1);
-          if (validString) {
-            response.valid = true;
-          } else {
-            response.isContentEmpty = true;
-          }
-        }
-      }
       while (match !== null ) {
         const tagValue = match[0].substring(this.indexOfEnd(match[0], '{{'), match[0].indexOf('}}'));
         match = regex.exec(content);
@@ -1194,6 +1176,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
         }
       }
     }
+    const contentForValidation = isEmail ? convert(content) : content ;
     if(!validateIfTagClosed(contentForValidation)){
       response.isBraceError = true;
       response.valid = false;

package/v2Components/FormBuilder/messages.js

@@ -86,8 +86,4 @@ export default defineMessages({
     id: 'creatives.componentsV2.FormBuilder.imageReUpload',
     defaultMessage: 'Re upload',
   },
-  emailBodyEmptyError: {
-    id: 'creatives.componentsV2.FormBuilder.emailBodyEmptyError',
-    defaultMessage: 'Email body cannot be empty',
-  },
 });

package/v2Containers/MobilePush/Edit/index.js

@@ -768,10 +768,9 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     formData[0].base = true;
     // formData[0].tabKey = '1';
     // formData[1].tabKey = '2';
-
     this.setState({templateCta}, () => {
       this.getSchemaForFormData(formData, schema);
-      this.setState({tabCount, formData, editData: data, currentTab: 1}, () => {
+      this.setState({tabCount, formData, editData: data}, () => {
         this.props.showTemplateName({formData, onFormDataChange: this.onFormDataChange});
       });
     });
@@ -1469,7 +1468,6 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
           temp.content.appName = this.props.Templates.selectedWeChatAccount.name;
         }
         _.forEach(col.supportedEvents, (event) => {
-          console.log('injected event for ', col, event, this.getMappedEvent(col.id, event));
           temp.injectedEvents[event] = this.getMappedEvent(col.id, event);
         });
         return true;

package/v2Containers/TagList/index.js

@@ -23,7 +23,7 @@ import { selectCurrentOrgDetails, makeSelectFetchingSchemaError } from '../Cap/s
 import { injectIntl } from 'react-intl';
 import { scope } from './messages';
 import { handleInjectedData, hasGiftVoucherFeature, hasPromoFeature, hasBadgesFeature, transformBadgeTags } from '../../utils/common';
-import { GIFT_VOUCHER_RELATED_TAGS, PROMO_ENGINE_RELATED_TAGS, BADGES_RELATED_TAGS, BADGES_ENROLL } from '../../containers/App/constants';
+import { GIFT_VOUCHER_RELATED_TAGS, PROMO_ENGINE_RELATED_TAGS, BADGES_RELATED_TAGS, BADGES_ENROLL, BADGES_ISSUE } from '../../containers/App/constants';
 
 const TreeNode = Tree.TreeNode;
 
@@ -95,7 +95,7 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
       tags = this.populateTags(props.tags);
     }
     if (selectedOfferDetails && !_.isEmpty(selectedOfferDetails) ) {
-      if ((selectedOfferDetails[0]?.type === BADGES_ENROLL) && (tags && tags?.Badge) ) {
+      if (([BADGES_ENROLL, BADGES_ISSUE].includes(selectedOfferDetails[0]?.type)) && (tags && tags?.Badge) ) {
         transformBadgeTags(selectedOfferDetails, tags);
       } else if (tags && tags?.coupon) {
         this.transformCouponTags(selectedOfferDetails, tags);

package/v2Containers/Templates/_templates.scss

@@ -523,9 +523,6 @@
 .message-container{
   border-bottom: solid 0.5px #D6D6D6;
 }
-.main-content{
-  overflow: hidden;
-}
 
 .wechat-filters,
 .line-filters {