@capillarytech/creatives-library 2.0.88 → 2.0.90

package/package.json

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

package/v2Components/FormBuilder/index.js

@@ -24,6 +24,7 @@ import EDMEditor from "../Edmeditor";
 import CustomPopOver from '../CustomPopOver';
 import './_formBuilder.scss';
 import {updateCharCount, checkUnicode} from "../../utils/smsCharCountV2";
+import {SMS} from '../../v2Containers/CreativesContainer/constants';
 const TabPane = Tabs.TabPane;
 const {Column} = Table;
 const {TextArea} = CapInput;
@@ -421,16 +422,28 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
     }
     return true;
   }
+  errorFieldsPresent(errorData, channel) {
+    const formData = _.cloneDeep(this.state.formData);
+    let isPresent = true;
+    if (channel === SMS) {
+      const formDataKeys = Object.keys(formData[0]);
+      const errorDataKeys = Object.keys(errorData[0]);
+      isPresent = _.isEqualWith(formDataKeys, errorDataKeys, (formDataKey, errorDataKey) => formDataKeys.includes(errorDataKey));
+    }
+    return isPresent;
+  }
   /* eslint-disable */
   validateForm(tags, injectedTags, isSave, showMessages) {
-    
-    
+    const channel = _.get(this, "props.schema.channel");
     let isValid = true;
     const type = (this.props.location && this.props.location.query.type) ? this.props.location.query.type : 'full';
     const currentModule = (this.props.location && this.props.location.query.module) ? this.props.location.query.module : 'default';
-    const errorData = _.cloneDeep(this.state.errorData);
-    if (this.props.schema.channel === 'SMS') {
-        
+    let errorData = _.cloneDeep(this.state.errorData);
+    const stateFormData = _.cloneDeep(this.state.formData);
+    if (channel && channel.toUpperCase() === SMS) {
+      if(!this.errorFieldsPresent(errorData, SMS)){
+        errorData = this.initializeEditErrorData(stateFormData, 1, true);
+      }
       for (let count = 0; count < this.state.tabCount; count += 1) {
         if (_.isEmpty(errorData[count])) {
           return;
@@ -1075,7 +1088,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
     return formData;
   }
 
-  initializeEditErrorData(formData, tabCount) {
+  initializeEditErrorData(formData, tabCount, isReturnErrorData) {
     const errorData = {};
     for (let idx = 0; idx < tabCount; idx += 1 ) {
       _.forEach(formData[0], (val, key) => {
@@ -1101,6 +1114,9 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
         return true;
       });
     }
+    if (isReturnErrorData) {
+      return errorData;
+    }
     this.setState({errorData});
   }
 
@@ -1218,15 +1234,23 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
 
   initializeStandAloneSections(schema, formDataObj, ifError) {
     let formData = _.cloneDeep(formDataObj);
+    const channel = _.get(this, "props.schema.channel");
+    let isContainer = false;
+    let index = -1;
+    if (channel && channel.toUpperCase() === SMS) {
+      // sms v2 scema does not have any containers section the input ant preview fields are in stand alon section and v1 FormBuilder did not have valiation support for stand alone input fields
+      isContainer = true;
+      index = 0;
+    }
     if (schema.standalone) {
       _.forEach(schema.standalone.sections, (section) => {
         if (section) {
           if (section.type === 'multicols') {
-            formData = this.initializeMultiColSection(section, formData, false, -1, ifError);
+            formData = this.initializeMultiColSection(section, formData, isContainer, index, ifError);
           } else if (section.type === 'col-label') {
-            formData = this.initializeColLabelSection(section, formData, false, -1, ifError);
+            formData = this.initializeColLabelSection(section, formData, isContainer, index, ifError);
           } else if (section.type === 'parent') {
-            formData = this.initializeParentSection(section, formData, false, -1, ifError);
+            formData = this.initializeParentSection(section, formData, isContainer, index, ifError);
           }
         }
       });

package/v2Containers/Sms/Create/index.js

@@ -39,7 +39,6 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
       loading: false,
       isFormValid: true,
       injectedTags: {},
-      checkValidation: true,
       tabKey: '',
       showModal: false,
       modalContent: {title: "Alert", body: "Do you really want to delete this version?", type: 'confirm', id: 'sms-version-modal'},
@@ -251,7 +250,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
       validity: this.state.isFormValid,
       type: 'SMS',
     };
-    this.startValidation();
+    this.setState({checkValidation: true}, this.showError);
 
     if (e) {
       e.source.postMessage(JSON.stringify(response), e.origin);