@capillarytech/creatives-library 3.0.16 → 3.0.18

package/containers/Cap/actions.js

@@ -51,6 +51,12 @@ export function fetchSchemaForEntity(queryParams) {
   };
 }
 
+export function removeEntitySchema() {
+  return {
+    type: types.ROMOVE_ENTITY_SCHEMA,
+  };
+}
+
 export function setInjectedTags(injectedTags) {
   return {
     type: types.SET_INJECTED_TAGS, injectedTags,

package/containers/Cap/constants.js

@@ -18,6 +18,7 @@ export const GET_USER_DATA_FAILURE = 'cap/GET_USER_DATA_FAILURE';
 export const GET_SCHEMA_FOR_ENTITY_FAILURE = 'cap/GET_SCHEMA_FOR_ENTITY_FAILURE';
 export const GET_SCHEMA_FOR_ENTITY_REQUEST = 'cap/GET_SCHEMA_FOR_ENTITY_REQUEST';
 export const GET_SCHEMA_FOR_ENTITY_SUCCESS = 'cap/GET_SCHEMA_FOR_ENTITY_SUCCESS';
+export const ROMOVE_ENTITY_SCHEMA = 'cap/ROMOVE_ENTITY_SCHEMA';
 export const CLEAR_META_ENTITIES = 'cap/CLEAR_META_ENTITIES';
 export const HIDE_TAGS = 'cap/HIDE_TAGS';
 

package/containers/Cap/reducer.js

@@ -90,6 +90,8 @@ function capReducer(state = fromJS(initialState), action) {
           tags: action.data && action.entityType === 'TAG' ? action.data.metaEntities : stateMeta.tags,
         });
     }
+    case types.ROMOVE_ENTITY_SCHEMA:
+      return state.set('metaEntities', {});
     case types.CLEAR_META_ENTITIES:
       return state.set('metaEntities', {
         layouts: [],

package/containers/Email/index.js

@@ -2537,13 +2537,15 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         });
       }
     });
-    _.forEach(temp.standalone.sections[1].inputFields[0].cols, (inputField) => {
-      if (inputField.id === "template-version") {
-        const iF = inputField;
-        iF.colStyle = {};
-        iF.colStyle.display = "none";
-      }
-    });
+    if (temp.standalone.sections && temp.standalone.sections.length > 0) {
+      _.forEach(temp.standalone.sections[1].inputFields[0].cols, (inputField) => {
+        if (inputField.id === "template-version") {
+          const iF = inputField;
+          iF.colStyle = {};
+          iF.colStyle.display = "none";
+        }
+      });
+    }
     //}
     temp = type === 'embedded' ? this.removeStandAlone(temp) : temp;
     this.setState({schema: temp, isSchemaChanged: true, loadingStatus: this.state.loadingStatus + 1}, () => {

package/containers/MobilePush/Create/index.js

@@ -179,6 +179,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
         query: type === 'embedded' ? {type: 'embedded', module} : {module},
       });
     }
+    this.props.globalActions.removeEntitySchema();
   };
 
   componentDidMount = () => {

package/containers/MobilePush/Edit/index.js

@@ -803,7 +803,6 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
   };
 
   getCurrentWindow = (e) => {
-    console.log('in sms create', e);
     const response = {
       action: e.action,
       value: 'edit',

package/containers/Templates/index.js

@@ -1128,7 +1128,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
             {template._id === this.state.hoveredItem ? <CapButton onClick={(e) => this.handleEditClick(e, template._id)} className="edit-button" type="secondary">{type === 'embedded' ? this.props.intl.formatMessage(messages.selectButton) : this.props.intl.formatMessage(messages.editButton)}</CapButton> : ''}
             {template._id === this.state.hoveredItem ? <CapButton onClick={() => this.handlePreviewClick(template)} className="preview-button" type="cancel">{this.props.intl.formatMessage(messages.previewButton)}</CapButton> : ''}
           </div>);
-      } else if (this.state.channel.toLowerCase() === 'line') {
+      } else if (this.state.channel.toLowerCase() === 'line' && template.type.toLowerCase() === 'line') {
         //content = template.versions.base.messages[0].Text;
         content = {
           bodyText: template.versions.base.content.messages[0].text ? template.versions.base.content.messages[0].text : '',

package/package.json

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

package/v2Containers/CallTask/index.js

@@ -58,13 +58,15 @@ export class CallTask extends React.Component { // eslint-disable-line react/pre
   }
 
   getIllustrationProps=() => {
-    const { intl, showContentInSlidebox, onCreateNew } = this.props;
+    const { intl, showContentInSlidebox, onCreateNew, isFullMode } = this.props;
     const { formatMessage } = intl;
+    const templateIntlText = formatMessage(messages.template);
+    const templateText = isFullMode ? templateIntlText : '';
     return {
-      buttonLabel: formatMessage(messages.newCallTaskTemplate),
+      buttonLabel: formatMessage(messages.newCallTaskTemplate, { templateText }),
       onClick: showContentInSlidebox ? this.showNewCallTask : onCreateNew,
       illustrationImage: calltaskIllustration,
-      title: formatMessage(messages.callTaskTitleIllustartion),
+      title: formatMessage(messages.callTaskTitleIllustartion, { templateText }),
     };
   }
   render() {
@@ -129,6 +131,7 @@ CallTask.propTypes = {
   loadingMetaEntities: PropTypes.bool,
   showContentInSlidebox: PropTypes.bool,
   onCreateNew: PropTypes.func,
+  isFullMode: PropTypes.bool,
 };
 
 

package/v2Containers/CallTask/messages.js

@@ -20,10 +20,14 @@ export default defineMessages({
   },
   callTaskTitleIllustartion: {
     id: `app.containers.CallTask.callTaskTitleIllustartion`,
-    defaultMessage: 'Create a Call Task template',
+    defaultMessage: 'Create a Call Task {templateText}',
   },
   newCallTaskTemplate: {
     id: `app.containers.CallTask.newCallTaskTemplate`,
-    defaultMessage: 'New Call Task template',
+    defaultMessage: 'New Call Task {templateText}',
+  },
+  template: {
+    id: `app.containers.CallTask.template`,
+    defaultMessage: 'template',
   },
 });

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") &&
@@ -1372,27 +1374,30 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     return isLoading;
   }
   getChannelTypeIllustrationInfo = (type) => {
+    const { isFullMode, intl } = this.props;
+    const templateIntlMsg = intl.formatMessage(messages.template);
+    const templateText = isFullMode ? templateIntlMsg : '';
     switch (type) {
       case 'SMS':
         return {
-          buttonLabel: <FormattedMessage {...messages.newSMSTemplate} />,
+          buttonLabel: <FormattedMessage {...messages.newSMSTemplate} values={{ template: templateText }} />,
           onClick: this.createTemplate,
           illustrationImage: smsIllustration,
-          title: <FormattedMessage {...messages.smsTitleIllustartion} />,
+          title: <FormattedMessage {...messages.smsTitleIllustartion} values={{ template: templateText }} />,
         };
       case 'EMAIL':
         return {
-          buttonLabel: <FormattedMessage {...messages.newEmailTemplate} />,
+          buttonLabel: <FormattedMessage {...messages.newEmailTemplate} values={{ template: templateText }} />,
           onClick: this.createTemplate,
           illustrationImage: emailIllustration,
-          title: <FormattedMessage {...messages.emailTitleIllustartion} />,
+          title: <FormattedMessage {...messages.emailTitleIllustartion} values={{ template: templateText }} />,
         };
       case 'MOBILEPUSH':
         return {
-          buttonLabel: <FormattedMessage {...messages.newNotificationTemplate} />,
+          buttonLabel: <FormattedMessage {...messages.newNotificationTemplate} values={{ template: templateText }} />,
           onClick: this.createTemplate,
           illustrationImage: pushIllustration,
-          title: <FormattedMessage {...messages.pushTitleIllustartion} />,
+          title: <FormattedMessage {...messages.pushTitleIllustartion} values={{ template: templateText }} />,
         };
       default:
         return {};
@@ -1668,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

@@ -280,27 +280,34 @@ export default defineMessages({
   },
   "newSMSTemplate": {
     id: `${scope}.newSMSTemplate`,
-    defaultMessage: 'New SMS template',
+    defaultMessage: 'New SMS {template}',
   },
   "newEmailTemplate": {
     id: `${scope}.newEmailTemplate`,
-    defaultMessage: 'New email template',
+    defaultMessage: 'New email {template}',
   },
   "newNotificationTemplate": {
     id: `${scope}.newNotificationTemplate`,
-    defaultMessage: 'New notification template',
+    defaultMessage: 'New notification {template}',
   },
   "pushTitleIllustartion": {
     id: `${scope}.pushTitleIllustartion`,
-    defaultMessage: 'Create a mobile push notification template',
+    defaultMessage: 'Create a mobile push notification {template}',
   },
   "emailTitleIllustartion": {
     id: `${scope}.emailTitleIllustartion`,
-    defaultMessage: 'Create an email template',
+    defaultMessage: 'Create an email {template}',
   },
   "smsTitleIllustartion": {
     id: `${scope}.smsTitleIllustartion`,
-    defaultMessage: 'Create an SMS template',
+    defaultMessage: 'Create an SMS {template}',
+  },
+  "template": {
+    id: `${scope}.template`,
+    defaultMessage: 'template',
+  },
+  "noTemplatesFound": {
+    id: `${scope}.noTemplatesFound`,
+    defaultMessage: 'No templates found',
   },
-
 });

package/v2Containers/TemplatesV2/index.js

@@ -111,7 +111,13 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
     </div>);
   }
   getGalleryComponent = (location) => <Gallery location={location} isFullMode={this.props.isFullMode}/>
-  getCallTaskComponent = () => <CallTask onCreateNew={this.props.createNew} onCallTaskSubmit={this.props.onCallTaskSubmit}/>
+  getCallTaskComponent = () => (
+    <CallTask
+      onCreateNew={this.props.createNew}
+      onCallTaskSubmit={this.props.onCallTaskSubmit}
+      isFullMode={this.props.isFullMode}
+    />
+  );
 
   getTemplatesComponent(channel) {
     // const templates = this.props.Templates[`${channel}Templates`];