@capillarytech/creatives-library 7.18.0-beta.0 → 8.0.0

package/v2Containers/Templates/messages.js

@@ -94,8 +94,8 @@ export default defineMessages({
     id: `${scope}.editButton`,
     defaultMessage: "Edit",
   },
-  "whatsappOverview": {
-    id: `${scope}.whatsappOverview`,
+  "overview": {
+    id: `${scope}.overview`,
     defaultMessage: "Overview",
   },
   "duplicateButton": {
@@ -126,6 +126,10 @@ export default defineMessages({
     id: `${scope}.noAccountsPresent`,
     defaultMessage: "Push notifications are not setup for your brand",
   },
+  "noAccountsPresentInApp": {
+    id: `${scope}.noAccountsPresentInApp`,
+    defaultMessage: "In app message are not setup for your brand",
+  },
   "noAccountsPresentWeChat": {
     id: `${scope}.noAccountsPresentWeChat`,
     defaultMessage: "Wechat accounts are not setup for your brand",
@@ -326,6 +330,10 @@ export default defineMessages({
     id: `${scope}.newWhatsappTemplate`,
     defaultMessage: 'Add new Whatsapp {template}',
   },
+  "newInAppMessageTemplate": {
+    id: `${scope}.newInAppMessageTemplate`,
+    defaultMessage: 'Add new In app message {template}',
+  },
   "newNotificationTemplate": {
     id: `${scope}.newNotificationTemplate`,
     defaultMessage: 'New notification {template}',
@@ -346,22 +354,38 @@ export default defineMessages({
     id: `${scope}.whatsappDescIllustration`,
     defaultMessage: 'These templates can be reused when creating a\nnew message content.',
   },
-  "noFilteredWhatsappTemplatesTitle": {
-    id: `${scope}.noFilteredWhatsappTemplatesTitle`,
+  "zaloTitleIllustration": {
+    id: `${scope}.zaloTitleIllustration`,
+    defaultMessage: 'There are no approved templates available',
+  },
+  "zaloDescIllustration": {
+    id: `${scope}.zaloDescIllustration`,
+    defaultMessage: 'You can create new templates on the Zalo platform and once they’re approved, you can view them here',
+  },
+  "noFilteredWhatsappZaloTemplatesTitle": {
+    id: `${scope}.noFilteredWhatsappZaloTemplatesTitle`,
     defaultMessage: 'Sorry, we couldn’t find any matches',
   },
-  "noFilteredWhatsappTemplatesDesc": {
-    id: `${scope}.noFilteredWhatsappTemplatesDesc`,
+  "noFilteredWhatsappZaloTemplatesDesc": {
+    id: `${scope}.noFilteredWhatsappZaloTemplatesDesc`,
     defaultMessage: 'Please try searching with another term or apply different filter',
   },
-  "noApprovedWhatsappTemplatesTitle": {
-    id: `${scope}.noApprovedWhatsappTemplatesTitle`,
+  "noApprovedWhatsappZaloTemplatesTitle": {
+    id: `${scope}.noApprovedWhatsappZaloTemplatesTitle`,
     defaultMessage: 'Sorry, we couldn’t find any approved templates',
   },
   "noApprovedWhatsappTemplatesDesc": {
     id: `${scope}.noApprovedWhatsappTemplatesDesc`,
     defaultMessage: 'Please try creating a new template, once it is approved by Whatsapp it will be available here',
   },
+  "inAppTitleIllustration": {
+    id: `${scope}.inAppTitleIllustration`,
+    defaultMessage: 'There are no templates available',
+  },
+  "inAppDescIllustration": {
+    id: `${scope}.inAppDescIllustration`,
+    defaultMessage: 'You can create new templates on the In app message platform and once they’re created successfully, you can view them here',
+  },
   "smsTitleIllustartion": {
     id: `${scope}.smsTitleIllustartion`,
     defaultMessage: 'Create an SMS {template}',
@@ -386,6 +410,10 @@ export default defineMessages({
     id: `${scope}.mobilepushAccount`,
     defaultMessage: 'Mobilepush account',
   },
+  "inappAccount": {
+    id: `${scope}.inappAccount`,
+    defaultMessage: 'In app message account',
+  },
   "lineAccount": {
     id: `${scope}.lineAccount`,
     defaultMessage: 'Line account',
@@ -394,6 +422,10 @@ export default defineMessages({
     id: `${scope}.whatsappAccount`,
     defaultMessage: 'Whatsapp account',
   },
+  "zaloAccount": {
+    id: `${scope}.zaloAccount`,
+    defaultMessage: 'Zalo account',
+  },
   "all": {
     id: `${scope}.all`,
     defaultMessage: 'All',
@@ -422,6 +454,10 @@ export default defineMessages({
     id: `${scope}.noAccountsPresentFacebook`,
     defaultMessage: "Please setup the Facebook account & Facebook page to start creating content in Capillary's FB content creator.",
   },
+  "noAccountsPresentZalo": {
+    id: `${scope}.noAccountsPresentZalo`,
+    defaultMessage: "Zalo accounts are not setup for your brand",
+  },
   "promotional": {
     id: `${scope}.promotional`,
     defaultMessage: 'Promotional',
@@ -482,4 +518,12 @@ export default defineMessages({
     id: `${scope}.copyOf`,
     defaultMessage: 'Copy of',
   },
+  "zaloPreview": {
+    id: `${scope}.zaloPreview`,
+    defaultMessage: 'Open preview in new tab',
+  },
+  "zaloOnlyApprovedTemplates": {
+    id: `${scope}.zaloOnlyApprovedTemplates`,
+    defaultMessage: 'Only enabled/approved templates are shown here',
+  },
 });

package/v2Containers/Templates/reducer.js

@@ -7,7 +7,7 @@
 import { fromJS } from 'immutable';
 import * as types from './constants';
 
-const initialState = fromJS({
+export const initialState = fromJS({
   getAllTemplatesInProgress: false,
   fetchedOrgLevelCampaignSettings: true,
   templates: [],
@@ -88,6 +88,8 @@ function templatesReducer(state = initialState, action) {
       return state.set('selectedViberAccount', fromJS(action.viberAccount));
     case types.SET_WHATSAPP_ACCOUNT:
       return state.set('selectedWhatsappAccount', fromJS(action.account));
+    case types.SET_ZALO_ACCOUNT:
+      return state.set('selectedZaloAccount', fromJS(action.account));
     case types.SET_RCS_ACCOUNT:
       return state.set('selectedRcsAccount', fromJS(action.account));
     case types.SET_FACEBOOK_ACCOUNT:

package/v2Containers/Templates/sagas.js

@@ -1,10 +1,10 @@
-import { call, put, takeLatest, take, cancel, select } from 'redux-saga/effects';
-import { LOCATION_CHANGE } from 'react-router-redux';
+import get from 'lodash/get';
+import { call, put, takeLatest, select, all } from 'redux-saga/effects';
 // import { schema, normalize } from 'normalizr';
 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 });
@@ -102,14 +109,13 @@ export function* getCdnTransformationConfig() {
 }
 
 export function* watchGetOrgLevelCampaignSettings() {
-  const watcher = yield takeLatest(
+  yield takeLatest(
     types.GET_ORG_LEVEL_CAMPAIGN_SETTINGS_REQUEST,
     getOrgLevelCampaignSettings,
   );
-  yield take(LOCATION_CHANGE);
   const store = yield select();
   if (!store.getIn(['router', 'location', 'pathname']).includes('/settings/')) {
-    yield cancel(watcher);
+    
   }
 }
 
@@ -121,9 +127,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 +148,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 +158,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 });
@@ -173,7 +175,7 @@ export function* getSenderDetails({
     if (!apiResponse?.errors?.length) {
       yield put({
         type: types.GET_SENDER_DETAILS_SUCCESS,
-        payload: apiResponse?.entity?.WHATSAPP[0]?.domainProperties?.hostName || '',
+        payload: get(apiResponse, `entity.${channel}[0].domainProperties.hostName`, ''),
       });
     } else {
       yield put({
@@ -189,53 +191,52 @@ export function* getSenderDetails({
   }
 }
 
-function* watchGetAllTemplates() {
-  const watcher = yield takeLatest(types.GET_ALL_TEMPLATES_REQUEST, getAllTemplates);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+export function* watchGetAllTemplates() {
+  yield takeLatest(types.GET_ALL_TEMPLATES_REQUEST, getAllTemplates);
+  
+  
 }
 
 function* watchDeleteTemplate() {
-  const watcher = yield takeLatest(types.DELETE_TEMPLATE_REQUEST, deleteTemplate);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.DELETE_TEMPLATE_REQUEST, deleteTemplate);
+  
+  
 }
 
 function* watchGetUserList() {
-  const watcher = yield takeLatest(types.GET_USER_LIST_REQUEST, fetchUserList);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.GET_USER_LIST_REQUEST, fetchUserList);
+  
+  
 }
 
 function* watchFetchWeCrmAccounts() {
+  yield takeLatest(types.GET_WECRM_ACCOUNTS_REQUEST, fetchWeCrmAccounts);
+  
   
-  const watcher = yield takeLatest(types.GET_WECRM_ACCOUNTS_REQUEST, fetchWeCrmAccounts);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
 }
 
 function* watchSendingFile() {
-  const watcher = yield takeLatest(types.SEND_ZIPPED_FILE_REQUEST, sendZippedFile);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.SEND_ZIPPED_FILE_REQUEST, sendZippedFile);
+  
+  
 }
 
 function* watchGetDefaultBeeTemplates() {
-  const watcher = yield takeLatest(types.GET_DEAFULT_BEE_TEMPLATES_REQUEST, getDefaultBeeTemplates);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.GET_DEAFULT_BEE_TEMPLATES_REQUEST, getDefaultBeeTemplates);
+  
+  
 }
 
 function* watchGetTemplateDetails() {
-  const watcher = yield takeLatest(types.GET_TEMPLATE_DETAILS_REQUEST, getTemplateDetails);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.GET_TEMPLATE_DETAILS_REQUEST, getTemplateDetails);
+  
+  
 }
 
 function* watchGetSenderDetails() {
-  const watcher = yield takeLatest(types.GET_SENDER_DETAILS_REQUEST, getSenderDetails);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.GET_SENDER_DETAILS_REQUEST, getSenderDetails);
+  
+  
 }
 
 export function* watchGetCdnTransformationConfig() {
@@ -256,5 +257,20 @@ export default [
   watchGetTemplateDetails,
   watchGetOrgLevelCampaignSettings,
   watchGetSenderDetails,
-  watchGetCdnTransformationConfig
+  watchGetCdnTransformationConfig,
 ];
+
+export function* v2TemplateSaga() {
+  yield all([
+    watchGetAllTemplates(),
+    watchDeleteTemplate(),
+    watchGetUserList(),
+    watchFetchWeCrmAccounts(),
+    watchSendingFile(),
+    watchGetDefaultBeeTemplates(),
+    watchGetTemplateDetails(),
+    watchGetOrgLevelCampaignSettings(),
+    watchGetSenderDetails(),
+    watchGetCdnTransformationConfig(),
+  ]);
+}