@capillarytech/creatives-library 6.13.8 → 6.13.9

package/package.json

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

package/v2Containers/CreativesContainer/index.js

@@ -5,7 +5,7 @@ import {
 } from '@capillarytech/cap-ui-library';
 import { injectIntl, FormattedMessage } from 'react-intl';
 import classnames from 'classnames';
-import {isEmpty, get, forEach} from 'lodash';
+import {isEmpty, get, forEach, cloneDeep} from 'lodash';
 import { connect } from 'react-redux';
 import { createStructuredSelector } from 'reselect';
 import { bindActionCreators } from 'redux';
@@ -18,7 +18,6 @@ import SlideBoxHeader from './SlideBoxHeader';
 import SlideBoxFooter from './SlideBoxFooter';
 import * as constants from './constants';
 import * as commonUtil from '../../utils/common';
-
 import './index.scss';
 import * as templateActions from '../Templates/actions';
 import * as globalActions from '../Cap/actions';
@@ -249,7 +248,7 @@ class Creatives extends React.Component {
         }
         case constants.VIBER: {
           const { messageBody, isDefault } = templateData;
-          const viberContent = JSON.parse(messageBody || '{}').messages || [{}];
+          const viber = JSON.parse(messageBody || '{}');
           creativesTemplateData = {
             type: constants.VIBER,
             isDefault,
@@ -258,7 +257,7 @@ class Creatives extends React.Component {
             versions: {
               base: {
                 content: {
-                  viber: viberContent,
+                  ...viber,
                 },
               },
             },
@@ -352,10 +351,18 @@ class Creatives extends React.Component {
         break;
       case constants.VIBER:
         if (template.value) {
+          const { Templates = {} } = this.props || {};
+          const selectedViberAccount = Templates && Templates.selectedViberAccount;
+          const accountDetails = selectedViberAccount || '';
+          const accountId = selectedViberAccount ? selectedViberAccount.id : '';
           const { versions } = template.value;
+          const content = cloneDeep(versions.base.content);
+          content.scenarioKey = get(accountDetails, 'configs.scenario_key');
           templateData = {
             channel,
-            messageBody: JSON.stringify(versions.base.content),
+            accountId,
+            accountDetails,
+            messageBody: JSON.stringify(content),
           };
         }
         break;

package/v2Containers/Templates/actions.js

@@ -4,119 +4,126 @@
  *
  */
 
- import * as types from './constants';
-
- export function getAllTemplates(channel, queryParams) {
-   console.log('get all templates action trigereed', channel, queryParams);
-   return {
-     type: types.GET_ALL_TEMPLATES_REQUEST, channel, queryParams,
-   };
- }
-
- export function resetTemplate() {
-   return {
-     type: types.RESET_TEMPLATE,
-   };
- }
-
- export function resetAccount() {
-   return {
-     type: types.RESET_ACCOUNT,
-   };
- }
-
- export function deleteTemplate(channel, id) {
-   console.log('delete template action trigereed', channel, id);
-   return {
-     type: types.DELETE_TEMPLATE_REQUEST, channel, id,
-   };
- }
-
- export function getUserList() {
-   return {
-     type: types.GET_USER_LIST_REQUEST,
-   };
- }
-
- export function getWeCrmAccounts(source) {
-   return {
-     type: types.GET_WECRM_ACCOUNTS_REQUEST, source,
-   };
- }
-
- export function setWeChatAccount(weChatAccount) {
-   console.log('setting wechat account', weChatAccount);
-   return {
-     type: types.SET_WECHAT_ACCOUNT,
-     weChatAccount,
-   };
- }
-
- export function setLineAccount(lineAccount) {
+import * as types from './constants';
+
+export function getAllTemplates(channel, queryParams) {
+  console.log('get all templates action trigereed', channel, queryParams);
+  return {
+    type: types.GET_ALL_TEMPLATES_REQUEST, channel, queryParams,
+  };
+}
+
+export function resetTemplate() {
+  return {
+    type: types.RESET_TEMPLATE,
+  };
+}
+
+export function resetAccount() {
+  return {
+    type: types.RESET_ACCOUNT,
+  };
+}
+
+export function deleteTemplate(channel, id) {
+  console.log('delete template action trigereed', channel, id);
+  return {
+    type: types.DELETE_TEMPLATE_REQUEST, channel, id,
+  };
+}
+
+export function getUserList() {
+  return {
+    type: types.GET_USER_LIST_REQUEST,
+  };
+}
+
+export function getWeCrmAccounts(source) {
+  return {
+    type: types.GET_WECRM_ACCOUNTS_REQUEST, source,
+  };
+}
+
+export function setWeChatAccount(weChatAccount) {
+  console.log('setting wechat account', weChatAccount);
+  return {
+    type: types.SET_WECHAT_ACCOUNT,
+    weChatAccount,
+  };
+}
+
+export function setLineAccount(lineAccount) {
   return {
     type: types.SET_LINE_ACCOUNT,
     lineAccount,
   };
 }
 
- export function handleHtmlUpload(selectedTemplate) {
-   return {
-     type: types.SET_SELECTED_LAYOUT,
-     selectedTemplate,
-   };
- }
-
- export function handleZipUpload(selectedFile, successHandler, errorHandler) {
-   return {
-     type: types.SEND_ZIPPED_FILE_REQUEST,
-     selectedFile,
-     successHandler,
-     errorHandler,
-   };
- }
-
- export function getDefaultBeeTemplates() {
-   return {
-     type: types.GET_DEAFULT_BEE_TEMPLATES_REQUEST,
-   };
- }
-
- export function setEdmTemplate(template) {
-   return {
-     type: types.SET_EDM_TEMPLATE,
-     template,
-   };
- }
- export function setBEETemplate(template) {
-   return {
-     type: types.SET_BEE_TEMPLATE,
-     template,
-   };
- }
- export function getTemplateDetails(id, channel) {
-   console.log('getting template', id, channel);
-   return {
-     type: types.GET_TEMPLATE_DETAILS_REQUEST,
-     id,
-     channel,
-   };
- }
-
- export function resetTemplateData() {
-   return {
-     type: types.RESET_TEMPLATE_DATA,
-   };
- }
-
- export function resetUploadData() {
-   console.log('clearing upload data');
-   return {
-     type: types.RESET_UPLOAD_DATA,
-   };
- }
-
- export function resetTemplateStoreData() {
-   return {
-     type: types.CLEAR_TEMPLATE_STORE_DATA,
-   };
- }
+export function setViberAccount(viberAccount) {
+  return {
+    type: types.SET_VIBER_ACCOUNT,
+    viberAccount,
+  };
+}
+
+export function handleHtmlUpload(selectedTemplate) {
+  return {
+    type: types.SET_SELECTED_LAYOUT,
+    selectedTemplate,
+  };
+}
+
+export function handleZipUpload(selectedFile, successHandler, errorHandler) {
+  return {
+    type: types.SEND_ZIPPED_FILE_REQUEST,
+    selectedFile,
+    successHandler,
+    errorHandler,
+  };
+}
+
+export function getDefaultBeeTemplates() {
+  return {
+    type: types.GET_DEAFULT_BEE_TEMPLATES_REQUEST,
+  };
+}
+
+export function setEdmTemplate(template) {
+  return {
+    type: types.SET_EDM_TEMPLATE,
+    template,
+  };
+}
+export function setBEETemplate(template) {
+  return {
+    type: types.SET_BEE_TEMPLATE,
+    template,
+  };
+}
+export function getTemplateDetails(id, channel) {
+  console.log('getting template', id, channel);
+  return {
+    type: types.GET_TEMPLATE_DETAILS_REQUEST,
+    id,
+    channel,
+  };
+}
+
+export function resetTemplateData() {
+  return {
+    type: types.RESET_TEMPLATE_DATA,
+  };
+}
+
+export function resetUploadData() {
+  console.log('clearing upload data');
+  return {
+    type: types.RESET_UPLOAD_DATA,
+  };
+}
+
+export function resetTemplateStoreData() {
+  return {
+    type: types.CLEAR_TEMPLATE_STORE_DATA,
+  };
+}

package/v2Containers/Templates/constants.js

@@ -43,6 +43,8 @@ export const RESET_UPLOAD_DATA = "app/v2Containers/Templates/RESET_UPLOAD_DATA";
 export const CLEAR_TEMPLATE_STORE_DATA = "app/v2Containers/Templates/CLEAR_TEMPLATE_STORE_DATA";
 
 export const SET_LINE_ACCOUNT = "app/v2Containers/Templates/SET_LINE_ACCOUNT";
+export const SET_VIBER_ACCOUNT = "app/v2Containers/Templates/SET_VIBER_ACCOUNT";
+
 
 export const GET_DEAFULT_BEE_TEMPLATES_REQUEST = 'app/v2Containers/Templates/GET_DEAFULT_BEE_TEMPLATES_REQUEST';
 export const GET_DEAFULT_BEE_TEMPLATES_SUCCESS = 'app/v2Containers/Templates/GET_DEAFULT_BEE_TEMPLATES_SUCCESS';

package/v2Containers/Templates/index.js

@@ -171,6 +171,10 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
           break;
         case VIBER:
           channel = 'Viber';
+          if (!this.props.isFullMode) {
+            activeMode = ACCOUNT_SELECTION_MODE;
+            this.props.actions.getWeCrmAccounts(channel);
+          }
           break;
         case LINE:
           channel = "Line";
@@ -258,6 +262,10 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         }
       } else if (nextProps.route.name.toLowerCase() === VIBER_CHANNEL) {
         channel = 'Viber';
+        if (!this.props.isFullMode) {
+          this.setState({defaultAccount: true});
+          nextProps.actions.getWeCrmAccounts(channel);
+        }
       }
 
       this.setState({ channel }, () => {
@@ -282,6 +290,20 @@ 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() === VIBER_CHANNEL && isEmpty(nextProps.Templates.selectedViberAccount)) {
+      let selectedAccount = '';
+      if (isEmpty(nextProps.Templates.weCrmAccounts)) {
+        return;
+      }
+      selectedAccount = nextProps.Templates.weCrmAccounts[0];
+      this.setState({selectedAccount: selectedAccount.name}, () => {
+        params.wecrmId = selectedAccount.configs.wecrm_app_id;
+        params.wecrmToken = selectedAccount.configs.wecrm_token;
+        params.originalId = selectedAccount.sourceAccountIdentifier;
+        this.props.actions.setViberAccount(nextProps.Templates.weCrmAccounts[0]);
+        this.getAllTemplates({params});
+      });
+    }
     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)) {
@@ -448,6 +470,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       } else if (this.state.channel.toLowerCase() === 'line') {
         this.props.actions.setLineAccount(this.props.Templates.weCrmAccounts.find((item) => item.name === this.state.selectedAccount));
       }
+
       this.setState({activeMode: TEMPLATES_MODE});
       console.log("getAllTemplates params: ", params);
       this.getAllTemplates({params, resetPage: true});
@@ -1756,6 +1779,10 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         noAccountHeader = messages.noAccountsPresentLine;
         break;
       }
+      case VIBER: {
+        noAccountHeader = messages.noAccountsPresentViber;
+        break;
+      }
       default:
         break;
     }

package/v2Containers/Templates/messages.js

@@ -366,4 +366,8 @@ export default defineMessages({
     id: `${scope}.duplicatingTemplate`,
     defaultMessage: 'Duplicating template...'
   },
+  noAccountsPresentViber: {
+    id: `${scope}.noAccountsPresentViber`,
+    defaultMessage: "Viber accounts are not setup for your brand",
+  },
 });

package/v2Containers/Templates/reducer.js

@@ -73,6 +73,8 @@ function templatesReducer(state = initialState, action) {
         .set('selectedWeChatAccount', fromJS(action.weChatAccount));
     case types.SET_LINE_ACCOUNT:
       return state.set('selectedLineAccount', fromJS(action.lineAccount));
+    case types.SET_VIBER_ACCOUNT:
+      return state.set('selectedViberAccount', fromJS(action.viberAccount));
     case types.RESET_ACCOUNT:
       return state
         .remove('selectedWeChatAccount')

package/v2Containers/Viber/index.js

@@ -64,7 +64,7 @@ const Viber = (props) => {
     handleClose,
     onCreateComplete,
     params,
-    templateData,
+    templateData = {},
     actions,
     viber = {},
     getFormSubscriptionData,
@@ -114,7 +114,7 @@ const Viber = (props) => {
   }, [paramObj.id]);
 
   useEffect(() => {
-    if (params && params.id) {
+    if (params && params.id || templateData.edit) {
       const { viber: editViberContent = {} } = get(templateData, `versions.base.content`) || get(viber, `templateDetails.versions.base.content`) || {};
       const editMessageTitle = (templateData || {}).name || get(viber, 'templateDetails.name');
       updateTextMessageTitle(editMessageTitle);