@capillarytech/creatives-library 3.0.17 → 3.0.19

package/containers/Email/index.js

@@ -2638,20 +2638,22 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       const formData = _.cloneDeep(this.state.formData);
       formData[0].selectedLanguages = [];
       let tabKey;
+      const isDragDrop = _.get(data, 'base.is_drag_drop');
       if (this.props.location.query.type === 'embedded' && (this.props.location.query.isLanguageSupport === undefined || this.props.location.query.isLanguageSupport === 'false')) {
-        formData['template-subject'] = data.base.subject ? data.base.subject : '';
+        formData['template-subject'] = _.get(data, 'base.subject', '');
         const baseLanguage = this.props.Global.currentOrgDetails.basic_details.base_language;
         let languageIndex = _.findIndex(this.supportedLanguages, {iso_code: baseLanguage});
         console.log("startTemplatecreation before index", languageIndex, this.supportedLanguages, baseLanguage, formData);
         if (languageIndex === -1) {
           languageIndex = 0;
         }
+        const isDragDrop = _.get(data, 'base.is_drag_drop');
         const tempData = {
-          "is_drag_drop": data.base.is_drag_drop,
+          "is_drag_drop": isDragDrop,
           "lang_id": this.supportedLanguages[languageIndex].lang_id,
           "iso_code": this.supportedLanguages[languageIndex].iso_code,
           "language": this.supportedLanguages[languageIndex].language,
-          "template-content": !data.base.is_drag_drop && data.base.is_drag_drop !== 1 ? data.base.html_content : "",
+          "template-content": !isDragDrop && isDragDrop !== 1 ? _.get(data, 'base.html_content') : "",
         };
         formData[0].base = true;
         formData[0].selectedLanguages.push(this.supportedLanguages[languageIndex].iso_code);
@@ -2700,7 +2702,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       }
       formData.base = _.cloneDeep(formData[0]);
       console.log('startTemplateCreation final ', formData);
-      this.setState({formData, loading: false, injectedTags: data.tags, tabKey, isDragDrop: (data.base.is_drag_drop !== 0 )}, () => {
+      this.setState({formData, loading: false, injectedTags: data.tags, tabKey, isDragDrop: (isDragDrop !== 0 )}, () => {
         // this.setState({tabKey: ''});
         _.forEach(formData[0].selectedLanguages, (language) => {
           if (formData[0][language].is_drag_drop) {

package/containers/Templates/index.js

@@ -222,13 +222,15 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
             }
           }
         });
-        this.setState({selectedAccount: selectedAccount.name}, () => {
-          params.wecrmId = selectedAccount.configs.wecrm_app_id;
-          params.wecrmToken = selectedAccount.configs.wecrm_token;
-          params.originalId = selectedAccount.sourceAccountIdentifier;
-          nextProps.actions.setWeChatAccount(selectedAccount);
-          this.getAllTemplates({params});
-        });
+        if (!_.isEmpty(selectedAccount)) {
+          this.setState({selectedAccount: selectedAccount.name}, () => {
+            params.wecrmId = selectedAccount.configs.wecrm_app_id;
+            params.wecrmToken = selectedAccount.configs.wecrm_token;
+            params.originalId = selectedAccount.sourceAccountIdentifier;
+            nextProps.actions.setWeChatAccount(selectedAccount);
+            this.getAllTemplates({params});
+          });
+        }
       } else if (this.state.channel.toLowerCase() === 'mobilepush' && (nextProps.location.query.account_id || nextProps.location.query.source_account_id)) {
         _.forEach(nextProps.Templates.weCrmAccounts, (account) => {
           if ((nextProps.location.query.account_id && account.id === Number(nextProps.location.query.account_id)) || (nextProps.location.query.source_account_id && account.sourceAccountIdentifier && account.sourceAccountIdentifier === nextProps.location.query.source_account_id)) {

package/package.json

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

package/v2Components/NavigationBar/index.js

@@ -72,10 +72,7 @@ class NavigationBar extends React.Component {
   onHelpIconClick = () => {
     const { helpUrl } = this.props;
     if (helpUrl) {
-      const stateObj = {
-        page: "help",
-      };
-      window.history.pushState(stateObj, 'Help', window.location.replace(helpUrl));
+      window.open(helpUrl, '_blank');
     }
   };
 

package/v2Containers/Assets/Gallery/index.js

@@ -13,7 +13,7 @@ import { FormattedMessage, injectIntl, intlShape } from 'react-intl';
 import { createStructuredSelector } from 'reselect';
 import moment from "moment";
 import _ from "lodash";
-import { CapHeader, CapInput, CapButton, CapSpin, CapIcon, CapDropdown, CapMenu, CapCustomCard, CapSlideBox, CapLabel, CapIllustration} from '@capillarytech/cap-ui-library';
+import { CapHeading, CapHeader, CapInput, CapButton, CapSpin, CapIcon, CapDropdown, CapMenu, CapCustomCard, CapSlideBox, CapLabel, CapIllustration} from '@capillarytech/cap-ui-library';
 import { Popover } from 'antd';
 import makeSelectGallery from './selectors';
 import messages from './messages';
@@ -336,6 +336,11 @@ export class Gallery extends React.Component { // eslint-disable-line react/pref
         {!isLoading && <div>
           {!_.isEmpty(templates) || !_.isEmpty(this.state.searchText) ? <div className="pagination-container">
             <CapCustomCardList key={`${currentChannel}-card-list`} cardList={cardDataList} type={'Email'} />
+            {!_.isEmpty(this.state.searchText) && _.isEmpty(templates) && (
+              <div style={{ height: '65vh', textAlign: 'center', lineHeight: '65vh'}}>
+                <CapHeading type="h6">{this.props.intl.formatMessage(messages.noTemplatesFound)}</CapHeading>
+              </div>
+            )}
           </div> : <CapIllustration {...this.getIllustrationProps} />}</div>
         }
       </CapSpin>

package/v2Containers/Assets/Gallery/messages.js

@@ -98,4 +98,8 @@ export default defineMessages({
     id: 'app.containers.Assets.Gallery.lastUpdated',
     defaultMessage: 'Last update {on} by {by}',
   },
+  noTemplatesFound: {
+    id: `app.containers.Assets.Gallery.noTemplatesFound`,
+    defaultMessage: 'No templates found',
+  },
 });

package/v2Containers/Cap/constants.js

@@ -31,4 +31,4 @@ export const CLEAR_TOPBAR_MENU_DATA = 'creatives/cap/CLEAR_TOPBAR_MENU_DATA';
 export const CAMPAIGN_SETTINGS_URL = '/creatives/settings/message';
 export const BRAND_SETTINGS_URL = '/org/index';
 export const PROFILE_SETTINGS_URL = '/org/users/NewProfile';
-export const HELP_URL = 'https://support.capillarytech.com';
+export const HELP_URL = 'https://support.capillarytech.com/en/support/solutions/4000007853';

package/v2Containers/Templates/index.js

@@ -542,9 +542,11 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       {filterContent}
       <CapSpin spinning={isLoading} tip={loadingTip} style={{width: '100%'}}>
         {!isLoading && <div>
-          {!_.isEmpty(templates) || !_.isEmpty(this.state.searchText) || !_.isEmpty(this.props.Templates.templateError) ? <div className="pagination-container">
-            <CapCustomCardList key={`${currentChannel}-card-list`} cardList={cardDataList} type={currentChannel} />
-          </div> : ['sms', "email"].includes(this.state.channel.toLowerCase()) && <CapIllustration {...this.getChannelTypeIllustrationInfo(currentChannel)} />
+          {!_.isEmpty(templates) || !_.isEmpty(this.state.searchText) || !_.isEmpty(this.props.Templates.templateError) ? (
+            <div className={!_.isEmpty(this.state.searchText) && _.isEmpty(cardDataList) ? '' : "pagination-container"}>
+              <CapCustomCardList key={`${currentChannel}-card-list`} cardList={cardDataList} type={currentChannel} />
+            </div>)
+            : ['sms', "email"].includes(this.state.channel.toLowerCase()) && <CapIllustration {...this.getChannelTypeIllustrationInfo(currentChannel)} />
           }
 
           {(this.state.selectedAccount === '' && _.isEmpty(this.props.Templates.selectedWeChatAccount)) && (this.state.channel.toLowerCase() === 'wechat' || this.state.channel.toLowerCase() === "mobilepush") &&
@@ -1671,7 +1673,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
             </Pagination>} */}
           {(((this.state.selectedAccount !== '' && !_.isEmpty(this.props.Templates.selectedWeChatAccount) && this.state.channel.toLowerCase() === 'wechat') || this.state.channel.toLowerCase() !== 'wechat') && _.isEmpty(this.props.TemplatesList)) && !this.props.Templates.getAllTemplatesInProgress && !_.isEmpty(this.state.searchText) &&
             <div style={{ height: '65vh', textAlign: 'center', lineHeight: '65vh'}}>
-              <CapHeading type="h6">{this.props.intl.formatMessage(messages.noTemplatesMessage)}</CapHeading>
+              <CapHeading type="h6">{this.props.intl.formatMessage(messages.noTemplatesFound)}</CapHeading>
             </div>}
         </CapRow>
 

package/v2Containers/Templates/messages.js

@@ -306,5 +306,8 @@ export default defineMessages({
     id: `${scope}.template`,
     defaultMessage: 'template',
   },
-
+  "noTemplatesFound": {
+    id: `${scope}.noTemplatesFound`,
+    defaultMessage: 'No templates found',
+  },
 });