@capillarytech/creatives-library 7.0.6 → 7.0.8

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "7.0.6",
+  "version": "7.0.8",
   "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

@@ -184,7 +184,7 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
       "padding": '3.5px 0 0',
       'border-radius': '8px',
       'background-color': CAP_G15,
-      'width': '79%',
+      'width': '81%',
     };
     const getVideoContent = ({
       video,
@@ -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": '140px',
                       "height": '20px',
-                      "margin-left": "5px",
+                      "margin-left": "2px",
                     }}>
                     <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/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/Viber/index.js

@@ -516,6 +516,7 @@ const Viber = (props) => {
       defaultValue={buttonText}
       value={buttonText}
       style={{paddingBottom: '11px'}}
+      maxLength={20}
     />
     <CapInput
       id="viber-button-url"
@@ -563,7 +564,7 @@ const Viber = (props) => {
   const createCallback = (errorMessage, isEdit) => {
     if (!errorMessage) {
       CapNotification.success({
-        message: formatMessage(messages.viberCreateNotification),
+        message: isEdit ? formatMessage(messages.viberEditNotification) : formatMessage(messages.viberCreateNotification),
       });
       if (isEdit) {
         actions.clearEditResponse();
@@ -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

package/v2Containers/Viber/messages.js

@@ -118,6 +118,10 @@ export default defineMessages({
     id: `${scope}.viberCreateNotification`,
     defaultMessage: 'Viber template created successfully',
   },
+  viberEditNotification: {
+    id: `${scope}.viberEditNotification`,
+    defaultMessage: 'Viber template updated successfully',
+  },
   textMessageTitlePlaceholder: {
     id: `${scope}.textMessageTitlePlaceholder`,
     defaultMessage: 'Enter template name',