@capillarytech/creatives-library 2.0.72 → 2.0.74

package/components/CapTagList/index.js

@@ -65,13 +65,11 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
     return list;
   }
 
-  handleOnChange = (data, e) => {
-    console.log('module data', data, e);
+  handleOnChange = (data) => {
     this.props.onContextChange(data);
   };
 
-  handleDynamicDateChange = (data, e) => {
-    console.log('data.target', data.target.value, e);
+  handleDynamicDateChange = (data) => {
     this.setState({dynamicDateValue: data.target.value});
   };
 
@@ -126,7 +124,6 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
     this.setState({expandedKeys, autoExpandParent: false});
   };
   togglePopoverVisibility = (visible) => {
-    console.log('popover ');
     this.setState({visible});
   };
 
@@ -135,7 +132,6 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
   };
 
   renderTags(tags, searchString) {
-    console.log('final tags list', tags);
     const list = [];
     _.forEach(tags, (val, key) => {
       let supportedTagsString = '';
@@ -143,7 +139,6 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
         supportedTagsString += `${supportedTag} ,`;
       });
       supportedTagsString = supportedTagsString.replace(/,\s*$/, "");
-      console.log('supportedTagsString', supportedTagsString);
       if (_.has(val, 'subtags')) {
         const temp = this.renderTags(val.subtags);
         list.push((

package/components/FormBuilder/index.js

@@ -31,7 +31,10 @@ const {CapRadioGroup} = CapRadio;
 
 // import { FormattedMessage } from 'react-intl';
 // import messages from './messages';
-
+const isUrl = (str) => {
+  const res = str.match(/(http(s)?:\/\/.)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/g);
+  return res;
+};
 class FormBuilder extends React.Component { // eslint-disable-line react/prefer-stateless-function
   constructor(props) {
     super(props);
@@ -409,7 +412,10 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
       });
     }
   }
-
+  isValidExternalLink = ({obj, key}) => {
+    const url = _.get(obj, key);
+    return (url && url !== "" && isUrl(url));
+  }
   /* eslint-disable */
   validateForm(tags, injectedTags, isSave, showMessages) {
     
@@ -640,15 +646,15 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
               errorData[parseInt(index)]['cta-deeplink2-select'] = false;
             }
             // }
-            if(tab[`cta-deeplink-text`] === ""){
+            if(!this.isValidExternalLink({obj: tab, key: 'cta-deeplink-text'})){
               errorData[parseInt(index)][`cta-deeplink-text`] = true;
               isValid = false;
               isCurrentTabValid = false;
             }else {
               errorData[parseInt(index)]['cta-deeplink-text'] = false;
             }
-
-            if(tab['cta-deeplink2-text'] === ""){
+            
+            if(!this.isValidExternalLink({obj: tab, key: 'cta-deeplink2-text'})){
               errorData[parseInt(index)][`cta-deeplink2-text`] = true;
               isValid = false;
               isCurrentTabValid = false;
@@ -671,7 +677,9 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
             }else {
               errorData[parseInt(index)]['secondary-cta-0-label'] = false;
             }
-            if(tab['cta-deeplink-secondary-cta-0-text'] === ""){
+
+            
+            if(!this.isValidExternalLink({obj: tab, key: 'cta-deeplink-secondary-cta-0-text'})){
               errorData[parseInt(index)][`cta-deeplink-secondary-cta-0-text`] = true;
               isValid = false;
               isCurrentTabValid = false;
@@ -692,7 +700,8 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
             }else {
               errorData[parseInt(index)]['secondary-cta-1-label'] = false;
             }
-            if(tab['cta-deeplink-secondary-cta-1-text'] === ""){
+            
+            if(!this.isValidExternalLink({obj: tab, key: 'cta-deeplink-secondary-cta-1-text'})){
               errorData[parseInt(index)][`cta-deeplink-secondary-cta-1-text`] = true;
               isValid = false;
               isCurrentTabValid = false;
@@ -706,7 +715,8 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
             }else {
               errorData[parseInt(index)]['cta-deeplink-secondary-cta-1-select'] = false;
             }
-            if(tab['cta-deeplink-secondary-cta-1-text2'] === ""){
+            
+            if(!this.isValidExternalLink({obj: tab, key: 'cta-deeplink-secondary-cta-1-text2'})){
               errorData[parseInt(index)][`cta-deeplink-secondary-cta-1-text2`] = true;
               isValid = false;
               isCurrentTabValid = false;

package/package.json

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

package/v2Containers/Email/index.js

@@ -307,7 +307,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
           this.setEditData(nextProps.Email.templateDetails);
         });
       }
-      if (this.state.isEdit && nextProps.location.query.module === "library" && !_.isEmpty(nextProps.templateData) && !this.props.params.id && !nextProps.isGetFormData) {
+      if (this.state.isEdit && nextProps.location.query.module === "library" && !_.isEmpty(nextProps.templateData) && !this.props.params.id && !nextProps.isGetFormData && _.isEmpty(_.get(this, `state.formData['template-subject']`))) {
         this.startTemplateCreation(nextProps.templateData);
       }
       if (nextProps.location.query.module === 'library' && nextProps.isGetFormData) {
@@ -2065,6 +2065,10 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
           "language": this.supportedLanguages[languageIndex].language,
           "template-content": !data.base.is_drag_drop && data.base.is_drag_drop !== 1 ? data.base.html_content : "",
         };
+        const dragDropId = _.get(data, 'base.drag_drop_id');
+        if (dragDropId) {
+          tempData.drag_drop_id = dragDropId;
+        }
         formData[0].base = true;
         formData[0].selectedLanguages.push(this.supportedLanguages[languageIndex].iso_code);
         formData[0][this.supportedLanguages[languageIndex].iso_code] = tempData;

package/v2Containers/MobilePush/Create/index.js

@@ -269,7 +269,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
                     type: "input",  //Resembles component to be used
                     metaType: "text",
                     datatype: "string",
-                    errorMessage: "External Link cannot be empty",
+                    errorMessage: <FormattedMessage {...messages.invalidExternalLink}/>,
                     required: true,
                     fluid: true,
                     width: 18,
@@ -277,7 +277,6 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
                     style: {
                       width: '100%',
 
-                      marginBottom: '16px',
                     },
                     styling: "semantic",
                     order: 1,

package/v2Containers/MobilePush/Create/messages.js

@@ -154,6 +154,10 @@ export default defineMessages({
     id: 'app.containers.MobilePush.Create.externalLinkCantEmpty',
     defaultMessage: 'External Link cannot be empty',
   },
+  "invalidExternalLink": {
+    id: 'app.containers.MobilePush.Create.invalidExternalLink',
+    defaultMessage: 'External Link cannot be empty / Invalid url',
+  },
   "Do you really want to go back? All your temporary changes will be lost!": {
     id: 'app.containers.MobilePush.Create.goBackConfirmation',
     defaultMessage: "Going back will discard all the changes you've made. Continue?",

package/v2Containers/MobilePush/commonMethods.js

@@ -1,5 +1,7 @@
 import {get, filter, cloneDeep} from 'lodash';
-
+import React from 'react';
+import {FormattedMessage} from 'react-intl';
+import messages from './Create/messages';
 function getPrimaryCtaFields({inputFields, fieldIndex, deepLinkOptions}) {
   const newInputFields = cloneDeep(inputFields);
   newInputFields.splice(fieldIndex + 1, 0, {
@@ -205,15 +207,13 @@ function getLinkTypeFields({inputFieldsArgs, fieldIndex, deepLinkOptions, formDa
           type: "input",  //Resembles component to be used
           metaType: "text",
           datatype: "string",
-          errorMessage: "External Link cannot be empty",
+          errorMessage: <FormattedMessage {...messages.invalidExternalLink}/>,
           required: true,
           fluid: true,
           width: 18,
           offset: 1,
           style: {
             width: '100%',
-
-            marginBottom: '16px',
           },
           styling: "semantic",
           order: 1,

package/v2Containers/Templates/_templates.scss

@@ -4,15 +4,19 @@
       padding: unset;
     }
   }
+.creatives-templates-list.full-mode{
   .pagination-container {
     .cap-custom-card-list-row {
       .cap-custom-card-list-col{
-        &:nth-child(4) {
+        &:nth-child(4n+4) {
           margin-right: unset;
         }
       }
     }
   }
+}
+
+  
 
 .card-title {
   line-height: 24px;

package/v2Containers/Templates/index.js

@@ -1589,7 +1589,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     const {route} = this.props;
     const loadingTip = (this.props.Templates.sendingFile && (this.state.channel.toLowerCase() === 'email' || this.state.channel.toLowerCase() === 'ebill')) ? this.props.intl.formatMessage(messages.uploadingFile) : this.props.intl.formatMessage(messages.gettingAllTemplates);
     return (
-      <div>
+      <div className={`creatives-templates-list ${this.props.isFullMode ? 'full-mode' : 'library-mode'}`}>
         <input type="file" id="filename" style={{ display: 'none'}} accept=".zip, .html, .htm" onChange={(event) => this.handleFileUpload(event, {files: event.target.files})} />