@capillarytech/creatives-library 7.17.47-alpha.0 → 7.17.47

package/containers/App/constants.js

@@ -70,5 +70,4 @@ export const PROMO_ENGINE_RELATED_TAGS = [
   "promotion_expiry_date",
 ];
 
-export const CUSTOMER_BARCODE_TAG = "customer_barcode";
-export const COPY_OF = "Copy of";
+export const CUSTOMER_BARCODE_TAG = "customer_barcode";

package/package.json

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

package/v2Components/CapTagList/index.js

@@ -11,7 +11,7 @@ import moment from 'moment';
 import { FONT_COLOR_05 } from '@capillarytech/cap-ui-library/styled/variables';
 // import styled from 'styled-components';
 import { CapSpin, CapModal, CapButton, CapPopover, CapInput, CapTree, CapSelect, CapTooltip, CapLink, CapIcon } from '@capillarytech/cap-ui-library';
-import './style.scss';
+
 import _ from 'lodash';
 import { FormattedMessage, injectIntl, intlShape } from 'react-intl';
 import { createStructuredSelector } from 'reselect';
@@ -287,7 +287,6 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
             <CapIcon
               type="help"
               size="s"
-              svgProps={{ color: FONT_COLOR_05 }}
             />
             <CapLink>
               <CapButton id="translationtagfooter" type="flat" onClick={this.openTranslationLink} >
@@ -296,6 +295,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
                   <CapIcon
                     type="open-in-new-light"
                     size="s"
+                    svgProps={{ color: FONT_COLOR_05 }}
                   />
                 </div>
               </CapButton>

package/v2Components/FormBuilder/index.js

@@ -54,7 +54,7 @@ import { convert } from 'html-to-text';
 import { AI_SUGGESTION_API_URL } from './constants';
 import { GET_TRANSLATION_MAPPED } from '../../containers/TagList/constants';
 import moment from 'moment';
-import { CUSTOMER_BARCODE_TAG , COPY_OF} from '../../containers/App/constants';
+import { CUSTOMER_BARCODE_TAG } from '../../containers/App/constants';
 const TabPane = Tabs.TabPane;
 const {Column} = Table;
 const {TextArea} = CapInput;
@@ -1669,7 +1669,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
     } else {
       const tempTab = ifError ? currentTab : this.state.currentTab;
       const version = `Version ${this.state.currentTab}`;
-      formData[tabCount].name = `${COPY_OF} ${formData[tempTab - 1].name ? formData[tempTab - 1].name : version}`;
+      formData[tabCount].name = `${this.props?.intl?.formatMessage(globalMessages.copyOf)} ${formData[tempTab - 1].name ? formData[tempTab - 1].name : version}`;
       formData[tabCount].base = false;
       const initialTab = this.state.currentTab;
       this.setState({formData, tabCount: tabCount + 1, currentTab: tabCount + 1, tabKey: formData[tabCount].tabKey}, () => {

package/v2Containers/Email/index.js

@@ -2554,7 +2554,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         <CapInput
           className="search-text"
           style={{width: '210px'}}
-          placeholder={`${this.props.intl.formatMessage(messages.searchText)}`}
+          placeholder="Search"
           prefix={<i className="material-icons" style={{color: '#707070', fontSize: '16px'}}>search</i>}
           value={this.state.searchText}
           onChange={(e) => this.searchAsset(e.target.value)}

package/v2Containers/Templates/actions.js

@@ -7,9 +7,9 @@
 import * as types from './constants';
 import { LINE, WHATSAPP, RCS, ZALO } from '../CreativesContainer/constants';
 
-export function getAllTemplates(channel, queryParams, intlCopyOf = '') {
+export function getAllTemplates(channel, queryParams) {
   return {
-    type: types.GET_ALL_TEMPLATES_REQUEST, channel, queryParams, intlCopyOf,
+    type: types.GET_ALL_TEMPLATES_REQUEST, channel, queryParams,
   };
 }
 

package/v2Containers/Templates/constants.js

@@ -73,5 +73,3 @@ export const GET_SENDER_DETAILS_FAILURE =
 export const GET_CDN_TRANSFORMATION_CONFIG_REQUEST = 'app/v2Containers/Templates/GET_CDN_TRANSFORMATION_CONFIG_REQUEST';
 export const GET_CDN_TRANSFORMATION_CONFIG_SUCCESS = 'app/v2Containers/Templates/GET_CDN_TRANSFORMATION_CONFIG_SUCCESS';
 export const GET_CDN_TRANSFORMATION_CONFIG_FAILURE = 'app/v2Containers/Templates/GET_CDN_TRANSFORMATION_CONFIG_FAILURE';
-
-export const COPY_OF = 'Copy of';

package/v2Containers/Templates/index.js

@@ -93,7 +93,7 @@ import {
   FACEBOOK as FACEBOOK_CHANNEL,
   CREATE,
 } from '../App/constants';
-import { COPY_OF, MAX_WHATSAPP_TEMPLATES, WARNING_WHATSAPP_TEMPLATES } from './constants';
+import { MAX_WHATSAPP_TEMPLATES, WARNING_WHATSAPP_TEMPLATES } from './constants';
 import {
   TWILIO_CATEGORY_OPTIONS,
   KARIX_GUPSHUP_CATEGORY_OPTIONS,
@@ -309,7 +309,6 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
   }
 
   componentDidMount() {
-    const {formatMessage} =this.props?.intl || {};
     if (this.props.location.query.type === 'embedded' && this.isEnabledInLibraryModule("setLocale")) {
       this.setLocale();
     }
@@ -335,7 +334,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       if ((this.state.channel || '').toLowerCase() === "sms" && isTraiDltFeature) {
         queryParams.traiEnable = true;
       }
-      this.props.actions.getAllTemplates(channel, queryParams,`${formatMessage(globalMessages.copyOf)}`);
+      this.props.actions.getAllTemplates(channel, queryParams);
     }
 
     window.addEventListener("message", this.handleFrameTasks);
@@ -771,7 +770,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         queryParams.originalId = this.props.Templates.selectedWeChatAccount.sourceAccountIdentifier;
       }
       const channel = this.state.channel;
-      this.props.actions.getAllTemplates(channel, queryParams,`${this.props?.intl?.formatMessage(globalMessages.copyOf)}`);
+      this.props.actions.getAllTemplates(channel, queryParams);
     } else if ((resetPage || (page === 1 && this.state.templatesCount === 0) || page <= (this.state.templatesCount / this.state.perPageLimit))) {
       if (getNextPage) {
         page += 1;
@@ -813,7 +812,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         queryParams.page = page;
         queryParams.perPage = this.state.perPageLimit;
         const channel = this.state.channel;
-        this.props.actions.getAllTemplates(channel, queryParams, `${this.props?.intl?.formatMessage(globalMessages.copyOf)}`);
+        this.props.actions.getAllTemplates(channel, queryParams);
       });
     }
   };
@@ -1757,7 +1756,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
 
   duplicateTemplate(template) {
     const duplicateObj = cloneDeep(template);
-    duplicateObj.name = `${COPY_OF} ${template?.name} ${moment().format('MM-DD-YYYY HH:mm:ss')}`;
+    duplicateObj.name = `${this.props.intl.formatMessage(globalMessages.copyOf)} ${template?.name} ${moment().format('MM-DD-YYYY HH:mm:ss')}`;
     delete duplicateObj._id;
 
     if (this.state.channel.toLowerCase() === "mobilepush") {

package/v2Containers/Templates/sagas.js

@@ -4,6 +4,7 @@ import { LOCATION_CHANGE } from 'react-router-redux';
 import * as Api from '../../services/api';
 import * as types from './constants';
 import { saveCdnConfigs, removeAllCdnLocalStorageItems } from '../../utils/cdnTransformation';
+
 // Individual exports for testing
 export function* getAllTemplates(channel, queryParams) {
   try {
@@ -19,13 +20,6 @@ export function* getAllTemplates(channel, queryParams) {
     } else if (channel.channel === 'wechat' && channel.queryParams && channel.queryParams.sortBy && channel.queryParams.sortBy.toLocaleLowerCase() === ("Alphabetically").toLocaleLowerCase()) {
       channelTemplates.templates.sort((a, b) => b.name - a.name);
     }
-    // Update the "name" property in each template
-    if (channel.intlCopyOf && channelTemplates?.templates) {
-      channelTemplates.templates = channelTemplates.templates.map((template) => ({
-        ...template,
-        name: template.name.replace(new RegExp(types.COPY_OF, 'g'), channel.intlCopyOf),
-      }));
-    }
     yield put({ type: types.GET_ALL_TEMPLATES_SUCCESS, data: channelTemplates, weCRMTemplate: result.response.unMapped, isReset: channel.queryParams.page === 1 });
   } catch (error) {
     yield put({ type: types.GET_ALL_TEMPLATES_FAILURE, error });
@@ -128,7 +122,7 @@ export function* sendZippedFile({selectedFile, errorHandler, successHandler}) {
       yield errorHandler(errorMessage);
     }
 
-
+    
     console.log("Got decoded result", decodeURIComponent(result.response.metaEntity.htmlContent));
     yield [
       put({
@@ -150,6 +144,7 @@ export function* sendZippedFile({selectedFile, errorHandler, successHandler}) {
 
 export function* getDefaultBeeTemplates() {
   try {
+    
     const result = yield call(Api.getDefaultBeeTemplates);
     const edmTemplates = result.response;
     yield put({ type: types.GET_DEAFULT_BEE_TEMPLATES_SUCCESS, data: edmTemplates });
@@ -160,6 +155,7 @@ export function* getDefaultBeeTemplates() {
 
 export function* getTemplateDetails(id, channel) {
   try {
+    
     const result = yield call(Api.getTemplateDetails, id, channel);
     // const sidebar = result.response.sidebar;
     yield put({ type: types.GET_TEMPLATE_DETAILS_SUCCESS, data: result.response });
@@ -212,6 +208,7 @@ function* watchGetUserList() {
 }
 
 function* watchFetchWeCrmAccounts() {
+  
   const watcher = yield takeLatest(types.GET_WECRM_ACCOUNTS_REQUEST, fetchWeCrmAccounts);
   yield take(LOCATION_CHANGE);
   yield cancel(watcher);

package/v2Containers/Templates/tests/actions.test.js

@@ -11,9 +11,8 @@ describe("Test zalo list actions", () => {
     const expected = {
       type: types.GET_ALL_TEMPLATES_REQUEST,
       channel,
-      intlCopyOf: "test",
       queryParams,
     };
-    expect(getAllTemplates(channel, queryParams, "test")).toEqual(expected);
+    expect(getAllTemplates(channel, queryParams)).toEqual(expected);
   });
 });

package/v2Containers/Templates/tests/mockData.js

@@ -55,10 +55,6 @@ export const getAllTemplatesListSuccess = {
           },
         },
         "type": "ZALO",
-  response: {
-    templates: [{name: '1', id: '2'}],
-        },
-        intlCopyOf: 'test',
 };
 
 export const getCdnTransformationConfigFailure = {

package/v2Containers/Templates/tests/sagas.test.js

@@ -80,36 +80,14 @@ describe('watchForGetJourneyList saga', () => {
 describe('templateList saga', () => {
   it('handle valid response from api', () => {
     expectSaga(getAllTemplates, mockData.getAllTemplatesListSuccess)
-    .provide([
-      [
-        matchers.call.fn(api.getAllTemplates),
-        mockData.getAllTemplatesListSuccess,
-      ],
-    ]).put({
+      .provide([[matchers.call.fn(api.getAllTemplates, mockData.getAllTemplatesListSuccess)]])
+      .put({
         type: types.GET_ALL_TEMPLATES_SUCCESS,
-        data: mockData.getAllTemplatesListSuccess,
-        weCRMTemplate: mockData.getAllTemplatesListSuccess,
-        isReset: mockData.getAllTemplatesListSuccess?.queryParams?.page === 1,
+        res: mockData.getAllTemplatesListSuccess,
       })
       .run();
   });
 
-  it('handle valid response from api', () => {
-    mockData.getAllTemplatesListSuccess.intlCopyOf = '';
-    expectSaga(getAllTemplates, mockData.getAllTemplatesListSuccess)
-    .provide([
-      [
-        matchers.call.fn(api.getAllTemplates),
-        mockData.getAllTemplatesListSuccess,
-      ],
-    ]).put({
-        type: types.GET_ALL_TEMPLATES_SUCCESS,
-        data: mockData.getAllTemplatesListSuccess,
-        weCRMTemplate: mockData.getAllTemplatesListSuccess,
-        isReset: mockData.getAllTemplatesListSuccess?.queryParams?.page === 1,
-      })
-      .run();
-  });
   it('handles error thrown from api', () => {
     expectSaga(getAllTemplates, mockData.getAllTemplatesListFailure)
       .provide([

package/v2Components/CapTagList/style.scss

@@ -1,5 +0,0 @@
-@media (max-height: 25rem) {
-  .ant-tree.cap-tree-v2.ant-tree-icon-hide {
-    height: 8.5714rem;
-  }
-}

package/v2Containers/Zalo/tests/selectors.test.js

@@ -1,52 +0,0 @@
-import { fromJS } from "immutable";
-import { makeSelectZalo, selectZaloDomain } from "../selectors";
-import { zaloTemplateInfoData } from "./mockData";
-
-describe("makeSelectZalo", () => {
-  it("returns the expected object with default values when substate is empty", () => {
-    // Arrange
-    const state = fromJS({ zalo: {} });
-    const expected = {
-      zaloTemplateInfoStatus: undefined,
-      zaloTemplateInfoValue: undefined,
-      zaloTemplateInfoError: undefined,
-      zaloTemplatePreviewData: undefined,
-    };
-    const selector = makeSelectZalo();
-
-    // Act
-    const result = selector(state);
-
-    // Assert
-    expect(result).toEqual(expected);
-  });
-
-  it("returns the expected object when substate has values", () => {
-    // Arrange
-    const state = fromJS({
-      zalo: zaloTemplateInfoData,
-    });
-    const expected = {
-      zaloTemplateInfoStatus: "success",
-      zaloTemplateInfoValue: fromJS(zaloTemplateInfoData.zaloTemplateInfoValue),
-      zaloTemplateInfoError: null,
-      zaloTemplatePreviewData: undefined,
-    };
-    const selector = makeSelectZalo();
-
-    // Act
-    const result = selector(state);
-
-    // Assert
-    expect(result).toEqual(expected);
-  });
-
-  it("returns the expected object with default values when substate is empty", () => {
-    // Arrange
-    const state = fromJS({ zalo: {} });
-    const expected = fromJS({});
-    const result = selectZaloDomain(state);
-    // Assert
-    expect(result).toEqual(expected);
-  });
-});