@capillarytech/creatives-library 7.0.5 → 7.0.7

package/package.json

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

package/v2Components/FormBuilder/index.js

@@ -122,14 +122,13 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
     }
     if (nextProps.startValidation && nextProps.startValidation !== false && this.props.startValidation !== nextProps.startValidation) {
       this.setState({checkValidation: true});
-      this.validateForm(null, null, true, true, () => {
+      this.validateForm(null, null, true, true);
         //triggering the saveFormData or onSubmit when validation sets isFormValid to TRUE
-        if (this.state.isFormValid) {
+          if (this.state.isFormValid) {
           this.saveForm(true);
-        } else {
+          this.setState({isFormValid:false});
+        } 
           this.props.stopValidation();
-        }
-      });
     }
     // if (nextProps.saveForm && this.props.saveForm !== nextProps.saveForm) {
     //   this.saveForm(saveForm);

package/v2Components/TemplatePreview/index.js

@@ -614,13 +614,17 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
                       'background-color': CAP_PURPLE01,
                       "margin-top": '14px',
                       'text-align': 'center',
-                      "width": '132px',
+                      "width": '143px',
                       "height": '20px',
                       "margin-left": "5px",
                     }}>
                     <p
                       style={{ 'font-size': '12px',
                         'font-weight': '500',
+                        "display": '-webkit-box',
+                        '-webkit-line-clamp': '1',
+                        '-webkit-box-orient': 'vertical',
+                        'overflow': 'hidden',
                         "color": CAP_WHITE }}
                       >
                       {buttonText || ''}</p>

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -292,7 +292,7 @@ function SlideBoxContent(props) {
       <TemplatePreview
         content={getChannelPreviewContent(templateData)}
         viberBrandName={selectedAccount || ""}
-        viberAccountName={selectedAccount[0]}
+        viberAccountName={(selectedAccount || "")[0]}
         unicodeEnabled={get(templateData, `versions.base['unicode-validity']`)}
         channel={(templateData.type || '').toLowerCase()}
         charCounterEnabled={channel === constants.SMS}

package/v2Containers/CreativesContainer/index.js

@@ -351,10 +351,11 @@ class Creatives extends React.Component {
         break;
       case constants.VIBER:
         if (template.value) {
-          const { Templates = {} } = this.props || {};
+          const { Templates, templateData: templateDataProps } = this.props;
+          const { accountDetails: selectedAccountDetails, accountId: selectedAccountId } = templateDataProps || {};
           const selectedViberAccount = Templates && Templates.selectedViberAccount;
-          const accountDetails = selectedViberAccount ? JSON.stringify(selectedViberAccount) : '';
-          const accountId = selectedViberAccount ? selectedViberAccount.id : '';
+          const accountDetails = selectedAccountDetails || (selectedViberAccount ? JSON.stringify(selectedViberAccount) : '');
+          const accountId = selectedAccountId || (selectedViberAccount ? selectedViberAccount.id : '');
           const { versions } = template.value;
           const content = cloneDeep(versions.base.content);
           content.scenarioKey = get(accountDetails, 'configs.scenario_key');
@@ -709,4 +710,4 @@ function mapDispatchToProps(dispatch) {
     actions: bindActionCreators(actions, dispatch),
   };
 }
-export default connect(mapStatesToProps, mapDispatchToProps)(injectIntl(Creatives));
+export default connect(mapStatesToProps, mapDispatchToProps)(injectIntl(Creatives));

package/v2Containers/MobilePush/Create/sagas.js

@@ -11,8 +11,11 @@ export function* createTemplate(template) {
   try {
     console.log('saga createTemplate mobilepush', template);
     const result = yield call(Api.createMobilePushTemplate, template);
-    if (result.message || result.status.code === 500) {
+    if (result.message) {
       errorMsg = result.message;
+      if(result.status.code>=400){
+        throw errorMsg;
+      }
     }
     if (template.callback) {
       yield call(template.callback, result.response);

package/v2Containers/Templates/_templates.scss

@@ -54,9 +54,9 @@
           .button-content {    
             .ant-card-meta-description {
                 min-width: 108px;
-                max-width: 160px;
+                max-width: 215px;
                 height: 24px;
-                padding: 1px 23px 2px 22px;
+                padding: 2px 0px;
                 border-radius: 16px;
                 font-size: 14px;
                 font-weight: 500;

package/v2Containers/Templates/index.js

@@ -292,10 +292,12 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         return;
       }
       selectedAccount = nextProps.Templates.weCrmAccounts[0];
-      this.setState({selectedAccount: selectedAccount.name}, () => {
-        params.wecrmId = selectedAccount.configs.wecrm_app_id;
-        params.wecrmToken = selectedAccount.configs.wecrm_token;
-        params.originalId = selectedAccount.sourceAccountIdentifier;
+      const { configs = {}, name = "" } = selectedAccount;
+      const { wecrm_app_id = "", wecrm_token = "", sourceAccountIdentifier = "" } = configs;
+      this.setState({selectedAccount: name}, () => {
+        params.wecrmId = wecrm_app_id;
+        params.wecrmToken = wecrm_token;
+        params.originalId = sourceAccountIdentifier;
         this.props.actions.setViberAccount(nextProps.Templates.weCrmAccounts[0]);
         this.getAllTemplates({params});
       });
@@ -1838,7 +1840,8 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
   render() {
     const isFullMode = this.isFullMode();
     const { activeMode, channel, wechatFilter, lineFilter } = this.state;
-    const showForViber = (channel.toLowerCase() !== VIBER_CHANNEL || (channel.toLowerCase() === VIBER_CHANNEL && isEmpty(get(this.props, 'Templates.selectedViberAccount', {}))));
+    const showForViber = (channel.toLowerCase() !== VIBER_CHANNEL ||
+      (channel.toLowerCase() === VIBER_CHANNEL && !this.props.isFullMode && isEmpty(get(this.props, 'Templates.selectedViberAccount', {}))));
     if (activeMode === ACCOUNT_SELECTION_MODE && showForViber ) {
       return this.renderAccountSelection();
     }

package/v2Containers/Viber/index.js

@@ -516,6 +516,7 @@ const Viber = (props) => {
       defaultValue={buttonText}
       value={buttonText}
       style={{paddingBottom: '11px'}}
+      maxLength={20}
     />
     <CapInput
       id="viber-button-url"
@@ -626,7 +627,7 @@ const Viber = (props) => {
       return true;
     }
     // if button is being added than button url and button Text both are mandatory
-    if (( trimedButtonText === '' && trimedButtonUrl !== '') || ( trimedButtonUrl !== '' && trimedButtonUrl === '')) {
+    if (( trimedButtonText === '' && trimedButtonUrl !== '') || ( trimedButtonText !== '' && trimedButtonUrl === '')) {
       return true;
     }
     // if button url is not valid url
@@ -643,7 +644,6 @@ const Viber = (props) => {
           <CapColumn span={14}>
             <StyledHeader
               title={formatMessage(messages.viberCreativeTitle)}
-              description={formatMessage(messages.viberCreativeDesc)}
               size="regular"
             />
             {

package/v2Containers/Viber/messages.js

@@ -14,10 +14,6 @@ export default defineMessages({
     id: `${scope}.viberCreativeTitle`,
     defaultMessage: "Viber creative",
   },
-  viberCreativeDesc: {
-    id: `${scope}.viberCreativeDesc`,
-    defaultMessage: "Select any of the existing templates or create new",
-  },
   message: {
     id: `${scope}.message`,
     defaultMessage: 'Message',