@capillarytech/creatives-library 3.0.14 → 3.0.16

package/containers/Cap/actions.js

@@ -51,12 +51,6 @@ 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,7 +18,6 @@ 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,8 +90,6 @@ 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,15 +2537,13 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         });
       }
     });
-    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";
-        }
-      });
-    }
+    _.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,7 +179,6 @@ 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,6 +803,7 @@ 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' && template.type.toLowerCase() === 'line') {
+      } else if (this.state.channel.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.14",
+  "version": "3.0.16",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

package/v2Containers/Assets/Gallery/index.js

@@ -334,7 +334,7 @@ export class Gallery extends React.Component { // eslint-disable-line react/pref
       {filterContent}
       <CapSpin spinning={isLoading} tip={loadingTip} style={{width: "100%"}}>
         {!isLoading && <div>
-          {!_.isEmpty(templates) ? <div className="pagination-container">
+          {!_.isEmpty(templates) || !_.isEmpty(this.state.searchText) ? <div className="pagination-container">
             <CapCustomCardList key={`${currentChannel}-card-list`} cardList={cardDataList} type={'Email'} />
           </div> : <CapIllustration {...this.getIllustrationProps} />}</div>
         }
@@ -392,7 +392,7 @@ export class Gallery extends React.Component { // eslint-disable-line react/pref
   }
   render() {
     const assetList = this.props.Gallery.assetList;
-    const filterContent = !_.isEmpty(assetList) ? (
+    const filterContent = !_.isEmpty(assetList) || !_.isEmpty(this.state.searchText) ? (
       <div className="action-container" style={{ display: 'inline-flex', width: '100%'}}>
         <div style={{ marginTop: '8px', width: '50%'}}>
           <CapInput.Search

package/v2Containers/Templates/index.js

@@ -542,7 +542,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       {filterContent}
       <CapSpin spinning={isLoading} tip={loadingTip} style={{width: '100%'}}>
         {!isLoading && <div>
-          {!_.isEmpty(templates) ? <div className="pagination-container">
+          {!_.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)} />
           }
@@ -1609,8 +1609,9 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       >
       </CardGrid>
     );
-    const filterContent = ((!_.isEmpty(this.props.TemplatesList) || this.state.channel.toLowerCase() === 'mobilepush' ) && <div className="action-container">
-      {!_.isEmpty(this.props.TemplatesList) && <CapInput.Search
+    const isfilterContentVisisble = !_.isEmpty(this.props.TemplatesList) || !_.isEmpty(this.state.searchText) || !_.isEmpty(this.props.Templates.templateError);
+    const filterContent = (( isfilterContentVisisble || this.state.channel.toLowerCase() === 'mobilepush' ) && <div className="action-container">
+      {isfilterContentVisisble && <CapInput.Search
         className="search-text"
         style={{width: '210px'}}
         placeholder={this.props.intl.formatMessage(messages.searchText)}
@@ -1621,7 +1622,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         />}
       <div style={{display: "flex", justifyContent: "space-between", alignItems: 'center'}}>
         {(this.props.location.query.type === 'embedded' ) ? pageHeaderDvs : pageHeader}
-        {!_.isEmpty(this.props.TemplatesList) && <CapButton
+        {isfilterContentVisisble && <CapButton
           type={"primary"}
           disabled={this.isCreateDisabled()}
           style={{marginLeft: '8px'}}
@@ -1665,7 +1666,13 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
               >
               </CardGrid>
             </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>
+            </div>}
         </CapRow>
+
+
         <CapRow>
           {!_.isEmpty(creativesParams.mode) && isFullMode && //creatives container for fullmode
           <CreativesContainer

package/v2Containers/Templates/reducer.js

@@ -12,6 +12,7 @@ const initialState = fromJS({
   templates: [],
   deleteResponse: {},
   deleteTemplateInProgress: false,
+  templateError: {},
 });
 
 function templatesReducer(state = initialState, action) {
@@ -19,20 +20,20 @@ function templatesReducer(state = initialState, action) {
     case types.DEFAULT_ACTION:
       return state;
     case types.GET_ALL_TEMPLATES_REQUEST:
-      return state.set('getAllTemplatesInProgress', true);
+      return state.set('getAllTemplatesInProgress', true).set('templateError', {});
     case types.GET_ALL_TEMPLATES_SUCCESS:
       if (action.isReset) {
         return state.set('getAllTemplatesInProgress', false)
           .set('templates', action.data ? action.data.templates : [])
           .set('isSearch', action.data ? action.data.search : false)
-          .set('weCRMtemplates', action.weCRMTemplate ? action.weCRMTemplate : []);
+          .set('weCRMtemplates', action.weCRMTemplate ? action.weCRMTemplate : []).set('templateError', {});
       }
       return state.set('getAllTemplatesInProgress', false)
         .set('templates', action.data ? state.get('templates').concat(action.data.templates) : [])
         .set('isSearch', action.data ? action.data.search : false)
         .set('weCRMtemplates', action.weCRMTemplate ? state.get('weCRMtemplates').concat(action.weCRMTemplate) : []);
     case types.GET_ALL_TEMPLATES_FAILURE:
-      return state.set('getAllTemplatesInProgress', false);
+      return state.set('getAllTemplatesInProgress', false).set('templateError', action.error);
     case types.DELETE_TEMPLATE_REQUEST:
       return state.set('deleteTemplateInProgress', true);
     case types.DELETE_TEMPLATE_SUCCESS: