@capillarytech/creatives-library 8.0.255-alpha.4 → 8.0.255

package/v2Containers/Templates/messages.js

@@ -46,10 +46,6 @@ export default defineMessages({
     id: `${scope}.mobilepushHeader`,
     defaultMessage: `Mobile Push`,
   },
-  "webpushHeader": {
-    id: `${scope}.webpushHeader`,
-    defaultMessage: `Web Push`,
-  },
   "ebillHeader": {
     id: `${scope}.ebillHeader`,
     defaultMessage: `Ebill`,
@@ -346,10 +342,6 @@ export default defineMessages({
     id: `${scope}.newWhatsappTemplate`,
     defaultMessage: 'Add new Whatsapp {template}',
   },
-  "newWebPushTemplate": {
-    id: `${scope}.newWebPushTemplate`,
-    defaultMessage: 'Add new Web push {template}',
-  },
   "newInAppMessageTemplate": {
     id: `${scope}.newInAppMessageTemplate`,
     defaultMessage: 'Add new In app message {template}',
@@ -386,14 +378,6 @@ export default defineMessages({
     id: `${scope}.whatsappDescIllustration`,
     defaultMessage: 'These templates can be reused when creating a\nnew message content.',
   },
-  "webPushTitleIllustration": {
-    id: `${scope}.webPushTitleIllustration`,
-    defaultMessage: 'Add a new Web push creative {template}',
-  },
-  "webPushDescIllustration": {
-    id: `${scope}.webPushDescIllustration`,
-    defaultMessage: 'These templates can be reused when creating a new message content.',
-  },
   "whatsappAccountNotConfiguredTitle": {
     id: `${scope}.whatsappAccountNotConfiguredTitle`,
     defaultMessage: 'Whatsapp account is not configured',
@@ -478,10 +462,6 @@ export default defineMessages({
     id: `${scope}.zaloAccount`,
     defaultMessage: 'Zalo account',
   },
-  "webpushAccount": {
-    id: `${scope}.webpushAccount`,
-    defaultMessage: 'Web push account',
-  },
   "rcsAccount": {
     id: `${scope}.rcsAccount`,
     defaultMessage: 'RCS account',
@@ -518,10 +498,6 @@ export default defineMessages({
     id: `${scope}.noAccountsPresentZalo`,
     defaultMessage: "Zalo accounts are not setup for your brand",
   },
-  "noAccountsPresentWebpush": {
-    id: `${scope}.noAccountsPresentWebpush`,
-    defaultMessage: "Web push accounts are not setup for your brand",
-  },
   "noAccountsPresentRcs": {
     id: `${scope}.noAccountsPresentRcs`,
     defaultMessage: "RCS accounts are not setup for your brand",
@@ -558,6 +534,10 @@ export default defineMessages({
     id: `${scope}.rcsOnlyApprovedTemplates`,
     defaultMessage: 'Only "Approved" templates are available here, as you can use those templates to create a message.',
   },
+  "layout": {
+    id: `${scope}.layout`,
+    defaultMessage: `Layout`,
+  },
   "status": {
     id: `${scope}.status`,
     defaultMessage: 'Status',

package/v2Containers/Templates/reducer.js

@@ -124,8 +124,6 @@ function templatesReducer(state = initialState, action) {
       return state
         .set('selectedFacebookAccount', fromJS(action.faceBookAccount))
         .set('templates', []);
-    case types.SET_WEBPUSH_ACCOUNT:
-      return state.set('selectedWebPushAccount', fromJS(action.account));
     case types.RESET_ACCOUNT:
       return state
         .remove('selectedWeChatAccount')

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

@@ -22,7 +22,6 @@ describe('Test Templates container', () => {
   const getAllTemplates = jest.fn();
   const getUserList = jest.fn();
   const getSenderDetails = jest.fn();
-  const resetTemplate = jest.fn();
   let renderedComponent;
 
   beforeEach(() => {
@@ -55,7 +54,6 @@ describe('Test Templates container', () => {
           getAllTemplates,
           getUserList,
           getSenderDetails,
-          resetTemplate,
         }}
         location={{
           pathname: `/${channel}`,
@@ -81,8 +79,6 @@ describe('Test Templates container', () => {
       channel: 'WHATSAPP',
       orgUnitId: -1,
     });
-    // resetTemplate should be called when entering account selection mode
-    expect(resetTemplate).toHaveBeenCalled();
   });
 
   it('Should render temlates when whatsapp templates are passed', () => {
@@ -107,8 +103,6 @@ describe('Test Templates container', () => {
       Templates: {},
     });
     expect(renderedComponent).toMatchSnapshot();
-    // SMS doesn't enter account selection mode, so resetTemplate shouldn't be called on mount
-    expect(resetTemplate).not.toHaveBeenCalled();
   });
 
   it('Should render temlates when whatsapp templates are passed in full mode', () => {
@@ -129,8 +123,6 @@ describe('Test Templates container', () => {
   it('Should render correct component for zalo channel', () => {
     RenderFunctionFor('zalo');
     expect(renderedComponent).toMatchSnapshot();
-    // resetTemplate should be called when entering account selection mode
-    expect(resetTemplate).toHaveBeenCalled();
   });
   it('Should render temlates when zalo templates are passed', () => {
     RenderFunctionFor('zalo');
@@ -209,8 +201,6 @@ describe('Test Templates container', () => {
       channel: 'RCS',
       orgUnitId: -1,
     });
-    // resetTemplate should be called when entering account selection mode
-    expect(resetTemplate).toHaveBeenCalled();
   });
 
   it('Should render templates when RCS templates are passed', () => {

package/v2Containers/TemplatesV2/index.js

@@ -30,11 +30,11 @@ import FTP from '../FTP';
 import Gallery from '../Assets/Gallery';
 import withStyles from '../../hoc/withStyles';
 import styles, { CapTabStyle } from './TemplatesV2.style';
-import { CREATIVES_UI_VIEW, LOYALTY, WHATSAPP, RCS, LINE, EMAIL, ASSETS, JP_LOCALE_HIDE_FEATURE, ZALO, INAPP, WEBPUSH } from '../App/constants';
+import { CREATIVES_UI_VIEW, LOYALTY, WHATSAPP, RCS, LINE, EMAIL, ASSETS, JP_LOCALE_HIDE_FEATURE, ZALO, INAPP } from '../App/constants';
 import AccessForbidden from '../../v2Components/AccessForbidden';
 import { getObjFromQueryParams } from '../../utils/v2common';
 import { makeSelectAuthenticated, selectCurrentOrgDetails } from "../../v2Containers/Cap/selectors";
-import { LOYALTY_SUPPORTED_ACTION, COMMON_CHANNELS } from "../CreativesContainer/constants";
+import { LOYALTY_SUPPORTED_ACTION } from "../CreativesContainer/constants";
 
 const {CapCustomCardList} = CapCustomCard;
 
@@ -65,13 +65,6 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
       email: {content: <></>, tab: intl.formatMessage(messages.email), key: 'email'},
       //'wechat': {content: this.getTemplatesComponent('wechat'), tab: 'Wechat', key: 'wechat'},
       mPush: {content: <></>, tab: intl.formatMessage(messages.pushNotification), key: 'mobilepush'},
-      ...(commonUtil.hasWebPushFeatureEnabled() ? {
-        webpush: {
-          content: <div></div>,
-          tab: intl.formatMessage(messages.webPush),
-          key: WEBPUSH,
-        }
-      } : {}),
       viber: {content: <></>, tab: intl.formatMessage(messages.viber), key: 'viber'},
       whatsapp: { content: <></>, tab: intl.formatMessage(messages.whatsapp), key: WHATSAPP },
       zalo: { content: <div></div>, tab: intl.formatMessage(messages.zalo), key: ZALO },
@@ -95,7 +88,7 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
         return obj;
       }, []);
 
-      if (isFullMode ) {
+    if (isFullMode ) {
       filteredPanes.push({content: <div></div>, tab: intl.formatMessage(messages.gallery), key: 'assets'});
     } else {
       if (!channelsToHide.includes('callTask')) {
@@ -105,19 +98,18 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
         filteredPanes.push({content: <></>, tab: intl.formatMessage(messages.FTP), key: 'ftp'});
         defaultChannel = 'FTP';
       }
+      const commonChannels = ['sms', 'email', 'wechat', 'mobilepush', 'line', 'viber', 'facebook', 'call_task', 'ftp', 'assets'];
 
-      // Create a local copy of COMMON_CHANNELS to avoid mutating the imported array
-      const channels = [...COMMON_CHANNELS];
       const { actionName = ''} = loyaltyMetaData;
       if (isLoyaltyModule && actionName === LOYALTY_SUPPORTED_ACTION) {
-        channels.push(WHATSAPP, ZALO);
+        commonChannels.push(WHATSAPP, ZALO);
       }
 
-      // we only show channels which other than COMMON_CHANNELS
+      // we only show channels which other than commonChannels
       // if it is coming in enableNewChannels array
       filteredPanes = filteredPanes.filter((item) => {
         const channel = item.key;
-        if (!channels.includes(channel)) {
+        if (!commonChannels.includes(channel)) {
           return enableNewChannels.includes(channel.toUpperCase());
         }
         return true;

package/v2Containers/TemplatesV2/messages.js

@@ -86,8 +86,4 @@ export default defineMessages({
     id: `creatives.containersV2.TemplatesV2.inapp`,
     defaultMessage: 'In app message',
   },
-  webPush: {
-    id: `creatives.containersV2.TemplatesV2.webPush`,
-    defaultMessage: 'Web Push',
-  },
 });