@capillarytech/creatives-library 6.9.0 → 6.9.1

package/package.json

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

package/v2Components/BeeEditor/index.js

@@ -5,7 +5,6 @@
 */
 import React, { useEffect, useState, useRef, useCallback } from 'react';
 import PropTypes from 'prop-types';
-import get from 'lodash/get';
 import { injectIntl, intlShape, FormattedMessage } from 'react-intl';
 import TagList from '../../v2Containers/TagList';
 import
@@ -17,6 +16,7 @@ import
 }
 from '@capillarytech/cap-ui-library';
 import messages from './messages';
+import './index.scss';
 
 function BeeEditor(props) {
   const {
@@ -72,7 +72,7 @@ function BeeEditor(props) {
             resolve({
               type: 'custom',
               label: UNSUBSCRIBE,
-              link: `<a href='{{${UNSUBSCRIBE}}}'>unsubscribe</a>`,
+              link: `{{${UNSUBSCRIBE}}}`,
             });
           },
         },
@@ -241,7 +241,13 @@ function BeeEditor(props) {
         selectedOfferDetails={selectedOfferDetails}
         visibleTaglist={visibleTaglist}
         hidePopover
-        modalProps={{onCancel: onCancelTagList, style: { left: 200, top: 250 }}}
+        modalProps={
+          {
+            onCancel: onCancelTagList,
+            style: { left: 200, top: 250 },
+            className: "bee-editor-tag-list"
+          }
+        }
         onContextChange={onContextChange}
       />
       <CapModal

package/v2Components/BeeEditor/index.scss

@@ -0,0 +1,11 @@
+.cap-modal-v2.bee-editor-tag-list {
+  .ant-modal-content {
+    .ant-modal-body {
+      padding-top: 20px;
+      padding-bottom: 10px;
+    }
+    .ant-modal-footer {
+      display: none;
+    }
+  }
+}

package/v2Components/EmailPreview/_emailPreview.scss

@@ -9,8 +9,8 @@
 
   #emailPreivew-container {
     position: relative;
-    left: 20vw;
-    width: 80vw;
+    left: 18vw;
+    width: 82vw;
     height: 100vh;
     background: rgba(255,255,255,1);
     // padding: 0 24px 0 24px;

package/v2Containers/Email/index.js

@@ -2791,7 +2791,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
           show={this.state.showImageSelectionBox}
           handleClose={this.handleImagePreviewClose}
           isLoading={this.props.Email.fetchingAllAssets}
-          size="size-l"
+          size="size-xl"
         />
         {/* <div id="bee-plugin-container" style={{ height: '600px'}}></div> */}
         {this.state.showConfirmationModal && this.renderConfirmationModal()}

package/v2Containers/Email/initialSchema.js

@@ -380,7 +380,7 @@ export const response = {
                           styling: "semantic",
                           order: 3,
                           width: 2,
-                          offset: 1,
+                          offset: 4,
                           fluid: false,
                           onlyDisplay: true,
                           submitAction: "onTabOptionSelect",

package/v2Containers/EmailWrapper/index.js

@@ -214,6 +214,7 @@ export class EmailWrapper extends React.Component { // eslint-disable-line react
                   value={templateName}
                   labelPosition="top"
                   size="default"
+                  style={{ width: '68%'}}
                 />
               }
               <CardContainer>

package/v2Containers/Templates/index.js

@@ -1510,12 +1510,23 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
 
 
   isLoading = () => {
-    const lineLoader = (this.props.Templates.getAllTemplatesInProgress && this.state.channel.toLowerCase() === 'line');
-    const smsLoader = (this.props.Templates.getAllTemplatesInProgress && this.state.channel.toLowerCase() === 'sms');
-    const wechatLoader = (((this.state.selectedAccount !== '' && this.props.Templates.getAllTemplatesInProgress) || (this.props.Templates.fetchingWeCrmAccounts)) && this.state.channel.toLowerCase() === 'wechat');
-    const mobilePushLoader = (((this.props.Templates.getAllTemplatesInProgress) || (this.props.Templates.fetchingWeCrmAccounts)) && this.state.channel.toLowerCase() === 'mobilepush');
-    const emailLoader = ((this.props.Templates.getAllTemplatesInProgress || this.props.Templates.sendingFile) && this.state.channel.toLowerCase() === 'email');
-    const ebillLoader = ((this.props.Templates.getAllTemplatesInProgress || this.props.Templates.sendingFile) && this.state.channel.toLowerCase() === 'ebill');
+    const { EmailCreate, Templates } = this.props;
+    const {
+      getAllTemplatesInProgress,
+      deleteTemplateInProgress,
+      fetchingWeCrmAccounts,
+      sendingFile,
+    } = Templates;
+    const lineLoader = (getAllTemplatesInProgress && this.state.channel.toLowerCase() === 'line');
+    const smsLoader = (getAllTemplatesInProgress && this.state.channel.toLowerCase() === 'sms');
+    const wechatLoader = (((this.state.selectedAccount !== '' && getAllTemplatesInProgress) || (fetchingWeCrmAccounts)) && this.state.channel.toLowerCase() === 'wechat');
+    const mobilePushLoader = (((getAllTemplatesInProgress) || (fetchingWeCrmAccounts)) && this.state.channel.toLowerCase() === 'mobilepush');
+    const emailLoader = (
+      (getAllTemplatesInProgress ||
+      sendingFile ||
+      deleteTemplateInProgress ||
+      EmailCreate.duplicateTemplateInProgress) && this.state.channel.toLowerCase() === 'email');
+    const ebillLoader = ((getAllTemplatesInProgress || sendingFile) && this.state.channel.toLowerCase() === 'ebill');
     const isLoading = ((wechatLoader !== undefined) ? wechatLoader : false) ||
       (smsLoader !== undefined ? smsLoader : false) ||
       (emailLoader !== undefined ? emailLoader : false) ||
@@ -1827,7 +1838,19 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     const creativesParams = this.getCreativesParams();
     const templates = this.props.TemplatesList || [];
     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);
+    const loadingTipMap = {
+      sendingFile: 'uploadingFile',
+      deleteTemplateInProgress: 'deletingTemplate',
+      duplicateTemplateInProgress: 'duplicatingTemplate',
+    };
+    const { sendingFile, deleteTemplateInProgress } = this.props.Templates;
+    const loadingTipIntl =
+        ((['email', 'ebill'].includes(this.state.channel.toLowerCase() === 'email')) && sendingFile && 'sendingFile') ||
+        (deleteTemplateInProgress && 'deletingTemplate') ||
+        (this.props.EmailCreate.duplicateTemplateInProgress && 'duplicatingTemplate');
+
+    const loadingTip = messages[loadingTipIntl] ? this.props.intl.formatMessage(messages[loadingTipIntl]) : this.props.intl.formatMessage(messages.gettingAllTemplates);
+
     return (
       <>
         {activeMode === ACCOUNT_CHANGE_MODE && this.renderAccountSelection()}

package/v2Containers/Templates/messages.js

@@ -350,4 +350,12 @@ export default defineMessages({
     id: `${scope}.richMediaTemplates`,
     defaultMessage: 'Rich media templates',
   },
+  deletingTemplate: {
+    id: `${scope}.deletingTemplate`,
+    defaultMessage: 'Deleting template...',
+  },
+  duplicatingTemplate: {
+    id: `${scope}.duplicatingTemplate`,
+    defaultMessage: 'Duplicating template...'
+  },
 });