@capillarytech/creatives-library 7.17.47 → 7.17.48

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) {
+export function getAllTemplates(channel, queryParams, intlCopyOf = '') {
   return {
-    type: types.GET_ALL_TEMPLATES_REQUEST, channel, queryParams,
+    type: types.GET_ALL_TEMPLATES_REQUEST, channel, queryParams, intlCopyOf,
   };
 }
 

package/v2Containers/Templates/index.js

@@ -93,7 +93,8 @@ import {
   FACEBOOK as FACEBOOK_CHANNEL,
   CREATE,
 } from '../App/constants';
-import { MAX_WHATSAPP_TEMPLATES, WARNING_WHATSAPP_TEMPLATES } from './constants';
+import {MAX_WHATSAPP_TEMPLATES, WARNING_WHATSAPP_TEMPLATES } from './constants';
+import { COPY_OF } from '../../containers/App/constants';
 import {
   TWILIO_CATEGORY_OPTIONS,
   KARIX_GUPSHUP_CATEGORY_OPTIONS,
@@ -309,6 +310,7 @@ 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();
     }
@@ -334,7 +336,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);
+      this.props.actions.getAllTemplates(channel, queryParams,`${formatMessage(globalMessages.copyOf)}`);
     }
 
     window.addEventListener("message", this.handleFrameTasks);
@@ -757,6 +759,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     if ((this.state.channel || '').toLowerCase() === "sms" && isTraiDltFeature) {
       queryParams.traiEnable = true;
     }
+    const copyOf = this.props?.intl?.formatMessage(globalMessages.copyOf);
     if (resetTemplates) {
       if(this.state.channel.toLowerCase() !== ZALO_LOWERCASE) {
         queryParams.name = this.state.searchText;
@@ -770,7 +773,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.actions.getAllTemplates(channel, queryParams,`${copyOf}`);
     } else if ((resetPage || (page === 1 && this.state.templatesCount === 0) || page <= (this.state.templatesCount / this.state.perPageLimit))) {
       if (getNextPage) {
         page += 1;
@@ -812,7 +815,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.actions.getAllTemplates(channel, queryParams, `${copyOf}`);
       });
     }
   };
@@ -1756,7 +1759,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
 
   duplicateTemplate(template) {
     const duplicateObj = cloneDeep(template);
-    duplicateObj.name = `${this.props.intl.formatMessage(globalMessages.copyOf)} ${template?.name} ${moment().format('MM-DD-YYYY HH:mm:ss')}`;
+    duplicateObj.name = `${COPY_OF} ${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,7 +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';
-
+import { COPY_OF } from '../../containers/App/constants';
 // Individual exports for testing
 export function* getAllTemplates(channel, queryParams) {
   try {
@@ -20,6 +20,13 @@ 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(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 });
@@ -121,9 +128,7 @@ export function* sendZippedFile({selectedFile, errorHandler, successHandler}) {
       errorMessage = result.message;
       yield errorHandler(errorMessage);
     }
-
-    
-    console.log("Got decoded result", decodeURIComponent(result.response.metaEntity.htmlContent));
+ 
     yield [
       put({
         type: types.SEND_ZIPPED_FILE_SUCCESS,
@@ -144,7 +149,6 @@ 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 });
@@ -155,7 +159,6 @@ 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 });
@@ -208,7 +211,6 @@ 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/__snapshots__/index.test.js.snap

@@ -430,7 +430,7 @@ exports[`Test Templates container Should render temlates when Zalo templates are
         size="size-r"
         width={60}
       />
-      <InjectIntl(Wrapper)
+      <Wrapper
         centered={true}
         className="delete-template-confirm"
         closeText="Cancel"
@@ -441,7 +441,7 @@ exports[`Test Templates container Should render temlates when Zalo templates are
         visible={false}
       >
         Are you sure you wish to delete this template?
-      </InjectIntl(Wrapper)>
+      </Wrapper>
     </CapRow>
   </div>
 </Fragment>
@@ -668,7 +668,7 @@ exports[`Test Templates container Should render temlates when whatsapp templates
         size="size-r"
         width={60}
       />
-      <InjectIntl(Wrapper)
+      <Wrapper
         centered={true}
         className="delete-template-confirm"
         closeText="Cancel"
@@ -679,7 +679,7 @@ exports[`Test Templates container Should render temlates when whatsapp templates
         visible={false}
       >
         Are you sure you wish to delete this template?
-      </InjectIntl(Wrapper)>
+      </Wrapper>
     </CapRow>
   </div>
 </Fragment>
@@ -962,7 +962,7 @@ exports[`Test Templates container Should render temlates when whatsapp templates
         size="size-r"
         width={60}
       />
-      <InjectIntl(Wrapper)
+      <Wrapper
         centered={true}
         className="delete-template-confirm"
         closeText="Cancel"
@@ -973,7 +973,7 @@ exports[`Test Templates container Should render temlates when whatsapp templates
         visible={false}
       >
         Are you sure you wish to delete this template?
-      </InjectIntl(Wrapper)>
+      </Wrapper>
     </CapRow>
   </div>
 </Fragment>
@@ -1119,7 +1119,7 @@ exports[`Test Templates container Should render temlates when zalo templates are
         size="size-r"
         width={60}
       />
-      <InjectIntl(Wrapper)
+      <Wrapper
         centered={true}
         className="delete-template-confirm"
         closeText="Cancel"
@@ -1130,7 +1130,7 @@ exports[`Test Templates container Should render temlates when zalo templates are
         visible={false}
       >
         Are you sure you wish to delete this template?
-      </InjectIntl(Wrapper)>
+      </Wrapper>
     </CapRow>
   </div>
 </Fragment>
@@ -1592,7 +1592,7 @@ Click {{3}} to unsubscribe",
         size="size-r"
         width={60}
       />
-      <InjectIntl(Wrapper)
+      <Wrapper
         centered={true}
         className="delete-template-confirm"
         closeText="Cancel"
@@ -1603,7 +1603,7 @@ Click {{3}} to unsubscribe",
         visible={false}
       >
         Are you sure you wish to delete this template?
-      </InjectIntl(Wrapper)>
+      </Wrapper>
     </CapRow>
   </div>
 </Fragment>
@@ -2033,7 +2033,7 @@ Click {{3}} to unsubscribe",
         size="size-r"
         width={60}
       />
-      <InjectIntl(Wrapper)
+      <Wrapper
         centered={true}
         className="delete-template-confirm"
         closeText="Cancel"
@@ -2044,7 +2044,7 @@ Click {{3}} to unsubscribe",
         visible={false}
       >
         Are you sure you wish to delete this template?
-      </InjectIntl(Wrapper)>
+      </Wrapper>
     </CapRow>
   </div>
 </Fragment>
@@ -2474,7 +2474,7 @@ Click {{3}} to unsubscribe",
         size="size-r"
         width={60}
       />
-      <InjectIntl(Wrapper)
+      <Wrapper
         centered={true}
         className="delete-template-confirm"
         closeText="Cancel"
@@ -2485,7 +2485,7 @@ Click {{3}} to unsubscribe",
         visible={false}
       >
         Are you sure you wish to delete this template?
-      </InjectIntl(Wrapper)>
+      </Wrapper>
     </CapRow>
   </div>
 </Fragment>
@@ -2738,7 +2738,7 @@ exports[`Test Templates container Test removing all whatsapp filterss 1`] = `
         size="size-r"
         width={60}
       />
-      <InjectIntl(Wrapper)
+      <Wrapper
         centered={true}
         className="delete-template-confirm"
         closeText="Cancel"
@@ -2749,7 +2749,7 @@ exports[`Test Templates container Test removing all whatsapp filterss 1`] = `
         visible={false}
       >
         Are you sure you wish to delete this template?
-      </InjectIntl(Wrapper)>
+      </Wrapper>
     </CapRow>
   </div>
 </Fragment>
@@ -2976,7 +2976,7 @@ exports[`Test Templates container Test removing all whatsapp filterss 2`] = `
         size="size-r"
         width={60}
       />
-      <InjectIntl(Wrapper)
+      <Wrapper
         centered={true}
         className="delete-template-confirm"
         closeText="Cancel"
@@ -2987,7 +2987,7 @@ exports[`Test Templates container Test removing all whatsapp filterss 2`] = `
         visible={false}
       >
         Are you sure you wish to delete this template?
-      </InjectIntl(Wrapper)>
+      </Wrapper>
     </CapRow>
   </div>
 </Fragment>
@@ -3214,7 +3214,7 @@ exports[`Test Templates container Test removing single filter 1`] = `
         size="size-r"
         width={60}
       />
-      <InjectIntl(Wrapper)
+      <Wrapper
         centered={true}
         className="delete-template-confirm"
         closeText="Cancel"
@@ -3225,7 +3225,7 @@ exports[`Test Templates container Test removing single filter 1`] = `
         visible={false}
       >
         Are you sure you wish to delete this template?
-      </InjectIntl(Wrapper)>
+      </Wrapper>
     </CapRow>
   </div>
 </Fragment>

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

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

package/v2Containers/Templates/tests/mockData.js

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

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

@@ -80,14 +80,36 @@ 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,
-        res: mockData.getAllTemplatesListSuccess,
+        data: mockData.getAllTemplatesListSuccess,
+        weCRMTemplate: mockData.getAllTemplatesListSuccess,
+        isReset: mockData.getAllTemplatesListSuccess?.queryParams?.page === 1,
       })
       .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([