@capillarytech/creatives-library 0.1.15 → 0.1.17

package/components/FormBuilder/index.js

@@ -940,6 +940,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
 
   skipTags(tag) {
     const regexGroups = ["dynamic_expiry_date_after_\\d+_days.FORMAT_\\d", "user_id_b64", "outbox_id_b64", "unsubscribe\\(#[a-zA-Z\\d]{6}\\)","Link_to_[a-zA-z]"];
+
     //const regexGroups = [];
     let skipped = false;
     _.forEach(regexGroups, (group) => {

package/containers/Assets/Gallery/_gallery.scss

@@ -60,6 +60,12 @@
     left: 30%;
     width: 30%;
   }
+
+  img{
+    width: 100%;
+    object-fit: cover; // try contain
+    height: 100%;
+  }
 }
 
 .overlay {
@@ -105,3 +111,16 @@
     }
   }
 }
+
+#slidebox-content{
+  img{
+    display: block;
+    max-width: 100%;
+    margin: 0 auto;
+  }
+}
+
+#slidebox-container{
+  left: 40vw !important;
+  width: 60vw !important;
+}

package/containers/Assets/Gallery/index.js

@@ -69,6 +69,7 @@ export class Gallery extends React.Component { // eslint-disable-line react/pref
   }
 
   componentWillReceiveProps(nextProps) {
+    console.log("nextProps", nextProps);
     if ( !_.isEqual(nextProps.Gallery.uploadAssetSuccess, this.props.Gallery.uploadAssetSuccess) && nextProps.Gallery.uploadAssetSuccess) {
       if (this.props.location.query.type === 'embedded' && nextProps.Gallery.uploadedAssetData) {
         console.log('Post on will receive props');
@@ -106,19 +107,27 @@ export class Gallery extends React.Component { // eslint-disable-line react/pref
       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() {
     window.removeEventListener("message", this.handleGallery, false);
   }
 
-  getAllAssets = ({params, getNextPage, resetPage}) => {
+  getAllAssets = ({params, getNextPage, resetPage}, isReRender = false) => {
     let queryParams = params;
     let page = this.state.page;
-    if (!this.props.Gallery.fetchingAllAssets && (resetPage || (page === 1 && this.state.totalCount === 0) || page <= (this.state.totalCount / this.state.perPageLimit))) {
+    if (!this.props.Gallery.fetchingAllAssets && ((resetPage || (page === 1 && this.state.totalCount === 0) || page <= (this.state.totalCount / this.state.perPageLimit)) || isReRender )) {
       if (getNextPage) {
         page += 1;
       }
+
       let totalCount = this.state.totalCount;
       if (resetPage) {
         page = 1;
@@ -226,17 +235,19 @@ 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];
-    const img = new Image();
-    const that = this;
-    img.src = _URL.createObjectURL(file);
-    img.onload = function () {
-      const fileParams = {
-        width: this.width,
-        height: this.height,
+    //const file = files[0];
+    for (let 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,
+        };
+        that.props.actions.uploadAsset(files[file], 'image', fileParams);
       };
-      that.props.actions.uploadAsset(file, 'image', fileParams);
-    };
+    }
   }
 
   prepareData() {
@@ -300,7 +311,7 @@ export class Gallery extends React.Component { // eslint-disable-line react/pref
               <img style={{maxWidth: '100%', maxHeight: '100%'}} src={this.state.selectedAsset.metaInfo.secure_file_path ? this.state.selectedAsset.metaInfo.secure_file_path : this.state.selectedAsset.metaInfo.public_url} alt={this.state.selectedAsset.name} />
             </div>
           </div>
-          <a href={this.state.selectedAsset.metaInfo.public_url} target="_blank" style={{ position: 'fixed', right: '24px', bottom: '17vh' }} ><i className="material-icons" style={{ color: '#2E89DF', cursor: 'pointer' }}>fullscreen</i></a>
+          <a href={this.state.selectedAsset.metaInfo.public_url} target="_blank" style={{ position: 'fixed', right: '55px', bottom: '18vh' }} ><i className="material-icons" style={{ color: '#2E89DF', cursor: 'pointer' }}>fullscreen</i></a>
         </div>
         <div style={{ fontSize: '14px', color: '#333333', lineHeight: '24px', fontFamily: 'OpenSans', textAlign: 'center', paddingTop: '10px'}}>
           <p style={{marginBottom: '0px'}}><span><FormattedMessage {...messages.dimensions} />: </span> <span>{`${this.state.selectedAsset.metaInfo.width}X${this.state.selectedAsset.metaInfo.height} px`}</span></p>
@@ -357,7 +368,7 @@ export class Gallery extends React.Component { // eslint-disable-line react/pref
     );
     const actionComponents = (
       <form encType="multipart/form-data" id="myForm">
-        <input style={{ display: 'none'}} id="fileName" type="file" onChange={(e) => this.uploadImages(e, {files: e.target.files})} accept="image/*" />
+        <input style={{ display: 'none'}} id="fileName" type="file" onChange={(e) => this.uploadImages(e, {files: e.target.files})} accept="image/*" multiple/>
         <CapButton type={this.props.location.query.type !== 'embedded' ? 'primary' : 'secondary'} onClick={(e) => this.openFileDialog(e)} style={{float: 'right'}}>
           <FormattedMessage {...messages.upload} />
         </CapButton>
@@ -367,7 +378,7 @@ export class Gallery extends React.Component { // eslint-disable-line react/pref
 
     return (
       <div>
-        <Spin spinning={this.props.Gallery.assetUploading || this.props.Gallery.fetchingAllAssets}>
+        {/*<Spin spinning={this.props.Gallery.assetUploading || this.props.Gallery.fetchingAllAssets}>*/}
           <Helmet
             title="Gallery"
           />
@@ -410,19 +421,21 @@ export class Gallery extends React.Component { // eslint-disable-line react/pref
                 </div>
               </div>
             </div> :
-            <Pagination onPageChange={() => { this.getAllAssets({getNextPage: true}); }} paginationSelector="pagination-container">
-              <CardGrid
-                listItem={this.prepareData()}
-                filterContent={filterContent}
-                onHoverItem={this.handleOnHoverItem}
-                onItemClick={this.handleOnHoverItem}
-                colNumber={this.props.location.query.type === 'embedded' ? 2 : 4}
-                enablePagination
-              />
-            </Pagination>
+            <Spin spinning={this.props.Gallery.assetUploading || this.props.Gallery.fetchingAllAssets}>
+              <Pagination onPageChange={() => { this.getAllAssets({getNextPage: true}); }} paginationSelector="pagination-container">
+                <CardGrid
+                  listItem={this.prepareData()}
+                  filterContent={filterContent}
+                  onHoverItem={this.handleOnHoverItem}
+                  onItemClick={this.handleOnHoverItem}
+                  colNumber={this.props.location.query.type === 'embedded' ? 2 : 4}
+                  enablePagination
+                />
+              </Pagination>
+            </Spin>
           }
           {this.state.showImagePreviewModal && this.renderAssetPreviewModal()}
-        </Spin>
+        {/*</Spin>*/}
       </div>
     );
   }

package/containers/Assets/Gallery/reducer.js

@@ -50,14 +50,14 @@ function galleryReducer(state = initialState, action) {
     case types.DELETE_ASSET_REQUEST:
       return state
         .set('deletingAsset', true)
-        .set('assetDeleteError', false);
+        .set('assetDeleteError', false).set("itemDeleted", false);
     case types.DELETE_ASSET_SUCCESS:
       return state
-        .set('deletingAsset', false);
+        .set('deletingAsset', false).set("itemDeleted", true);
     case types.DELETE_ASSET_FAILURE:
       return state
         .set('deletingAsset', false)
-        .set('assetDeleteError', true);
+        .set('assetDeleteError', true).set("itemDeleted", false);
     case types.GET_USER_LIST_REQUEST:
       return state
         .set('fetchingUserList', true)

package/containers/Assets/Gallery/sagas.js

@@ -24,7 +24,7 @@ export function* uploadAsset(file, assetType, fileParams) {
 export function* deleteAssetById(assetId, assetType) {
   try {
     const result = yield call(Api.deleteAssetById, assetId, assetType);
-    console.log(result);
+    console.log({"delete Asset Id": result});
     yield put({ type: types.DELETE_ASSET_SUCCESS, data: result.response });
   } catch (error) {
     yield put({ type: types.DELETE_ASSET_FAILURE, error });

package/containers/Email/index.js

@@ -3247,6 +3247,7 @@ Email.propTypes = {
   isGetFormData: PropTypes.bool,
   getFormSubscriptionData: PropTypes.func,
   supportedTags: PropTypes.array,
+  getDefaultTags: PropTypes.bool,
 };
 
 const mapStateToProps = createStructuredSelector({

package/containers/Sms/Create/index.js

@@ -239,6 +239,9 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     }
     const result = {};
     result.base = baseData;
+    const msgObj = charCount.updateCharCount(baseData['sms-editor']);
+    result.base.msg_count = msgObj.msgCount;
+    console.log("Message Count", msgObj.msgCount);
     const response = {
       action: "getFormData",
       value: result,

package/containers/Sms/Edit/index.js

@@ -89,7 +89,11 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
   }
   componentDidMount() {
     if (this.props.location.query && this.props.location.query.module === 'library') {
-      this.props.actions.setTemplateDetails(this.props.templateData);
+      if (this.props.params.id) {
+        this.props.actions.getTemplateDetails(this.props.params.id);
+      } else {
+        this.props.actions.setTemplateDetails(this.props.templateData);
+      }
     } else {
       this.props.actions.getTemplateDetails(this.props.params.id);
     }
@@ -279,6 +283,9 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     }
     const result = {};
     result.base = baseData;
+    const msgObj = charCount.updateCharCount(baseData['sms-editor']);
+    result.base.msg_count = msgObj.msgCount;
+    console.log("Message Count", msgObj.msgCount);
     const response = {
       action: "getFormData",
       value: result,

package/containers/Templates/index.js

@@ -64,6 +64,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       showHtmlPreview: false,
       device: 'desktop',
       searchedTemplates: false,
+      defaultAccount: true,
     };
     this.handleOnHoverItem = this.handleOnHoverItem.bind(this);
     this.handleOnItemClick = this.handleOnItemClick.bind(this);
@@ -116,7 +117,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
   }
 
   componentDidMount() {
-    if (this.props.location.query.type === 'embedded' && this.props.location.query.module === "library") {
+    if (this.props.location.query.type === 'embedded' && this.isEnabledInLibraryModule("setLocale")) {
       this.setLocale();
     }
     if (this.state.channel.toLowerCase() === 'sms' || this.state.channel.toLowerCase() === 'email' || this.state.channel.toLowerCase() === 'ebill' || ((this.state.channel.toLowerCase() === 'wechat' || this.state.channel.toLowerCase() === 'mobilepush') && !_.isEmpty(this.props.Templates.selectedWeChatAccount))) {
@@ -159,12 +160,14 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       if (nextProps.route.name.toLowerCase() === 'sms') {
         channel = 'Sms';
       } else if (nextProps.route.name.toLowerCase() === 'wechat') {
+        this.setState({defaultAccount: true});
         channel = 'wechat';
         nextProps.actions.getWeCrmAccounts();
       } else if (nextProps.route.name.toLowerCase() === 'email') {
         channel = 'Email';
         // this.props.actions.getEdmDefaultTemplates();
       } else if (nextProps.route.name.toLowerCase() === "mobilepush") {
+        this.setState({defaultAccount: true});
         channel = "mobilepush";
         nextProps.actions.getWeCrmAccounts(channel);
       } else if (nextProps.route.name.toLowerCase() === 'ebill') {
@@ -191,7 +194,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     if (this.state.channel.toLowerCase() === "mobilepush" && nextProps.Templates.selectedWeChatAccount) {
       params.accountId = nextProps.Templates.selectedWeChatAccount.id;
     }
-    if ((this.state.channel.toLowerCase() === 'wechat' || this.state.channel.toLowerCase() === 'mobilepush') && _.isEmpty(nextProps.Templates.selectedWeChatAccount) && (this.props.location.query.type === 'embedded')) {
+    if ((this.state.channel.toLowerCase() === 'wechat' || this.state.channel.toLowerCase() === 'mobilepush') && _.isEmpty(nextProps.Templates.selectedWeChatAccount) && (this.props.location.query.type === 'embedded') && !this.isEnabledInLibraryModule("showAccountSelection")) {
       let selectedAccount = '';
       if (_.isEmpty(nextProps.Templates.weCrmAccounts)) {
         return;
@@ -280,7 +283,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       const isLanguageSupport = (this.props.location.query.isLanguageSupport) ? this.props.location.query.isLanguageSupport : true;
       const isEdmSupport = (this.props.location.query.isEdmSupport !== "false") || false;
       const type = this.props.location.query.type;
-      if (module && module === 'library') {
+      if (this.isEnabledInLibraryModule("callCreateFromProps")) {
         this.props.createNew();
         return;
       }
@@ -302,12 +305,31 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     if (!_.isEmpty(nextProps.Templates.templateDetails) && !_.isEqual(nextProps.Templates.templateDetails, this.props.Templates.templateDetails)) {
       this.setState({previewTemplate: nextProps.Templates.templateDetails});
     }
+
+    if (nextProps.Templates.weCrmAccounts !== undefined && nextProps.Templates.weCrmAccounts.length === 1 && this.state.defaultAccount ) {
+      const paramsDefault = {
+        name: this.state.searchText,
+        sortBy: this.state.sortBy,
+      };
+      if (this.state.channel.toLowerCase() === 'wechat') {
+        paramsDefault.wecrmId = nextProps.Templates.weCrmAccounts[0].configs.wecrm_app_id;
+        paramsDefault.wecrmToken = nextProps.Templates.weCrmAccounts[0].configs.wecrm_token;
+        nextProps.actions.setWeChatAccount(nextProps.Templates.weCrmAccounts[0]);
+        this.setState({defaultAccount: false});
+      } else if (this.state.channel.toLowerCase() === 'mobilepush') {
+        nextProps.actions.setWeChatAccount(nextProps.Templates.weCrmAccounts[0]);
+        paramsDefault.accountId = nextProps.Templates.weCrmAccounts[0].id;
+        this.setState({defaultAccount: false});
+      }
+      this.getAllTemplates({params: paramsDefault}, true);
+    }
   }
 
   componentWillUnmount() {
     console.log('removed listener templates');
     window.removeEventListener("message", this.handleFrameTasks);
     this.props.actions.resetTemplateStoreData();
+    // this.setState({defaultAccount: false});
   }
 
   onAccountSelect(value, option) {
@@ -486,7 +508,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         this.props.actions.handleHtmlUpload(text);
         document.getElementById("filename").value = "";
         const type = this.props.location.query.type;
-        if (type === 'embedded' && module === "library") {
+        if (this.isEnabledInLibraryModule("callCreateFromProps")) {
           this.props.createNew();
           return;
         }
@@ -671,7 +693,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
   createTemplate(ev) {
     const type = this.props.location.query.type;
     const module = this.props.location.query.module ? this.props.location.query.module : 'default';
-    if (this.props.location.query.module === 'library') {
+    if (this.isEnabledInLibraryModule("callCreateFromProps")) {
       this.props.createNew();
     } else if (ev.key && (ev.key.toLowerCase() === "text" || ev.key.toLowerCase() === "image")) {
       this.props.router.push({
@@ -805,7 +827,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       } else {
         getQuery = (type === 'embedded') ? {type: 'embedded', module} : {module};
       }
-      if (type === 'embedded' && module === "library") {
+      if (this.isEnabledInLibraryModule("callCreateFromProps")) {
         this.props.createNew();
         return;
       }
@@ -842,7 +864,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     if (this.state.channel.toLowerCase() === 'ebill') {
       pathName = `/ebill/edit/${id}`;
     }
-    if (module && module === 'library') {
+    if (this.isEnabledInLibraryModule("callSelectFromProps")) {
       this.props.onSelectTemplate(id);
     } else {
       if (this.state.channel.toLowerCase() === 'ebill') {
@@ -978,7 +1000,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         console.log('Data Prepare');
         const imgSrc = template && template.versions && template.versions.base ? template.versions.base.preview_http_url : '';
         const ifPreviewGenerated = template && template.versions && template.versions.base ? template.versions.base.isPreviewGenerated : 0;
-        content = <img src={imgSrc || ''} alt={this.props.intl.formatMessage(messages.previewGenerateText)} />;
+        content = <img src={imgSrc || ''} alt={this.props.intl.formatMessage(messages.previewGenerateText)} width="100%" height="100%"/>;
         console.log('qwerty template preview', imgSrc, template, ifPreviewGenerated, content);
         temp.content = (
           <div
@@ -1109,6 +1131,25 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     </Modal>);
     return modal;
   };
+  //Gets called only when creatives gets used as node library
+  isEnabledInLibraryModule = (property) => {
+    if (this.props.location.query.type === "embedded" && this.props.location.query.module === "library") {
+      switch (property) {
+        case "showAccountSelection":
+          return (this.props.route && (this.props.route.name.toLowerCase() === "wechat" || this.props.route.name.toLowerCase() === "mobilepush"));
+        case "setLocale":
+          return true;
+        case "callCreateFromProps":
+          return true;
+        case "callSelectFromProps":
+          return true;
+        default:
+          return false;
+      }
+    } else {
+      return false;
+    }
+  }
 
   render() {
     console.log('templates props', this.props);
@@ -1210,7 +1251,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     const pageHeader = (
       <div>
         {(this.props.location.query.type !== 'embedded') ? `${pageHeaderText}` : templateText}
-        {((this.state.channel.toUpperCase() === 'WECHAT' || this.state.channel.toUpperCase() === "MOBILEPUSH") && (this.props.location.query.type !== 'embedded') && !_.isEmpty(this.props.Templates.weCrmAccounts)) &&
+        {(this.isEnabledInLibraryModule("showAccountSelection") || (((this.state.channel.toUpperCase() === 'WECHAT' || this.state.channel.toUpperCase() === "MOBILEPUSH") && (this.props.location.query.type !== 'embedded') && !_.isEmpty(this.props.Templates.weCrmAccounts)))) &&
           <Select className="selectAccount" onSelect={this.onAccountSelect} value={this.props.Templates.selectedWeChatAccount ? this.props.Templates.selectedWeChatAccount.name : undefined} placeholder={this.props.intl.formatMessage(messages.selectAccount)}>
             {accountOptions}
           </Select>}

package/containers/WeChat/index.js

@@ -433,6 +433,9 @@ export class WeChat extends React.Component { // eslint-disable-line react/prefe
   }
 
   componentWillReceiveProps(nextProps) {
+    if (nextProps.location.query.module === 'library' && nextProps.isGetFormData) {
+      this.getFormData();
+    }
     console.log('MetaEntity nextprops ', nextProps.metaEntities);
     if (nextProps.metaEntities && nextProps.metaEntities.layouts && nextProps.metaEntities.layouts.length > 0 && _.isEmpty(this.state.schema)) {
       this.injectEvents(nextProps.metaEntities.layouts[0].definition);
@@ -465,6 +468,11 @@ export class WeChat extends React.Component { // eslint-disable-line react/prefe
           }
         });
       }
+      if (nextProps.location.query.type === "embedded" && nextProps.location.query.module === "library" && nextProps.templateData) {
+        this.setState({editTemplateData: nextProps.templateData}, () => {
+          this.setEditData();
+        });
+      }
       if (nextProps.params.id && !_.isEqual(nextProps.params.id, this.props.params.id)) {
         this.setState({isEdit: true});
       }
@@ -616,7 +624,7 @@ export class WeChat extends React.Component { // eslint-disable-line react/prefe
           }
         });
       }
-    } else if (this.state.isEdit) {
+    } else if (this.state.isEdit && this.state.editTemplateData.versions) {
       console.log('this.state.editTemplateData', this.state.editTemplateData);
       selectedTemplateData = _.cloneDeep(this.state.editTemplateData);
       selectedTemplate = {
@@ -716,7 +724,11 @@ export class WeChat extends React.Component { // eslint-disable-line react/prefe
     };
     console.log('response ', response);
     this.setState({checkValidation: true});
-    e.source.postMessage(JSON.stringify(response), e.origin);
+    if (this.props.location.query.module === 'library') {
+      this.props.getLibraryFormData(response);
+    } else {
+      e.source.postMessage(JSON.stringify(response), e.origin);
+    }
   }
 
   getCurrentWindow(e) {
@@ -1579,6 +1591,8 @@ WeChat.propTypes = {
   params: PropTypes.object,
   metaEntities: PropTypes.object,
   intl: intlShape.isRequired,
+  isGetFormData: PropTypes.bool,
+  getLibraryFormData: PropTypes.func,
 };
 
 const mapStateToProps = createStructuredSelector({

package/index.js

@@ -7,4 +7,4 @@ export Email from './containers/Email/index';
 export TagList from './containers/TagList/index';
 export TemplatePreview from './components/TemplatePreview';
 export EmailPreview from './components/EmailPreview';
-
+export WeChat from './containers/WeChat';

package/package.json

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