@capillarytech/creatives-library 2.0.94 → 2.0.96

package/containers/Templates/index.js

@@ -1287,7 +1287,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         header={this.state.previewTemplate.name}
         content={slideboxContent}
         show={this.state.showEmailPreviewModal}
-        handleClose={this.toggleImagePreview}
+        handleClose={this.togglePreview}
         width={60}
       />
     );

package/containers/WeChat/RichmediaTemplates/Create/index.js

@@ -14,7 +14,7 @@ import { createStructuredSelector } from 'reselect';
 import { injectIntl, intlShape, FormattedMessage } from 'react-intl';
 import _ from 'lodash';
 import { Menu, Dropdown } from 'antd';
-import { CapRow, CapColumn, CapButton, CapCard, CapSpinner } from '@capillarytech/cap-react-ui-library';
+import { CapRow, CapColumn, CapButton, CapCard, CapSpin } from '@capillarytech/cap-react-ui-library';
 import makeSelectCreate, {makeSelectTemplates, getAssetDetails, getContentAssetDetails} from './selectors';
 import * as actions from './actions';
 import richmediaschema from './richmediaschema';
@@ -970,7 +970,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     }
     return (
       <div className="richmedia-container">
-        <CapSpinner spinning={this.state.loading}>
+        <CapSpin spinning={this.state.loading}>
           {this.state.showPreview && <WechatRichmediaTemplatePreview
             show={this.state.showPreview}
             closeSlideBox={this.closeSlideBox}
@@ -1012,7 +1012,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
               </CapRow>
             </div>
           </div>
-        </CapSpinner>
+        </CapSpin>
       </div>
     );
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "2.0.94",
+  "version": "2.0.96",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",
@@ -64,4 +64,4 @@
     "warning": "3.0.0",
     "whatwg-fetch": "2.0.1"
   }
-}
+}

package/v2Components/CapTagList/index.js

@@ -212,7 +212,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
           ]}
         >
           <p>{this.props.intl.formatMessage(messages.numberOfDaysBeforeExpiry)}</p>
-          <CapInput onChange={this.handleDynamicDateChange} value={this.state.dynamicDateValue}></CapInput>
+          <CapInput onChange={this.handleDynamicDateChange} value={this.state.dynamicDateValue} size="default"></CapInput>
         </CapModal>
       </div>
     );

package/v2Components/FormBuilder/index.js

@@ -2245,6 +2245,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                   defaultValue={isVersionEnable ? this.state.formData[`${this.state.currentTab - 1}`][val.id] : this.state.formData[val.id]}
                   value={value || ""}
                   disabled={val.disabled}
+                  size="default"
                 />
               </CapColumn>
             );
@@ -2609,6 +2610,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                     value={value || ""}
                     defaultValue={isVersionEnable ? this.state.formData[`${this.state.currentTab - 1}`][val.id] : this.state.formData[val.id]}
                     disabled={val.disabled}
+                    size="default"
                   />
                 </CapColumn>
               );

package/v2Components/ImagePreview/index.js

@@ -7,9 +7,8 @@
 import PropTypes from 'prop-types';
 
 import React from 'react';
-import { injectIntl, intlShape } from 'react-intl';
+import { injectIntl } from 'react-intl';
 import { Spin } from 'antd';
-import messages from './messages';
 import './_imagePreview.scss';
 
 class ImagePreview extends React.Component { // eslint-disable-line react/prefer-stateless-function
@@ -27,7 +26,7 @@ class ImagePreview extends React.Component { // eslint-disable-line react/prefer
           </div>
 
           <div id="image-preview-content">
-            <Spin tip={this.props.intl.formatMessage(messages.loadingImage)} spinning={this.props.isLoading}>
+            <Spin spinning={this.props.isLoading}>
               {this.props.content}
             </Spin>
           </div>
@@ -46,7 +45,6 @@ ImagePreview.propTypes = {
   show: PropTypes.bool,
   handleClose: PropTypes.func.isRequired,
   isLoading: PropTypes.bool,
-  intl: intlShape.isRequired,
 };
 
 export default injectIntl(ImagePreview);

package/v2Components/NewCallTask/index.js

@@ -98,6 +98,7 @@ class NewCallTask extends React.Component { // eslint-disable-line react/prefer-
                   onChange={this.updateSubject}
                   value={subject}
                   isRequired
+                  size="default"
                 />
               </div>
               <div style={{ position: 'relative', marginBottom: '34px' }}>

package/v2Components/Pagination/index.js

@@ -10,25 +10,17 @@ import React from 'react';
 import './_pagination.scss';
 class Pagination extends React.Component { // eslint-disable-line react/prefer-stateless-function
 
-  componentDidMount() {
-    if (document.getElementsByClassName('pagination-container').length > 0) {
-      document.getElementsByClassName('pagination-container')[0].addEventListener('scroll', this.handleScroll);
-    }
-  }
+
   handleScroll = (e) => {
     const offset = 50;
     if ((e.target.scrollHeight - e.target.scrollTop) - offset <= e.target.clientHeight) {
       this.props.onPageChange();
     }
   };
-  componentDidUnMount() {
-    if ( document.getElementsByClassName(this.props.paginationContainer).length > 0) {
-      document.getElementsByClassName(this.props.paginationContainer)[0].removeEventListener('scroll', this.handleScroll);
-    }
-  }
+
   render() {
     return (
-      <div style={this.props.style ? this.props.style : {}}>
+      <div style={this.props.style ? this.props.style : {}} onScroll={this.handleScroll}>
         {this.props.children}
       </div>
     );
@@ -39,7 +31,6 @@ Pagination.propTypes = {
   children: PropTypes.element,
   onPageChange: PropTypes.func,
   style: PropTypes.object,
-  paginationContainer: PropTypes.string,
 };
 
 Pagination.defaultProps = {

package/v2Containers/CreativesContainer/index.js

@@ -45,7 +45,7 @@ class Creatives extends React.Component {
       showSlideBox: true,
       slidBoxContent: this.getSlideBocContent({mode: props.creativesMode, templateData: props.templateData, isFullMode: props.isFullMode}),
       templateData: this.getTemplateData(props.templateData),
-      templateNameExists: false,
+      templateNameExists: props.creativesMode === 'edit', // if edit mode templateNameExists will be true, and false in create flow.
       currentChannel: this.props.channel || 'sms',
     };
     this.creativesTemplateSteps = {

package/v2Containers/Ebill/index.js

@@ -1158,7 +1158,6 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
 
   render() {
     const previewHeader = (<h3>{this.props.intl.formatMessage(messages.ebillPreview)}</h3>);
-    const loaderText = this.props.intl.formatMessage(messages.loading);
     const spinning = false;
     const schema = this.state.schema;
     return (
@@ -1166,7 +1165,7 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
         <Helmet
           title="Ebill"
         />
-        <Spin tip={loaderText} spinning={spinning}>
+        <Spin spinning={spinning}>
           {this.props.location.query.type !== 'embedded' && <Row>
             <Col span={24}>
               {this.props.location.query.type !== "embedded" &&

package/v2Containers/Email/index.js

@@ -2528,6 +2528,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
           prefix={<i className="material-icons" style={{color: '#707070', fontSize: '16px'}}>search</i>}
           value={this.state.searchText}
           onChange={(e) => this.searchAsset(e.target.value)}
+          size="default"
         />
       </div>
       <div>
@@ -2576,11 +2577,6 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
     if (!this.props.currentOrgDetails || !this.props.currentOrgDetails.basic_details) {
       return (<div>Loading...</div>);
     }
-
-    let loaderText = this.props.Email.createTemplateInProgress ? this.props.intl.formatMessage(messages.saveTemplateLoader) : this.props.intl.formatMessage(messages.templateLoader);
-    if (this.props.Email.assetUploading) {
-      loaderText = this.props.intl.formatMessage(messages.uploadingImage);
-    }
     let tags = this.props.metaEntities && this.props.metaEntities.tags ? this.props.metaEntities.tags.standard : [];
     if (this.props.location.query.type === 'embedded' && this.props.location.query.module === 'library' && !this.props.getDefaultTags) {
       tags = this.props.supportedTags;
@@ -2589,7 +2585,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       <div className="email-container">
 
         {/* <PageHeader pageHeading={pageHeading} /> */}
-        <CapSpin tip={loaderText} spinning={isLoading}>
+        <CapSpin spinning={isLoading}>
 
           <Row>
             <Col>

package/v2Containers/EmailWrapper/index.js

@@ -172,6 +172,7 @@ export class EmailWrapper extends React.Component { // eslint-disable-line react
                 onChange={this.onTemplateNameChange}
                 value={templateName}
                 labelPosition="top"
+                size="default"
                 />
               }
               <CardContainer>

package/v2Containers/Line/Create/index.js

@@ -728,10 +728,8 @@ export class Line extends Component {
       console.log("before render@@@", this.state.formData["0"].image);
     }
     console.log("render state", this.state);
-    let tipText = this.props.Line.createTemplateInProgress ? "Saving Template..." : "";
     let loading = this.props.Line.createTemplateInProgress ? this.props.Line.createTemplateInProgress : false;
     if (this.props.Line.assetUploading) {
-      tipText = "Uploading Image...";
       loading = true;
     }
     // if (!this.state.isReady) {
@@ -743,7 +741,7 @@ export class Line extends Component {
       tags = this.props.supportedTags;
     }
     return (
-      <Spin tip={tipText} spinning={loading}>
+      <Spin spinning={loading}>
         <Row style={{marginLeft: '-48px'}}>
           <Col offset={1}>
             {this.props.location.query.type !== "embedded" &&

package/v2Containers/Line/Edit/index.js

@@ -956,8 +956,6 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
 
   render() {
     const schema = this.state.schema;
-    let tipText = this.props.Edit && ("getTemplateDetailsInProgress" in this.props.Edit && this.props.Edit.getTemplateDetailsInProgress) ? 'Getting template details...' : '';
-    tipText = this.props.Edit && ("editTemplateInProgress" in this.props.Edit && this.props.Edit.editTemplateInProgress) ? 'Saving Template...' : '';
     const spinning = this.props.Edit.fetchingDefaultTemplates || this.props.Edit.assetUploading || this.state.loading || (this.props.Edit && (("getTemplateDetailsInProgress" in this.props.Edit && this.props.Edit.getTemplateDetailsInProgress) || ("editTemplateInProgress" in this.props.Edit && this.props.Edit.editTemplateInProgress)));
     let tags = this.props.metaEntities && this.props.metaEntities.tags ? this.props.metaEntities.tags.standard : [];
     if (this.props.supportedTags) {
@@ -965,7 +963,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     }
     return (
       <div>
-        <Spin tip={tipText} spinning={spinning}>
+        <Spin spinning={spinning}>
           {<Row style={{marginBottom: '16px', marginLeft: '-40px'}}>
             <Col offset={1}>
               {this.props.location.query.type !== "embedded" &&

package/v2Containers/MobilePush/Create/index.js

@@ -1668,10 +1668,8 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     this.setState({showIosCtaTable: false, formData});
   }
   render() {
-    let tipText = this.props.Create.createTemplateInProgress ? "Saving Template..." : "";
     let loading = this.props.Create.createTemplateInProgress ? this.props.Create.createTemplateInProgress : false;
     if (this.props.Create.assetUploading) {
-      tipText = "Uploading Image...";
       loading = true;
     }
     let tags = this.props.metaEntities && this.props.metaEntities.tags ? this.props.metaEntities.tags.standard : [];
@@ -1680,7 +1678,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     }
     return (
       <div className="creatives-mobilepush-create">
-        <CapSpin tip={tipText} spinning={loading}>
+        <CapSpin spinning={loading}>
           <CapRow>
             <CapColumn>
               <FormBuilder

package/v2Containers/MobilePush/Edit/index.js

@@ -1752,8 +1752,6 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
 
   render() {
     const schema = this.state.schema;
-    let tipText = this.props.Edit && ("getTemplateDetailsInProgress" in this.props.Edit && this.props.Edit.getTemplateDetailsInProgress) ? 'Getting template details...' : '';
-    tipText = this.props.Edit && ("editTemplateInProgress" in this.props.Edit && this.props.Edit.editTemplateInProgress) ? 'Saving Template...' : '';
     const loadingContentEdit = this.state.loadingContentEdit || (this.props.location.query.module === 'dvs' && _.isEmpty(this.state.schema));
     const spinning = this.props.isLoadingMetaEntities || loadingContentEdit || this.props.Edit.fetchingDefaultTemplates || this.props.Edit.assetUploading || this.state.loading || (this.props.Edit && (("getTemplateDetailsInProgress" in this.props.Edit && this.props.Edit.getTemplateDetailsInProgress) || ("editTemplateInProgress" in this.props.Edit && this.props.Edit.editTemplateInProgress)));
     let tags = this.props.metaEntities && this.props.metaEntities.tags ? this.props.metaEntities.tags.standard : [];
@@ -1762,7 +1760,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     }
     return (
       <div className="creatives-mobilepush-edit">
-        <CapSpin tip={tipText} spinning={spinning}>
+        <CapSpin spinning={spinning}>
           <CapRow>
             <CapColumn>
               {!this.props.isLoadingMetaEntities && <FormBuilder

package/v2Containers/MobilepushWrapper/index.js

@@ -82,6 +82,7 @@ export class MobilepushWrapper extends React.Component { // eslint-disable-line
                 onChange={this.onTemplateNameChange}
                 value={templateName}
                 labelPosition="top"
+                size="default"
                 />
               }
             <CardContainer>

package/v2Containers/Sms/Edit/index.js

@@ -9,7 +9,7 @@ import PropTypes from 'prop-types';
 
 import React from 'react';
 import { connect } from 'react-redux';
-import { CapRow, CapColumn, CapSpinner, CapNotification } from '@capillarytech/cap-ui-library';
+import { CapRow, CapColumn, CapSpin, CapNotification } from '@capillarytech/cap-ui-library';
 import { injectIntl, intlShape } from 'react-intl';
 import { createStructuredSelector } from 'reselect';
 import _ from 'lodash';
@@ -923,8 +923,6 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
   }
   render() {
     const schema = this.state.schema;
-    let tipText = this.props.Edit && ("getTemplateDetailsInProgress" in this.props.Edit && this.props.Edit.getTemplateDetailsInProgress) ? this.props.intl.formatMessage(messages.getTemplateDetailsLoader) : '';
-    tipText = this.props.Edit && ("editTemplateInProgress" in this.props.Edit && this.props.Edit.editTemplateInProgress) ? this.props.intl.formatMessage(messages.saveTemplateLoader) : '';
     const spinning = this.isSmsLoading();
     let tags = this.props.metaEntities && this.props.metaEntities.tags ? this.props.metaEntities.tags.standard : [];
     if (this.props.location.query.type === 'embedded' && this.props.location.query.module === 'library' && !this.props.getDefaultTags) {
@@ -932,7 +930,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     }
     return (
       <div className="sms-email-container">
-        <CapSpinner tip={tipText} spinning={spinning}>
+        <CapSpin spinning={spinning}>
           {/*<CapRow style={{marginBottom: '16px', marginLeft: '-40px'}}>
             <CapColumn offset={1}>
               <Breadcrumb>
@@ -973,7 +971,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
               />
             </CapColumn>
           </CapRow>
-        </CapSpinner>
+        </CapSpin>
       </div>
     );
   }

package/v2Containers/Sms/initialSchema.js

@@ -168,7 +168,7 @@ export const response = {
                                   order: 1,
                                   width: 18,
                                   onlyDisplay: false,
-                                  errorMessage: "Please check if you intend to use unicode characters.",
+                                  errorMessage: "Unicode characters were detected in your content.",
                                   customComponent: false,
                                 },
                               ],

package/v2Containers/Templates/index.js

@@ -392,7 +392,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
   }
   onPaginationChange = () => { this.getAllTemplates({getNextPage: true}); }
   onCreateComplete = () => {
-    this.setState({routeParams: null});
+    this.setState({routeParams: null, previewOpen: false});
   }
   getCurrentWindow(e) {
     const response = {
@@ -1291,7 +1291,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
   };
 
   toggleEmailPreview = () => {
-    this.setState({ showHtmlPreview: !this.state.showHtmlPreview }, () => {
+    this.setState({ showHtmlPreview: !this.state.showHtmlPreview, previewOpen: !this.state.previewOpen }, () => {
       if (!this.state.showHtmlPreview) {
         this.setState({previewTemplate: {}});
       }
@@ -1362,7 +1362,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         header={this.state.previewTemplate.name}
         content={slideboxContent}
         show={this.state.showEmailPreviewModal}
-        handleClose={this.toggleImagePreview}
+        handleClose={this.togglePreview}
         width={60}
       />
     );

package/v2Containers/WeChat/RichmediaTemplates/Create/index.js

@@ -14,7 +14,7 @@ import { createStructuredSelector } from 'reselect';
 import { injectIntl, intlShape, FormattedMessage } from 'react-intl';
 import _ from 'lodash';
 import { Menu, Dropdown } from 'antd';
-import { CapRow, CapColumn, CapButton, CapCard, CapSpinner } from '@capillarytech/cap-ui-library';
+import { CapRow, CapColumn, CapButton, CapCard, CapSpin } from '@capillarytech/cap-ui-library';
 import makeSelectCreate, {makeSelectTemplates, getAssetDetails, getContentAssetDetails} from './selectors';
 import * as actions from './actions';
 import richmediaschema from './richmediaschema';
@@ -970,7 +970,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     }
     return (
       <div className="richmedia-container">
-        <CapSpinner spinning={this.state.loading}>
+        <CapSpin spinning={this.state.loading}>
           {this.state.showPreview && <WechatRichmediaTemplatePreview
             show={this.state.showPreview}
             closeSlideBox={this.closeSlideBox}
@@ -1012,7 +1012,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
               </CapRow>
             </div>
           </div>
-        </CapSpinner>
+        </CapSpin>
       </div>
     );
   }