@capillarytech/creatives-library 8.0.345-alpha.12 → 8.0.345-alpha.14

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

@@ -173,35 +173,19 @@ describe('Test SlideBoxContent container', () => {
     expect(getCreativesData).toHaveBeenCalledWith({ channel: 'RCS' });
   });
 
-  it('RCS getFormData mirrors smsFallBackContent onto templateData for library round-trip', async () => {
-    renderedComponent = shallowWithIntl(
-      <Creatives
-        loyaltyMetaData={loyaltyMetaData}
-        Templates={rcsTemplates}
-        channel="RCS"
-        slidBoxContent="editTemplate"
-        templateData={rcsEditTemplateData}
-        handleCloseCreatives={handleCloseCreatives}
-        getCreativesData={getCreativesData}
-        isFullMode={false}
-        templateActions={{
-          getCdnTransformationConfig,
-        }}
-      />,
-    );
+  it('RCS getFormData does not attach smsFallBackContent to templateData', async () => {
+    renderFunction('RCS', 'editTemplate', rcsTemplates, rcsEditTemplateData);
     renderedComponent.instance().onEditTemplate();
 
     const mockValue = {
-      validity: true,
       value: {
         name: 'rcs_creative_name',
-        type: 'RCS',
         versions: {
           base: {
             content: {
               RCS: {
                 rcsContent: { contentType: 'RICHCARD', cardType: 'STANDALONE', cardSettings: {}, cardContent: [{}] },
-                smsFallBackContent: { message: 'fallback-body' },
+                smsFallBackContent: { message: 'should-not-be-copied' },
               },
             },
           },
@@ -209,62 +193,16 @@ describe('Test SlideBoxContent container', () => {
       },
     };
 
-    // Call getFormData on the container instance — shallow CapSlideBox `content` shape can differ across wrappers
-    renderedComponent.instance().getFormData(mockValue);
+    renderedComponent
+      .find('CapSlideBox')
+      .props()
+      .content.props.getFormData(mockValue);
     await tick();
 
     const instance = renderedComponent.instance();
     expect(instance.state.templateData).toBeDefined();
-    expect(instance.state.templateData.smsFallBackContent).toEqual({ message: 'fallback-body' });
-  });
-
-  it('RCS getFormData mirrors rcsCardVarMapped onto templateData for campaign reopen', async () => {
-    renderedComponent = shallowWithIntl(
-      <Creatives
-        loyaltyMetaData={loyaltyMetaData}
-        Templates={rcsTemplates}
-        channel="RCS"
-        slidBoxContent="editTemplate"
-        templateData={rcsEditTemplateData}
-        handleCloseCreatives={handleCloseCreatives}
-        getCreativesData={getCreativesData}
-        isFullMode={false}
-        templateActions={{
-          getCdnTransformationConfig,
-        }}
-      />,
-    );
-    renderedComponent.instance().onEditTemplate();
-
-    const cardVarMapped = { 1: '[Name]', user_name: '[Name]' };
-    const mockValue = {
-      validity: true,
-      value: {
-        name: 'rcs_creative_name',
-        type: 'RCS',
-        versions: {
-          base: {
-            content: {
-              RCS: {
-                rcsContent: {
-                  contentType: 'RICHCARD',
-                  cardType: 'STANDALONE',
-                  cardSettings: {},
-                  cardContent: [{ title: 'Hi {{user_name}}', cardVarMapped }],
-                },
-                smsFallBackContent: {},
-              },
-            },
-          },
-        },
-      },
-    };
-
-    renderedComponent.instance().getFormData(mockValue);
-    await tick();
-
-    const instance = renderedComponent.instance();
-    expect(instance.state.templateData.rcsCardVarMapped).toEqual(cardVarMapped);
+    // sms fallback content should not be set on templateData per current logic
+    expect(instance.state.templateData.smsFallBackContent).toBeUndefined();
   });
 
   it('Text getCreatives data for rcs, data from creatives done to campaigns', async () => {

package/v2Containers/Email/reducer.js

@@ -12,6 +12,8 @@ const initialState = fromJS({
   createTemplateInProgress: false,
   createResponse: {},
   isBeeEnabled: null,
+  fetchingCmsAccounts: false,
+  cmsAccountsLoaded: false,
 });
 
 function emailReducer(state = initialState, action) {
@@ -110,13 +112,19 @@ function emailReducer(state = initialState, action) {
         .set('fetchingCmsDataFailed', true);
     case types.GET_CMS_ACCOUNTS_REQUEST:
       return state
-        .set('isBeeEnabled', false); // default to false
+        .set('isBeeEnabled', false)
+        .set('fetchingCmsAccounts', true)
+        .set('cmsAccountsLoaded', false);
     case types.GET_CMS_ACCOUNTS_SUCCESS:
       return state
-        .set('isBeeEnabled', action.isBeeEnabled);
+        .set('isBeeEnabled', action.isBeeEnabled)
+        .set('fetchingCmsAccounts', false)
+        .set('cmsAccountsLoaded', true);
     case types.GET_CMS_ACCOUNTS_FAILURE:
       return state
-        .set('isBeeEnabled', false);
+        .set('isBeeEnabled', false)
+        .set('fetchingCmsAccounts', false)
+        .set('cmsAccountsLoaded', true);
     case types.CLEAR_EMAIL_CRUD_RESPONSE_REQUEST:
       return state
         .set('createResponse', fromJS({}));

package/v2Containers/Email/sagas.js

@@ -1,5 +1,5 @@
 import {
-  call, put, takeLatest, takeEvery, all,
+  call, put, takeLatest, takeEvery, all, select, take,
 } from 'redux-saga/effects';
 import CapNotification from '@capillarytech/cap-ui-library/CapNotification';
 import * as Api from '../../services/api';
@@ -103,13 +103,17 @@ export function* getAllAssets(assetType, queryParams) {
 }
 
 export function* getCmsSetting({
-  cmsType, projectId, cmsMode, langId, isEdmSupport, isBEEAppEnable,
+  cmsType, projectId, cmsMode, langId, isEdmSupport,
 }) {
   try {
+    const emailState = yield select((state) => state.get('email'));
+    if (!emailState.get('cmsAccountsLoaded')) {
+      yield take([types.GET_CMS_ACCOUNTS_SUCCESS, types.GET_CMS_ACCOUNTS_FAILURE]);
+    }
+    const updatedState = yield select((state) => state.get('email'));
+    const isBEEAppEnable = updatedState.get('isBeeEnabled');
+
     const result = yield call(Api.getCmsTemplateSettingsV2, cmsType, projectId, cmsMode, langId, isEdmSupport, isBEEAppEnable);
-    const cmsAccountDetail = result.data?.response.cmsDetails || {};
-    const isBeeEnabled = cmsAccountDetail?.type === cmsType;
-    yield put({ type: types.GET_CMS_ACCOUNTS_SUCCESS, isBeeEnabled });
     yield put({ type: types.GET_CMS_EDITOR_DETAILS_SUCCESS, settings: result.data.response.cmsDetails });
   } catch (error) {
     yield put({ type: types.GET_CMS_EDITOR_DETAILS_FAILURE, error });

package/v2Containers/Email/tests/__snapshots__/reducer.test.js.snap

@@ -5,6 +5,8 @@ Immutable.Map {
   "createTemplateInProgress": false,
   "createResponse": Immutable.Map {},
   "isBeeEnabled": null,
+  "fetchingCmsAccounts": false,
+  "cmsAccountsLoaded": false,
 }
 `;
 
@@ -13,5 +15,7 @@ Immutable.Map {
   "createTemplateInProgress": true,
   "createResponse": Immutable.Map {},
   "isBeeEnabled": null,
+  "fetchingCmsAccounts": false,
+  "cmsAccountsLoaded": false,
 }
 `;

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

@@ -3,6 +3,7 @@ import { expectSaga } from 'redux-saga-test-plan';
 import { takeLatest } from 'redux-saga/effects';
 import * as matchers from 'redux-saga-test-plan/matchers';
 import { throwError } from 'redux-saga-test-plan/providers';
+import { fromJS } from 'immutable';
 import * as types from '../constants';
 import * as sagas from '../sagas';
 import { v2EmailDuplicateTemplateSaga, v2EmailSagas } from '../sagas';
@@ -709,9 +710,13 @@ describe('getCmsSetting saga', () => {
 
     return expectSaga(sagas.getCmsSetting, basePayload)
       .provide([
+        {
+          select(effect, next) {
+            return fromJS({ cmsAccountsLoaded: true, isBeeEnabled: true });
+          },
+        },
         [matchers.call.fn(Api.getCmsTemplateSettingsV2), fakeResponse],
       ])
-      .put({ type: types.GET_CMS_ACCOUNTS_SUCCESS, isBeeEnabled: true })
       .put({ type: types.GET_CMS_EDITOR_DETAILS_SUCCESS, settings: fakeResponse.data.response.cmsDetails })
       .run();
   });
@@ -727,9 +732,13 @@ describe('getCmsSetting saga', () => {
 
     return expectSaga(sagas.getCmsSetting, basePayload)
       .provide([
+        {
+          select(effect, next) {
+            return fromJS({ cmsAccountsLoaded: true, isBeeEnabled: false });
+          },
+        },
         [matchers.call.fn(Api.getCmsTemplateSettingsV2), fakeResponse],
       ])
-      .put({ type: types.GET_CMS_ACCOUNTS_SUCCESS, isBeeEnabled: false })
       .put({ type: types.GET_CMS_EDITOR_DETAILS_SUCCESS, settings: fakeResponse.data.response.cmsDetails })
       .run();
   });
@@ -743,9 +752,13 @@ describe('getCmsSetting saga', () => {
 
     return expectSaga(sagas.getCmsSetting, basePayload)
       .provide([
+        {
+          select(effect, next) {
+            return fromJS({ cmsAccountsLoaded: true, isBeeEnabled: false });
+          },
+        },
         [matchers.call.fn(Api.getCmsTemplateSettingsV2), fakeResponse],
       ])
-      .put({ type: types.GET_CMS_ACCOUNTS_SUCCESS, isBeeEnabled: false })
       .put({ type: types.GET_CMS_EDITOR_DETAILS_SUCCESS, settings: undefined })
       .run();
   });
@@ -755,6 +768,11 @@ describe('getCmsSetting saga', () => {
 
     return expectSaga(sagas.getCmsSetting, basePayload)
       .provide([
+        {
+          select(effect, next) {
+            return fromJS({ cmsAccountsLoaded: true, isBeeEnabled: true });
+          },
+        },
         [matchers.call.fn(Api.getCmsTemplateSettingsV2), throwError(fakeError)],
       ])
       .put({ type: types.GET_CMS_EDITOR_DETAILS_FAILURE, error: fakeError })

package/v2Containers/Rcs/constants.js

@@ -34,32 +34,18 @@ export const RCS_STATUSES = {
   awaitingApproval: 'awaitingApproval',
 };
 
-export const HOST_ICS="rcsicsbulk";
-export const HOST_INFOBIP="rcsinfobipbulk";
-
 export const contentType = {
   text_message: 'text_message',
   rich_card: 'rich_card',
   carousel: 'carousel',
 };
 
-export const CHANNELS = [
-  'email',
-  'mPush',
-  'viber',
-  'whatsapp',
-  'zalo',
-  'facebook',
-  'rcs',
-  'inApp',
-  'line',
-  'weChat',
-  'callTask',
-  'FTP',
-  'webpush',
-];
-
 export const STATUS_OPTIONS = [
+  // {
+  //   key: 'created',
+  //   value: RCS_STATUSES.awaitingApproval,
+  //   label: <FormattedMessage {...messages.created} />,
+  // },
   {
     key: 'approved',
     value: RCS_STATUSES.approved,
@@ -88,31 +74,10 @@ export const RCS_MEDIA_TYPES = {
   VIDEO: 'VIDEO',
 };
 
-/** Match `{{…}}` placeholders including Liquid-style names (e.g. `tag.FORMAT_1`). Must align with split + `isAnyTemplateVarToken` / SMS fallback. */
-export const rcsVarRegex = /\{\{[^}]+\}\}/g;
-/** True when the whole string is a single RCS/mustache token (used when testing segment tokens). */
-export const rcsVarTestRegex = /^\{\{[^}]+\}\}$/;
-
-/** Matches all `{{N}}` numeric-index variable tokens in a template string (global). */
-export const RCS_NUMERIC_VAR_TOKEN_REGEX = /\{\{(\d+)\}\}/g;
-/** `cardVarMapped` slot keys that are numeric only (legacy ordering). */
-export const RCS_NUMERIC_VAR_NAME_REGEX = /^\d+$/;
-/** Semantic Liquid-style keys on RCS `cardVarMapped` (same class as `{{…}}` inner names in the editor). */
-export const RCS_CARD_VAR_MAPPED_SEMANTIC_KEY_REGEX = /^[\w.]+$/;
-/** Escape `RegExp` metacharacters when building a pattern from user/tag text. */
-export const RCS_REGEX_META_CHARS_PATTERN = /[.*+?^${}()|[\]\\]/g;
-/** Entire string is a single `{{tag}}` token (value still a placeholder). */
-export const RCS_SINGLE_MUSTACHE_PLACEHOLDER_REGEX = /^\{\{[^}]+\}\}$/;
-/** Strip leading `{{` and trailing `}}` from a token. */
-export const RCS_STRIP_MUSTACHE_DELIMITERS_REGEX = /^\{\{|\}\}$/g;
-
-/** Tag-popover target: title vs description field (matches `onTagSelect` `field` argument). */
-export const RCS_TAG_AREA_FIELD_TITLE = 'title';
-export const RCS_TAG_AREA_FIELD_DESC = 'desc';
-
+export const rcsVarRegex = /\{\{\w+\}\}/g;
+export const rcsVarTestRegex = /\{\{\w+\}\}/;
 export const TEMPLATE_DESC_MAX_LENGTH = 2500;
-/** Resolved SMS fallback body cap. Must allow multi-segment DLT (>160); aligns with TRAI / `TEMPLATE_MESSAGE_MAX_LENGTH`. */
-export const FALLBACK_MESSAGE_MAX_LENGTH = TEMPLATE_MESSAGE_MAX_LENGTH;
+export const FALLBACK_MESSAGE_MAX_LENGTH = 160;
 export const TEMPLATE_TITLE_MAX_LENGTH = 200;
 export const TEMPLATE_BUTTON_TEXT_MAX_LENGTH = 25;
 export const CTA = 'CTA';
@@ -127,12 +92,10 @@ export const ALLOWED_IMAGE_EXTENSIONS_REGEX = (/\.(png|jpg|jpeg|gif)$/i);
 export const RCS_IMG_WIDTH = 1440;
 export const RCS_IMG_HEIGHT = 1024;
 export const RCS_IMG_SIZE = 2000000; // 2MB
-export const RCS_CAROUSEL_IMG_SIZE = 1 * 1024 * 1024; // 1MB
 export const MAX_FILE_SIZE_MB = 10;
 export const MAX_FILE_SIZE_BYTES = MAX_FILE_SIZE_MB * 1024 * 1024;
 export const ALLOWED_EXTENSIONS_VIDEO_REGEX = (/\.(mp4)$/i);
 export const RCS_VIDEO_SIZE = 10 * 1024 * 1024;
-export const RCS_CAROUSEL_VIDEO_SIZE = 5 * 1024 * 1024; // 5MB
 export const RCS_THUMBNAIL_MIN_SIZE = 40 * 1024;
 export const RCS_THUMBNAIL_MAX_SIZE = 100 * 1024;
 
@@ -179,31 +142,6 @@ export const RCS_IMAGE_DIMENSIONS = {
   },
 };
 
-// Carousel image dimensions (pixel values shown in UI). Keys follow `${HEIGHT}_${WIDTH}`.
-// HEIGHT: SHORT|MEDIUM, WIDTH: SMALL|MEDIUM
-export const RCS_CAROUSEL_IMAGE_DIMENSIONS = {
-  SHORT_SMALL: {
-    width: 1160,
-    height: 720,
-    description: 'Image (1160 x 720)',
-  },
-  SHORT_MEDIUM: {
-    width: 1800,
-    height: 720,
-    description: 'Image (1800 x 720)',
-  },
-  MEDIUM_SMALL: {
-    width: 770,
-    height: 720,
-    description: 'Image (770 x 720)',
-  },
-  MEDIUM_MEDIUM: {
-    width: 1280,
-    height: 720,
-    description: 'Image (1280 x 720)',
-  },
-};
-
 export const RCS_VIDEO_THUMBNAIL_DIMENSIONS = {
   SHORT_HEIGHT: {
     width: 770,
@@ -211,8 +149,6 @@ export const RCS_VIDEO_THUMBNAIL_DIMENSIONS = {
     type: 'SHORT_HEIGHT',
     heightType: 'SHORT',
     label: 'Vertical Short',
-    width: 1140,
-    height: 448,
     description: 'Thumbnail (770 x 257)',
     orientation: 'VERTICAL',
     maxFileSize: 100 * 1024,
@@ -253,29 +189,6 @@ export const RCS_VIDEO_THUMBNAIL_DIMENSIONS = {
   },
 };
 
-// Carousel thumbnail dimensions for video cards (pixel values shown in UI).
-// Keys follow `${HEIGHT}_${WIDTH}`.
-// Human-readable labels: formatMessage(messages.rcsCarouselVideoThumbnailLabel, { width, height })
-// or formatRcsCarouselVideoThumbnailLabel(formatMessage, entry) from ./utils.
-export const RCS_CAROUSEL_VIDEO_THUMBNAIL_DIMENSIONS = {
-  SHORT_SMALL: {
-    width: 718,
-    height: 448,
-  },
-  SHORT_MEDIUM: {
-    width: 1140,
-    height: 448,
-  },
-  MEDIUM_SMALL: {
-    width: 480,
-    height: 448,
-  },
-  MEDIUM_MEDIUM: {
-    width: 796,
-    height: 448,
-  },
-};
-
 const prefix = 'app/v2Containers/Rcs';
 export const UPLOAD_RCS_ASSET_REQUEST = `${prefix}/UPLOAD_RCS_ASSET_REQUEST`;
 export const UPLOAD_RCS_ASSET_SUCCESS = `${prefix}/UPLOAD_RCS_ASSET_SUCCESS`;
@@ -302,7 +215,6 @@ export const CLEAR_EDIT_RESPONSE_REQUEST = `${prefix}/Edit/CLEAR_EDIT_RESPONSE_R
 export const AI_CONTENT_BOT_DISABLED = "AI_CONTENT_BOT_DISABLED";
 
 export const RCS_TEXT_MESSAGE_MAX_LENGTH = 160;
-export const RCS_TEXT_MESSAGE_MAX_LENGTH_INFOBIP = 3072;
 export const RCS_RICH_CARD_MAX_LENGTH = 2000;
 export const MAX_BUTTONS = 4;
 
@@ -338,26 +250,3 @@ export const RCS_BUTTON_TYPES = {
   PHONE_NUMBER: 'PHONE_NUMBER',
   CTA: 'CTA',
 };
-
-/** Default action row for carousel card 1 (mandatory button UX): phone CTA, unsaved until user completes + Save. */
-export const RCS_CAROUSEL_FIRST_CARD_DEFAULT_SUGGESTIONS = [
-  {
-    index: 0,
-    type: RCS_BUTTON_TYPES.PHONE_NUMBER,
-    text: '',
-    phoneNumber: '',
-    url: null,
-    postback: '',
-    isSaved: false,
-  },
-];
-
-
-export const CAROUSEL_HEIGHT_OPTIONS = [
-  { value: 'SHORT', label: 'Short' },
-  { value: 'MEDIUM', label: 'Medium' },
-];
-export const CAROUSEL_WIDTH_OPTIONS = [
-  { value: 'SMALL', label: 'Small' },
-  { value: 'MEDIUM', label: 'Medium' },
-];