@capillarytech/creatives-library 3.9.10 → 3.9.12

package/components/Ckeditor/index.js

@@ -13,7 +13,7 @@ import React from 'react';
 import _ from 'lodash';
 // import messages from './messages';
 const loadScript = require('load-script');
-const defaultScriptUrl = "https://ckeditor.com/assets/libs/ckeditor4/4.11.4/ckeditor.js";
+const defaultScriptUrl = "https://ckeditor.com/assets/libs/ckeditor4/4.14.0/ckeditor.js";
 const user = localStorage.getItem('user');
 let locale = 'en';
 if (user && JSON.parse(user).lang) {

package/components/TemplatePreview/_templatePreview.scss

@@ -272,6 +272,14 @@
       }
   }
 
+  .cap-carousel-v2 {
+    .line-preview {
+      .message-pop {
+        margin-top: -6px;
+      }
+    }
+  }
+
   .msgContainer {
     position: absolute;
     top: 18%;

package/components/TemplatePreview/index.js

@@ -292,7 +292,7 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
           channel && channel.toLowerCase() === 'line' ? (
             <div className="shell align-center" id="sms-preview">
               <CapImage className="preview-image" src={wechatBody} alt={this.props.intl.formatMessage(messages.previewGenerated)}/>
-              <div className="msgContainer">
+              <div className="msgContainer line-preview">
                 <div className="sms-icon" style={{ width: '25px', height: '25px', background: '#2E89DF' }}></div>
                 <div className="message-pop align-left" style={{ background: '#ffffff', color: '#333333' }}>
                   { (content && content.bodyImage) ? <CapImage src={content.bodyImage} alt="ddd" style={{maxWidth: '100%'}}/> : '' }

package/package.json

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

package/v2Components/Ckeditor/index.js

@@ -13,7 +13,7 @@ import React from 'react';
 import _ from 'lodash';
 // import messages from './messages';
 const loadScript = require('load-script');
-const defaultScriptUrl = "https://ckeditor.com/assets/libs/ckeditor4/4.11.4/ckeditor.js";
+const defaultScriptUrl = "https://ckeditor.com/assets/libs/ckeditor4/4.14.0/ckeditor.js";
 const user = localStorage.getItem('user');
 let locale = 'en';
 if (user && JSON.parse(user).lang) {

package/v2Components/TemplatePreview/_templatePreview.scss

@@ -1,3 +1,5 @@
+@import '~@capillarytech/cap-ui-library/styles/_variables.scss';
+
 .shell-v2 {
   position: relative;
   -webkit-transform: translate(-50%);
@@ -40,6 +42,15 @@
     &.wechat{
       width: 52%;
     }
+    &.line-preview {
+      margin-left: $CAP_SPACE_16;
+
+      .message-pop {
+        width: 80%;
+        left: 36px;
+        margin-top: -6px;
+      }
+    }
 
     .message-pop{
       .unicode-disabled{

package/v2Components/TemplatePreview/index.js

@@ -281,7 +281,7 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
           channel && channel.toLowerCase() === 'line' ? (
             <div className="shell-v2 align-center" id="sms-preview">
               <CapImage className="preview-image" src={wechatBodyNew} alt={this.props.intl.formatMessage(messages.previewGenerated)}/>
-              <div className="msgContainer">
+              <div className="msgContainer line-preview">
                 <div className="sms-icon" style={{ left: 10, borderRadius: '50%', width: '20px', height: '20px', background: '#2E89DF' }}></div>
                 <div className="message-pop align-left" style={{ background: '#ffffff', color: '#333333' }}>
                   {

package/v2Containers/CreativesContainer/index.js

@@ -216,7 +216,7 @@ class Creatives extends React.Component {
           break;
         }
         case constants.LINE: {
-          const { messageBody } = templateData;
+          const { messageBody= '{}', isDefault } = templateData;
           const {
             messages,
             to,
@@ -226,6 +226,7 @@ class Creatives extends React.Component {
           } = JSON.parse(messageBody);
           creativesTemplateData = {
             type: constants.LINE,
+            isDefault,
             edit: true,
             definition: {
               mode: type,

package/v2Containers/Line/Create/index.js

@@ -143,7 +143,7 @@ export class Line extends Component {
         } = lineData;
         selectedAccount = weCrmAccounts.filter((account) => account === selectedAccount);
       }
-      getFormSubscriptionData({ ...this.getFormData(), accountDetails: selectedAccount});
+      getFormSubscriptionData({ ...this.getFormData(), accountDetails: selectedAccount, type: 'LINE' });
     }
     if (templateData && templateData.edit) {
       this.setEditState(templateData);
@@ -168,7 +168,7 @@ export class Line extends Component {
           type: 'TAG',
           context:
             this.props.location.query.type === 'embedded'
-              ? this.props.location.query.module
+              ? 'outbound'
               : 'default',
           embedded:
             this.props.location.query.type === 'embedded'
@@ -287,7 +287,7 @@ export class Line extends Component {
 
   setEditState = (data) => {
     const { formData: previousFormData } = this.state;
-    const { text, originalContentUrl, imagePreview, image } = get(data, "versions.base.content.messages[0]");
+    const { text, originalContentUrl, imagePreview, image } = get(data, "versions.base.content.messages[0]", {});
     const retrievedData = {
       ...previousFormData[0],
     };
@@ -873,17 +873,10 @@ export class Line extends Component {
       this.props.globalActions.addMessageToQueue(message);
     } else {
       data.fileParams.isGeneratePreview = true;
-      const name = data.file.name.split('.');
-      const blob = data.file.slice(0, -1, 'image');
-      const newFile = new File(
-        [blob],
-        `${name[0]}${Date.now()}.${name[1]}`,
-        { type: 'image' }
-      );
       this.props.actions.uploadAsset(
-        newFile,
+        data.file,
         data.type,
-        data.fileParams
+        data.fileParams,
       );
     }
   };
@@ -974,18 +967,20 @@ export class Line extends Component {
         createTemplateInProgress,
         assetUploading,
       } = {},
-      templateData: {
-        edit,
-        mode,
-        orgId,
-      } = {},
+      templateData,
       params: {
         id,
       } = {},
     } = this.props;
+    const {
+      edit,
+      mode,
+      orgId,
+      isDefault,
+    } = templateData || {};
     let loading = createTemplateInProgress || false;
     loading = !!assetUploading;
-    if (edit || mode === 'edit' || (orgId && id)) {
+    if (!isDefault && (edit || mode === 'edit' || (orgId && id))) {
       const {
         base: {
           'message-editor': msgEditor,

package/v2Containers/WeChat/MapTemplates/index.js

@@ -442,7 +442,7 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
       data: {},
       BrandId: (selectedWeChatAccount.configs.brand_id ? selectedWeChatAccount.configs.brand_id : ''),
       OriginalId: selectedWeChatAccount.sourceAccountIdentifier,
-      content: encodeURIComponent(editTemplateData.versions.base.content),
+      content: editTemplateData.versions.base.content,
       isInternalUrl: this.state.formData['is-internal-url'],
       creative_template_id: editTemplateData._id,
       touser: "{{wechat_open_id}}",