@capillarytech/creatives-library 2.0.100 → 3.0.2

package/config/app.js

@@ -8,7 +8,7 @@ const config = {
     login_url: 'auth/login',
     dashboard_url: '/sms',
     dashboard_url_v2: '/v2',
-    accountConfig: (strs, accountId) => `org/config/AccountAdd?q=a&channelId=2&accountId=${accountId}&edit=1`,
+    accountConfig: (strs, accountId) => `${window.location.origin}/org/config/AccountAdd?q=a&channelId=2&accountId=${accountId}&edit=1`,
   },
   development: {
     api_endpoint: 'https://nightly.capillary.in/arya/api/v1/creatives',

package/containers/Line/Create/index.js

@@ -227,14 +227,14 @@ export class Line extends Component {
   onTagSelect(data, currentTab) {
     console.log('parent data tag', data, currentTab);
     const editorId = 'message-editor';
-    this.insertAtCursor(document.getElementById(editorId), `{{${data}}}`);
+    this.insertAtCursor(document.getElementById(editorId), `{{${data}}}`, currentTab);
     document.getElementById(editorId).focus();
   }
 
   onTagSelectTitle(data, currentTab) {
     console.log('parent data tag', data, currentTab);
     const editorId = 'message-title';
-    this.insertAtCursor(document.getElementById(editorId), `{{${data}}}`);
+    this.insertAtCursor(document.getElementById(editorId), `{{${data}}}`, currentTab);
     document.getElementById(editorId).focus();
   }
 
@@ -520,7 +520,7 @@ export class Line extends Component {
     return section;
   };
 
-  insertAtCursor = (field, myValue) => {
+  insertAtCursor = (field, myValue, currentTab) => {
     //IE support
     const myField = field;
     if (document.selection) {
@@ -538,8 +538,9 @@ export class Line extends Component {
     } else {
       myField.value += myValue;
     }
-    const event = new Event('input', { bubbles: true });
-    myField.dispatchEvent(event);
+    const formData = _.cloneDeep(this.state.formData);
+    formData[currentTab - 1][field.id] = myField.value;
+    this.setState({formData});
   };
 
   startTemplateCreation = (data) => {

package/containers/Line/Edit/index.js

@@ -254,7 +254,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
   onTagSelect = (data, currentTab, srcComp) => {
     console.log('parent data tag', data, currentTab);
     const editorId = srcComp.target;
-    this.insertAtCursor(document.getElementById(editorId), `{{${data}}}`);
+    this.insertAtCursor(document.getElementById(editorId), `{{${data}}}`, currentTab);
     document.getElementById(editorId).focus();
   };
   onModalCancel = () => {
@@ -685,7 +685,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     this.setState({showModal: false});
   };
 
-  insertAtCursor = (field, myValue) => {
+  insertAtCursor = (field, myValue, currentTab) => {
     //IE support
     const myField = field;
     if (document.selection) {
@@ -703,8 +703,9 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     } else {
       myField.value += myValue;
     }
-    const event = new Event('input', { bubbles: true });
-    myField.dispatchEvent(event);
+    const formData = _.cloneDeep(this.state.formData);
+    formData[currentTab - 1][field.id] = myField.value;
+    this.setState({formData});
   };
 
   selectCtaIos = (selectedConfig) => {

package/containers/MobilePush/Create/index.js

@@ -301,7 +301,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
   onTagSelect = (data, currentTab, srcComp) => {
     console.log('parent data tag', data, currentTab);
     const editorId = srcComp.target;
-    this.insertAtCursor(document.getElementById(editorId), `{{${data}}}`);
+    this.insertAtCursor(document.getElementById(editorId), `{{${data}}}`, currentTab);
     document.getElementById(editorId).focus();
   };
 
@@ -907,7 +907,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     });
     return section;
   };
-  insertAtCursor = (field, myValue) => {
+  insertAtCursor = (field, myValue, currentTab) => {
     //IE support
     const myField = field;
     if (document.selection) {
@@ -925,8 +925,9 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     } else {
       myField.value += myValue;
     }
-    const event = new Event('input', { bubbles: true });
-    myField.dispatchEvent(event);
+    const formData = _.cloneDeep(this.state.formData);
+    formData[currentTab - 1][field.id] = myField.value;
+    this.setState({formData});
   };
 
   startTemplateCreation = (data) => {

package/containers/MobilePush/Edit/index.js

@@ -490,7 +490,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
   onTagSelect = (data, currentTab, srcComp) => {
     console.log('parent data tag', data, currentTab);
     const editorId = srcComp.target;
-    this.insertAtCursor(document.getElementById(editorId), `{{${data}}}`);
+    this.insertAtCursor(document.getElementById(editorId), `{{${data}}}`, currentTab);
     document.getElementById(editorId).focus();
   };
   onModalCancel = () => {
@@ -1032,7 +1032,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     this.setState({showModal: false});
   };
 
-  insertAtCursor = (field, myValue) => {
+  insertAtCursor = (field, myValue, currentTab) => {
     //IE support
     const myField = field;
     if (document.selection) {
@@ -1050,8 +1050,9 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     } else {
       myField.value += myValue;
     }
-    const event = new Event('input', { bubbles: true });
-    myField.dispatchEvent(event);
+    const formData = _.cloneDeep(this.state.formData);
+    formData[currentTab - 1][field.id] = myField.value;
+    this.setState({formData});
   };
 
   selectCtaIos = (selectedConfig) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "2.0.100",
+  "version": "3.0.2",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",
@@ -12,54 +12,20 @@
   },
   "license": "LicenseRef-LICENSE",
   "dependencies": {
-    "@capillarytech/cap-ui-library": "^1.0.170",
-    "antd": "3.19.6",
-    "axios": "^0.16.2",
-    "babel-polyfill": "6.20.0",
-    "babel-preset-env": "^1.6.1",
     "chalk": "1.1.3",
-    "chevrotain": "*",
-    "compression": "1.6.2",
-    "cross-env": "3.1.3",
-    "express": "4.14.0",
-    "fixed-data-table": "^0.6.4",
-    "fontfaceobserver": "2.0.7",
-    "fs": "0.0.1-security",
-    "fs-extra": "^5.0.0",
-    "immutable": "3.8.1",
-    "intl": "1.2.5",
-    "invariant": "2.2.2",
-    "ip": "1.1.4",
     "jquery": "^3.3.1",
     "load-script": "^1.0.0",
-    "lodash": "4.17.2",
-    "minimist": "1.2.0",
-    "moment": "2.19.2",
     "normalizr": "^3.2.3",
     "perfect-scrollbar": "^0.7.0",
-    "prop-types": "^15.7.2",
-    "react": "^16.8.1",
     "react-datepicker": "^0.46.0",
-    "react-dom": "^16.8.1",
     "react-grid-layout": "^0.14.6",
-    "react-helmet": "^5.0.3",
-    "react-intl": "^2.4.0",
-    "react-redux": "^5.0.4",
     "react-router": "^3.2.0",
     "react-router-dom": "^4.2.2",
-    "react-router-redux": "4.0.6",
-    "react-router-scroll": "^0.4.3",
-    "react-sizeme": "^2.3.2",
     "redux": "3.6.0",
     "redux-auth-wrapper": "^1.1.0",
     "redux-beacon": "^0.4.0",
     "redux-immutable": "3.0.8",
-    "redux-saga": "0.14.0",
-    "redux-saga-test-plan": "^3.1.0",
     "reselect": "2.5.4",
-    "sanitize.css": "4.1.0",
-    "semantic-ui-react": "0.68.3",
-    "source-map-loader": "^0.2.4",
     "styled-components": "^3.2.1",
     "warning": "3.0.0",
     "whatwg-fetch": "2.0.1"

package/routes.js

@@ -433,7 +433,7 @@ export default function createRoutes(store) {
         const renderRoute = loadModule(cb);
 
         importModules.then(([reducer, sagas, component]) => {
-          injectReducer('mobilepushEdit', reducer.default);
+          injectReducer('mobileEdit', reducer.default);
           injectSagas(sagas.default);
           injectSagas(rootSaga.default);
           injectSagas(templateSagas.default);

package/v2Components/FormBuilder/index.js

@@ -9,14 +9,12 @@
 import PropTypes from 'prop-types';
 
 import React from 'react';
-import { Label } from 'semantic-ui-react';
 import _ from 'lodash';
 import { Tabs, Table, Modal} from 'antd';
-import { CapButton, CapInput, CapPopover, CapCheckbox, CapRadio, CapSelect, CapTable, CapRow, CapColumn, CapNotification} from '@capillarytech/cap-ui-library';
+import { CapLabel, CapButton, CapInput, CapPopover, CapCheckbox, CapRadio, CapSelect, CapTable, CapRow, CapColumn, CapNotification} from '@capillarytech/cap-ui-library';
 import LabelHOC from '@capillarytech/cap-ui-library/assets/HOCs/ComponentWithLabelHOC';
 import TemplatePreview from '../TemplatePreview';
 import TagList from '../../v2Containers/TagList';
-import SmsEditor from '../SmsEditor';
 import SlideBox from '../SlideBox';
 import CardGrid from '../CardGrid';
 import CKEditor from "../Ckeditor/";
@@ -2206,7 +2204,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
       //
       columns.push(
         <CapColumn key="label" span={4}>
-          <Label style={val.labelStyle ? val.labelStyle : {}}>{val.label}</Label>
+          <CapLabel style={val.labelStyle ? val.labelStyle : {}}>{val.label}</CapLabel>
         </CapColumn>
       );
       let ifError = false;
@@ -2251,17 +2249,6 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
             );
           }
           break;
-        case "SmsEditor":
-          columns.push(
-            <CapColumn span={5} key="input">
-              <SmsEditor
-                id={val.id}
-                content={this.state.formData[val.id]}
-                onDataChange={(data) => this.updateFormData(data.value, val)}
-              />
-            </CapColumn>
-          );
-          break;
         case "textarea":
           ifError = this.state.checkValidation && (isVersionEnable ? this.state.errorData[`${this.state.currentTab - 1}`][val.id] : this.state.errorData[val.id]);
           const value = isVersionEnable ? this.state.formData[`${this.state.currentTab - 1}`][val.id] : this.state.formData[val.id];
@@ -2616,17 +2603,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
               );
             }
             break;
-          case "SmsEditor":
-            columns.push(
-              <CapColumn span={5} key="input">
-                <SmsEditor
-                  id={val.id}
-                  content={this.state.formData[val.id]}
-                  onDataChange={(data) => this.updateFormData(data.value, val)}
-                />
-              </CapColumn>
-            );
-            break;
+
           case "textarea":
             ifError = this.state.checkValidation && (isVersionEnable ? this.state.errorData[`${this.state.currentTab - 1}`][val.id] : this.state.errorData[val.id]);
             const textValue = isVersionEnable ? this.state.formData[`${this.state.currentTab - 1}`][val.id] : this.state.formData[val.id];

package/v2Components/ToastrMessage/index.js

@@ -7,7 +7,6 @@
 import PropTypes from 'prop-types';
 
 import React from 'react';
-import { Progress } from 'semantic-ui-react';
 import styled from 'styled-components';
 import { messageTypeConfig } from '../../config/toastr';
 
@@ -91,7 +90,6 @@ class ToastrMessage extends React.Component { // eslint-disable-line react/prefe
             {this.props.text}
           </MessageContent>
         </div>
-        {(this.props.timeout > 0 && !this.props.hideProgressBar) ? <Progress style={{ transition: `${0.4}s linear` }} percent={this.state.percent} attached="bottom" /> : ''}
       </StyledMessageWrapper>
     );
   }

package/v2Containers/CreativesContainer/index.js

@@ -220,7 +220,7 @@ class Creatives extends React.Component {
         templateData.iosContent.type = get(mobilpushTemplate, 'definition.mode').toUpperCase();
         templateData.iosContent.deviceType = 'IOS';
       }
-      templateData.messageSubject = mobilpushTemplate.name;
+      templateData.messageSubject = mobilpushTemplate.name ? mobilpushTemplate.name : "messageSubject";
     }
     return templateData;
   };

package/v2Containers/Dashboard/index.js

@@ -9,7 +9,6 @@ import makeSelectDashboard from './selectors';
 import messages from './messages';
 import { UserIsAuthenticated } from '../../../utils/authWrapper';
 import * as actions from './actions';
-import PageHeader from '../../v2Components/PageHeader';
 import BreadCrumbs from '../../v2Components/BreadCrumbs/index';
 export class Dashboard extends React.Component { // eslint-disable-line react/prefer-stateless-function
   render() {
@@ -30,7 +29,6 @@ export class Dashboard extends React.Component { // eslint-disable-line react/pr
         />)}
         </FormattedMessage>
         <BreadCrumbs locations={breadCrumbLocations} />
-        <PageHeader pageHeading={<FormattedMessage {...messages.header} />} />
       </div>
     );
   }

package/v2Containers/MobilePush/Create/index.js

@@ -464,7 +464,6 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
           message: ios['message-title2'],
           ctas: [
           ],
-          categoryId: ios['secondary-cta-1-table'] ? ios['secondary-cta-1-table'].id : undefined,
         },
         custom: map(ios, (field, key) => {
           if (key.indexOf('custom-value') > -1) {
@@ -596,6 +595,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
           delete cta.ioscdeepLinkName;
         }
         obj.versions.base.IOS.expandableDetails.ctas.push(cta);
+        obj.versions.base.IOS.expandableDetails.categoryId = get(this.state, "templateCta.ctaTemplateDetails.id");
         if (obj.versions.base.IOS.expandableDetails.ctas[obj.versions.base.IOS.expandableDetails.ctas.length - 1].type === "DEEP_LINK") {
           const params = map(ios, (field, key) => {
             let actionLink;

package/v2Containers/MobilePush/Edit/index.js

@@ -395,7 +395,6 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
           ctas: [
 
           ],
-          categoryId: ios['secondary-cta-1-table'] ? ios['secondary-cta-1-table'].id : undefined,
         },
         custom: _.map(ios, (field, key) => {
           if (key.indexOf('custom-value') > -1) {
@@ -525,6 +524,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
         delete cta.ioscdeepLinkName;
       }
       obj.versions.base.IOS.expandableDetails.ctas.push(cta);
+      obj.versions.base.IOS.expandableDetails.categoryId = get(this.state, "templateCta.ctaTemplateDetails.id");
       if (obj.versions.base.IOS.expandableDetails.ctas[obj.versions.base.IOS.expandableDetails.ctas.length - 1].type === "DEEP_LINK") {
         const params = _.map(ios, (field, key) => {
           let actionLink;