@capillarytech/creatives-library 3.9.20 → 3.9.21

package/containers/Cap/index.js

@@ -75,6 +75,7 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
     this.props.locationActions.changeLocale(locale);
   }
 
+
   componentWillReceiveProps(nextProps) {
     const user = this.props.Global.user;
     const nextPropsUser = nextProps.Global.user;

package/package.json

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

package/v2Components/MobilePushPreviewV2/index.js

@@ -21,8 +21,8 @@ class MobilePushPreviewV2 extends React.Component { // eslint-disable-line react
     this.getPreview = this.getPreview.bind(this);
     this.setContent = this.setContent.bind(this);
     this.goToDuplicate = this.goToDuplicate.bind(this);
-    const hasAndroid = get(props, 'templateData.versions.base.ANDROID') || get(props, 'templateData.androidContent');
-    const hasIos = get(props, 'templateData.versions.base.IOS') || get(props, 'templateData.iosContent');
+    const hasAndroid = get(props, 'templateData.versions.base.ANDROID') || get(props, 'templateData.androidContent.title');
+    const hasIos = get(props, 'templateData.versions.base.IOS') || get(props, 'templateData.iosContent.title');
     let device = "android";
     if (hasAndroid) {
       device = 'android';
@@ -79,8 +79,8 @@ class MobilePushPreviewV2 extends React.Component { // eslint-disable-line react
   }
   render() {
     const {templateData} = this.props;
-    const hasAndroid = get(templateData, 'versions.base.ANDROID') || get(templateData, 'androidContent');
-    const hasIos = get(templateData, 'versions.base.IOS') || get(templateData, 'iosContent');
+    const hasAndroid = get(templateData, 'versions.base.ANDROID') || get(templateData, 'androidContent.title');
+    const hasIos = get(templateData, 'versions.base.IOS') || get(templateData, 'iosContent.title');
     const hasBothAndroidAndIos = hasAndroid && hasIos;
 
     return (

package/v2Components/TemplatePreview/index.js

@@ -147,6 +147,7 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
         return undefined;
       });
     }
+    const disablePreviewAndTest = this.props.channel === 'MOBILEPUSH' ? !this.props.content.header : (this.props.channel === 'SMS' ? !this.props.content : false);
     return (
       <CapRow>
         {this.props.showCount && <CapColumn span={16}>
@@ -172,6 +173,7 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
                 }}
                 type="flat"
                 onClick={() => this.onPreviewContentClicked(this.props.channel)}
+                disabled={disablePreviewAndTest}
               >
                 <CapIcon type="eye"/><FormattedMessage {...messages.preview} />
               </CapButton>
@@ -184,6 +186,7 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
                 }}
                 type="flat"
                 onClick={() => this.onTestContentClicked(this.props.channel)}
+                disabled={disablePreviewAndTest}
               >
                 <CapIcon type="lab"/><FormattedMessage {...messages.testMessage} />
               </CapButton>

package/v2Containers/Assets/Gallery/index.js

@@ -81,7 +81,7 @@ export class Gallery extends React.Component { // eslint-disable-line react/pref
       const params = {
         name: this.state.searchText,
       };
-      this.getAllAssets({params});
+      this.getAllAssets({params, resetPage: true});
     }
     if (!this.props.Gallery.fetchingAllAssets && !_.isEmpty(this.props.Gallery.assetList) && this.props.Gallery.assetList[0] && this.props.Gallery.assetList[0].totalCount && this.state.totalCount === 0) {
       this.setState({totalCount: this.props.Gallery.assetList[0].totalCount});
@@ -98,19 +98,12 @@ export class Gallery extends React.Component { // eslint-disable-line react/pref
         name: this.state.searchText,
         sortBy: 'Most Recent',
       };
-      this.getAllAssets({params});
+      this.getAllAssets({params, resetPage: true});
     }
     if (!nextProps.Gallery.deletingAsset && nextProps.Gallery.assetDeleteError && !_.isEqual(nextProps.Gallery.deletingAsset, this.props.Gallery.deletingAsset)) {
       const message = getMessageObject('error', this.props.intl.formatMessage(messages.assetDeleteFailed), true);
       this.props.globalActions.addMessageToQueue(message);
     }
-    if ( nextProps.Gallery.itemDeleted || !nextProps.Gallery.assetUploading) {
-      const params = {
-        name: this.state.searchText,
-        sortBy: 'Most Recent',
-      };
-      this.getAllAssets({params}, true);
-    }
   }
 
   componentWillUnmount() {
@@ -236,19 +229,20 @@ export class Gallery extends React.Component { // eslint-disable-line react/pref
   uploadImages(e, {files}) {
     e.preventDefault();
     const _URL = window.URL || window.webkitURL;
-    //const file = files[0];
     for (const file in files) {
-      const img = new Image();
-      const that = this;
-      img.src = _URL.createObjectURL(files[file]);
-      img.onload = function () {
-        const fileParams = {
-          width: this.width,
-          height: this.height,
-          isGeneratePreview: true,
+      if (files.hasOwnProperty(file)) {
+        const img = new Image();
+        const that = this;
+        img.src = _URL.createObjectURL(files[file]);
+        img.onload = function () {
+          const fileParams = {
+            width: this.width,
+            height: this.height,
+            isGeneratePreview: true,
+          };
+          that.props.actions.uploadAsset(files[file], 'image', fileParams);
         };
-        that.props.actions.uploadAsset(files[file], 'image', fileParams);
-      };
+      }
     }
   }
   getIllustrationProps={

package/v2Containers/Email/reducer.js

@@ -138,6 +138,7 @@ function emailReducer(state = initialState, action) {
         .set('fetchingCmsSettingsError', false)
         .set('CmsSettings', fromJS({}))
         .set('fetchingCmsData', false)
+        .set('duplicateResponse', fromJS({}))
         .set('cmsData', '');
     default:
       return state;