@capillarytech/creatives-library 7.1.6 → 7.1.10

package/config/app.js

@@ -11,7 +11,6 @@ const config = {
     dashboard_url: '/sms',
     dashboard_url_v2: '/v2',
     subscription_api_endpoint: '/arya/api/v1/org-settings/subscription',
-    exports_api_endpoint: '/arya/api/v1/export/data',
     accountConfig: (strs, accountId) => `${window.location.origin}/org/config/AccountAdd?q=a&channelId=2&accountId=${accountId}&edit=1`,
   },
   development: {
@@ -20,7 +19,6 @@ const config = {
     auth_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/arya/api/v1/auth',
     arya_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/arya/api/v1',
     subscription_api_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/arya/api/v1/org-settings/subscription',
-    exports_api_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/arya/api/v1/export/data',
     login_url: '/auth/login',
     dashboard_url: '/sms',
     dashboard_url_v2: '/v2',

package/index.js

@@ -56,10 +56,6 @@ import MobilepushCreate from './v2Containers/MobilePush/Create';
 import mobilepushCreateReducer from './v2Containers/MobilePush/Create/reducer';
 import mobilepushCreateSaga from './v2Containers/MobilePush/Create/sagas';
 
-import FTP from './v2Containers/FTP';
-import FTPReducer from './v2Containers/FTP/reducer';
-import FTPSagas from './v2Containers/FTP/sagas';
-
 import MobilepushEdit from './v2Containers/MobilePush/Edit';
 import mobilepushEditReducer from './v2Containers/MobilePush/Edit/reducer';
 import mobilepushEditSaga from './v2Containers/MobilePush/Edit/sagas';
@@ -69,10 +65,6 @@ import LineCreate from './v2Containers/Line/Container';
 import lineCreateReducer from './v2Containers/Line/Container/reducer';
 import lineCreateSaga from './v2Containers/Line/Container/sagas';
 
-import Viber from './v2Containers/Viber';
-import viberReducer from './v2Containers/Viber/reducer';
-import viberSaga from './v2Containers/Viber/sagas';
-
 import TemplatesV2 from './v2Containers/TemplatesV2/index';
 
 import CreativesContainer from './v2Containers/CreativesContainer';
@@ -90,7 +82,7 @@ const TemplatesContainer = {Templates, templateReducer, templateSaga};
 const SmsCreateContainer = {SmsCreate, smsCreateReducer, smsCreateSaga};
 const SmsEditContainer = {SmsEdit, smsEditReducer, smsEditSaga};
 const EmailContainer = {Email, emailReducer, emailSaga};
-const BeeContainer = { BeeEditor, beeReducer, beeSaga};
+const BeeContainer ={ BeeEditor,beeReducer,beeSaga}
 const CallTaskContainer = {CallTask, callTaskReducer, callTaskSaga};
 const WeChatMapTemplateContainer = {WeChatMapTemplate, weChatMapTemplateReducer, weChatMapTemplateSaga};
 const WeChatRichMediaCreateContainer = {WeChatRichMediaCreate, weChatRichMediaCreateReducer, weChatRichMediaCreateSaga};
@@ -100,10 +92,7 @@ const MobilePushEditContainer = {MobilepushEdit, mobilepushEditReducer, mobilepu
 const LineCreateContainer = {LineCreate, lineCreateReducer, lineCreateSaga};
 const TemplatesV2Container = {TemplatesV2, templateReducer, templateSaga};
 const FacebookContainer = {Facebook, facebookReducer, facebookSaga};
-const ViberContainer = {Viber, viberReducer, viberSaga};
-
 const GalleryContainer = {Gallery, galleryReducer, gallerySagas};
-const FTPContainer = {FTP, FTPReducer, FTPSagas};
 
 export {default as TagList} from './v2Containers/TagList/index';
 export {default as TagListSaga} from './v2Containers/TagList/sagas';
@@ -115,7 +104,6 @@ export {default as CallTaskPreview} from './v2Components/CallTaskPreview';
 export {default as EmailMobilePreview} from './v2Components/EmailMobilePreview';
 export {default as MobilePushPreview} from './v2Components/MobilePushPreviewV2';
 export {default as WechatRichmediaTemplatePreview} from './v2Components/TemplatePreview/WechatRichmediaTemplatePreview';
-export {default as FTP} from './v2Containers/FTP';
 
 CreativesContainer.CreativesContainerReducer = CreativesContainerReducer;
 
@@ -143,6 +131,4 @@ export { CapContainer,
   updateCharCount,
   FacebookContainer,
   GalleryContainer,
-  FTPContainer,
-  ViberContainer,
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "7.1.6",
+  "version": "7.1.10",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",
@@ -30,7 +30,6 @@
     "redux-beacon": "^0.4.0",
     "redux-immutable": "3.0.8",
     "reselect": "2.5.4",
-    "save": "^2.4.0",
     "styled-components": "^3.2.1",
     "webpack-bugsnag-plugins": "^1.4.3",
     "whatwg-fetch": "2.0.1"

package/reducers.js

@@ -9,8 +9,6 @@ import { LOCATION_CHANGE } from 'react-router-redux';
 
 import languageProviderReducer from 'v2Containers/LanguageProvider/reducer';
 import beeEditorReducer from 'v2Containers/BeeEditor/reducer';
-
-
 import capReducer from 'containers/Cap/reducer';
 import appReducer from 'containers/App/reducer';
 import createSmsReducer from 'containers/Sms/Create/reducer';
@@ -19,7 +17,7 @@ import templateReducer from 'containers/Templates/reducer';
 import tagsReducer from 'containers/TagList/reducer';
 import emailReducer from 'containers/Email/reducer';
 import ebillReducer from 'containers/Ebill/reducer';
-import ftpReducer from 'v2Containers/FTP/reducer';
+
 /*
  * routeReducer
  *
@@ -64,7 +62,6 @@ export default function createReducer(asyncReducers) {
     email: emailReducer,
     ebill: ebillReducer,
     beeEditor: beeEditorReducer,
-    FTP: ftpReducer,
     ...asyncReducers,
   });
 }

package/routes.js

@@ -598,8 +598,7 @@ export default function createRoutes(store) {
 
         importModules.catch(errorLoading);
       },
-    },
-    {
+    }, {
       path: '/v2(/:channel)',
       name: 'templatesV2',
       getComponent(nextState, cb) {
@@ -635,8 +634,6 @@ export default function createRoutes(store) {
           import('v2Containers/Facebook/reducer'),
           import('v2Containers/Line/Container/sagas'),
           import('v2Containers/Line/Container/reducer'),
-          import('v2Containers/Viber/sagas'),
-          import('v2Containers/Viber/reducer'),
         ]);
 
         const renderRoute = loadModule(cb);
@@ -657,7 +654,6 @@ export default function createRoutes(store) {
           galleryReducer, gallerySagas,
           facebookSagas, facebookReducer,
           lineCreateSagas, lineCreateReducer,
-          viberSagas, viberReducer,
         ]) => {
           injectReducer('templates', reducer.default);
           injectReducer('cap', capReducer.default);
@@ -674,7 +670,6 @@ export default function createRoutes(store) {
           injectReducer('gallery', galleryReducer.default);
           injectReducer('facebook', facebookReducer.default);
           injectReducer('lineCreate', lineCreateReducer.default);
-          injectReducer('viber', viberReducer.default);
           injectSagas(gallerySagas.default);
           injectSagas(sagas.default);
           injectSagas(capSagas.default);
@@ -690,7 +685,6 @@ export default function createRoutes(store) {
           injectSagas(weChatRichmediaTemplatesEditSagas.default);
           injectSagas(facebookSagas.default);
           injectSagas(lineCreateSagas.default);
-          injectSagas(viberSagas.default);
           renderRoute(component);
         });
         importModules.catch(errorLoading);

package/services/api.js

@@ -9,7 +9,6 @@ import getSchema from './getSchema';
 import * as API from '../utils/ApiCaller';
 import { GA } from '@capillarytech/cap-ui-utils';
 let API_ENDPOINT = config.development.api_endpoint;
-let EXPORT_API_ENDPOINT = config.development.exports_api_endpoint;
 let CAMPAIGNS_API_ENDPOINT = config.development.campaigns_api_endpoint;
 let API_AUTH_ENDPOINT = config.development.auth_endpoint;
 let ARYA_ENDPOINT = config.development.arya_endpoint;
@@ -214,11 +213,6 @@ export const duplicateTemplate = ({id, channel}) => {
   return request(url, getAPICallObject('GET'));
 };
 
-export const getFTPServers = () => {
-  const url = `${EXPORT_API_ENDPOINT}/ftplist`;
-  return request(url, getAPICallObject('GET'));
-};
-
 export const editWeChatTemplate = ({template}) => {
   console.log('in api.js', template);
   const url = `${API_ENDPOINT}/templates/WECHAT`;
@@ -364,11 +358,6 @@ export const createLineTemplate = ({template}) => {
   return request(url, getAPICallObject('POST', template));
 };
 
-export const createViberTemplate = ({template}) => {
-  const url = `${API_ENDPOINT}/templates/VIBER`;
-  return request(url, getAPICallObject('POST', template));
-};
-
 export const getLocizMessage = async (locale) => {
   const appName = 'creatives_v2';
   const url = `${ARYA_ENDPOINT}/translations/${appName}/${locale}`;

package/utils/common.js

@@ -37,181 +37,3 @@ export const hasStore2DoorFeature = Auth.hasFeatureAccess.bind(
   null,
   STORE2DOOR_PLUS_ENABLED,
 );
-
-export function getTreeStructuredTags({tagsList, userLocale = 'en', offerDetails = []}) {
-  console.log('populating tags', (tagsList || []).length);
-  const mainTags = {};
-
-  _.forEach(tagsList, (temp) => {
-    const tag = temp.definition;
-    if (!tag['tag-header']) { //if tag doesn't have subtag(s), which means this tag itself is tag and not a tag header.
-      mainTags[tag.value] = {
-        name: tag.label[userLocale] || tag.label.en,
-        value: tag.value,
-      };
-    } else if (tag['tag-header'] && mainTags[tag.value]) { 
-      // to check it this tag header is already available in mainTags object,
-      //If yes, it will concat the subtag
-      mainTags[tag.value].subtags = _.concat(mainTags[tag.value].subtags, tag.subtags);
-    } else if (!mainTags[tag.value]) {
-      //If tag is not available in mainTag object, new maintag will be added.
-      mainTags[tag.value] = {
-        'tag-header': true,
-        "name": tag.label[userLocale] || tag.label.en,
-        "subtags": tag.subtags,
-        "value": tag.value,
-      };
-    }
-  });
-
-  const mainTagsCloned = _.cloneDeep(mainTags);
-  //Insert subtags in tag headers and reomve them from top level
-  const result = {};
-  _.forEach(mainTagsCloned, (tag, key) => {
-    if (tag['tag-header']) {
-      const tagWithChildren = populateTagForChildren(tag, mainTagsCloned, key);
-      tagWithChildren.resolved = true;
-      result[key] = tagWithChildren;
-    } else {
-      result[key] = tag;
-    }
-  });
-
-  //Delete extra tag headers
-  _.forEach(result, (tag) => {
-    if (tag['tag-header']) {
-      _.forEach(tag.subtags, (subtag, key) => {
-        if (result[key]) {
-          result[key].deleted = true;
-        }
-      });
-    }
-  });
-  //Actually delete them
-  _.forEach(result, (tag, key) => {
-    if (tag.deleted) {
-      delete result[key];
-    }
-  });
-  let combinedTags = result;
-  if (offerDetails.length) {
-    combinedTags = transformCouponTags(offerDetails, result);
-  }
-  return getTreeStructureData(combinedTags);
-}
-
-function transformCouponTags(offerDetails, allTags) {
-  const couponTags = {};
-  const couponTagsKeys = Object.keys(_.get(allTags, 'coupon.subtags', []));
-  const withCouponId = (obj, id) => {
-    const tempObj = {};
-    if (obj.subtags) {
-      tempObj.subtags = _.mapValues(obj.subtags, (tag) => {
-        let val = tag.value;
-        val = `${val}(${id})`;
-        const newObj = {
-          ...tag,
-          value: val,
-        };
-        return {
-          ...withCouponId(newObj, id),
-        };
-      });
-    }
-    return {
-      ...obj,
-      ...tempObj,
-      couponSeriesId: id,
-    };
-  };
-  offerDetails.forEach((offer) => {
-    const { id, couponName, description, couponSeriesId } = offer;
-    const couponId = id || couponSeriesId;
-    const couponSubTags = {};
-    couponTagsKeys.forEach((couponTagKey) => {
-      let val = allTags.coupon.subtags[couponTagKey].value;
-      val = `${val}(${couponId})`;
-      const newObj = {
-        ...allTags.coupon.subtags[couponTagKey],
-        value: val,
-      };
-      const couponSubTagsObj = withCouponId(newObj, couponId);
-      couponSubTags[couponTagKey] = couponSubTagsObj;
-    });
-    const couponNameFinal = couponName || description;
-    const key = couponNameFinal || couponId;
-    couponTags[key] = {
-      'tag-header': true,
-      'name': couponNameFinal || couponId,
-      'desc': couponNameFinal || couponId,
-      'couponSeriesId': couponId,
-      'subtags': couponSubTags,
-      'resolved': true,
-      'couponTags': true,
-    };
-  });
-  // eslint-disable-next-line no-param-reassign
-  allTags.coupon.subtags = couponTags;
-  return allTags;
-}
-
-function populateTagForChildren(targetTag, tagsObject, tagValue) {
-  const tag = targetTag;
-  if (tag && tag['tag-header'] && !tag.resolved) {
-    const tempSubTags = {};
-    _.forEach(tag.subtags, (subtag) => {
-      if (tagsObject[subtag]) {
-        const children = populateTagForChildren(tagsObject[subtag], tagsObject, subtag);
-        children.resolved = true;
-        tempSubTags[subtag] = children;
-      }
-    });
-    tag.subtags = tempSubTags;
-    return tag;
-  }
-  return tagsObject[tagValue];
-}
-
-function getTreeStructureData(data) {
-  const result = [];
-  _.forOwn(data, (mainTag) => {
-    const { name, value, subtags = [] } = mainTag;
-    if (!mainTag['tag-header']) {
-      result.push({
-        title: name,
-        value: `{{${value}}}`,
-      });
-    } else {
-      const obj = {
-        title: name,
-        value: `{{${value}}}`,
-        selectable: false,
-      };
-      obj.children = getSubTags(subtags);
-      result.push(obj);
-    }
-  });
-  return result;
-}
-
-function getSubTags(subtagsParam) {
-  const result = [];
-  _.forOwn(subtagsParam, (subTag) => {
-    const { name, value, subtags = [] } = subTag;
-    if (_.isEmpty(subtags)) {
-      result.push({
-        title: name,
-        value: `{{${value}}}`,
-      });
-    } else {
-      const obj = {
-        title: name,
-        value: `{{${value}}}`,
-        selectable: false,
-      };
-      obj.children = getSubTags(subtags);
-      result.push(obj);
-    }
-  });
-  return result;
-}

package/v2Components/TemplatePreview/_templatePreview.scss

@@ -21,6 +21,8 @@
     left: 23%;
     width: 42%;
     height: 336px;
+    display: -webkit-box;
+    display: -ms-flexbox;
     display: flex;
 
     .sms-icon{
@@ -49,14 +51,6 @@
         left: 36px;
         margin-top: -6px;
       }
-      }
-      &.viber-preview{
-        width: 43%;
-        .message-pop {
-          width: 80%;
-          left: 36px;
-          margin-top: -6px;
-        }
     }
 
     .message-pop{