@capillarytech/creatives-library 3.0.14 → 3.0.15

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "3.0.14",
+  "version": "3.0.15",
   "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: