@capillarytech/creatives-library 8.0.341 → 8.0.343-alpha.0

package/package.json

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

package/v2Components/CapTagList/index.js

@@ -80,7 +80,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
 
   componentDidUpdate(prevProps, prevState) {
     if (this.props.tags !== prevProps.tags || this.state.searchValue !== prevState.searchValue) {
-      const temp = this.renderTags(this.props.tags, this.state.searchValue);
+      const temp = this.renderTags(this.props.tags);
       this.setState({
         tagsList: temp,
       });
@@ -135,14 +135,13 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
       const tagNameWithoutUnderscore = tagName.replace(/_/g, " ");
       const searchStringLower = _.toLower(value);
       if (_.has(val, "subtags")) {
-        if (
-          val?.name
+        const temp = this.getSearchedExpandedKeys(val?.subtags, value, nodeKey);
+        const nodeMatches = val?.name
           && (tagName.includes(searchStringLower)
-            || tagNameWithoutUnderscore.includes(searchStringLower))
-        ) {
+            || tagNameWithoutUnderscore.includes(searchStringLower));
+        if (nodeMatches || temp.length > 0) {
           list.push(nodeKey);
         }
-        const temp = this.getSearchedExpandedKeys(val?.subtags, value, nodeKey);
         list = list.concat(temp);
       } else if (
         val?.name

package/v2Containers/Email/reducer.js

@@ -109,8 +109,7 @@ function emailReducer(state = initialState, action) {
         .set('fetchingCmsData', false)
         .set('fetchingCmsDataFailed', true);
     case types.GET_CMS_ACCOUNTS_REQUEST:
-      return state
-        .set('isBeeEnabled', false); // default to false
+      return state; // preserve null — "still pending", only update on SUCCESS/FAILURE
     case types.GET_CMS_ACCOUNTS_SUCCESS:
       return state
         .set('isBeeEnabled', action.isBeeEnabled);

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

@@ -16,15 +16,15 @@ describe('emailReducer', () => {
     expect(emailReducer(undefined, action)).toMatchSnapshot();
   });
 
-  it.concurrent('it handles GET_CMS_ACCOUNTS_REQUEST action (line 111-113)', () => {
+  it.concurrent('it handles GET_CMS_ACCOUNTS_REQUEST action (does not change isBeeEnabled)', () => {
     const initialState = fromJS({
-      isBeeEnabled: true, // Start with true to verify it gets set to false
+      isBeeEnabled: true, // preserved during request — "still pending"
     });
     const action = {
       type: types.GET_CMS_ACCOUNTS_REQUEST,
     };
     const result = emailReducer(initialState, action);
-    expect(result.get('isBeeEnabled')).toBe(false);
+    expect(result.get('isBeeEnabled')).toBe(true);
   });
 
   it.concurrent('it handles GET_CMS_ACCOUNTS_SUCCESS action (line 114-116)', () => {

package/v2Containers/EmailWrapper/hooks/useEmailWrapper.js

@@ -200,7 +200,9 @@ const useEmailWrapper = ({
     if (!isEditEmail) {
       return;
     }
-    const hasParamsId = params?.id || location?.query?.id || location?.params?.id || location?.pathname?.includes('/edit/');
+    const explicitId = params?.id || location?.query?.id || location?.params?.id;
+    const pathnameId = !explicitId && location?.pathname?.match(/\/edit\/([^/]+)/)?.[1];
+    const hasParamsId = explicitId || (pathnameId && pathnameId !== 'undefined');
     const hasTemplateDetails = Email?.templateDetails && !isEmpty(Email.templateDetails);
     const hasTemplateDataProp = templateData && !isEmpty(templateData);
     const isTemplateLoading = Email?.getTemplateDetailsInProgress;
@@ -230,13 +232,18 @@ const useEmailWrapper = ({
     // New flow: When template details are loaded and it's a BEE template, set it in Templates.BEETemplate
     // This allows Email component to properly initialize and call getCmsSetting
     const hasTemplateDetails = Email?.templateDetails && !isEmpty(Email.templateDetails);
+    const hasTemplateProp = templateData && !isEmpty(templateData);
     // Note: We check Email?.BEETemplate as a proxy, but the actual BEETemplate is in Templates reducer
     // The Email component will detect it via this.props.Templates.BEETemplate
     const hasBEETemplate = Email?.BEETemplate && !isEmpty(Email.BEETemplate);
 
-    if (hasTemplateDetails && !hasBEETemplate && templatesActions?.setBEETemplate && !beeTemplateSetRef.current) {
+    // Use Email.templateDetails when available (edit-by-ID flow), otherwise fall back to
+    // the templateData prop (BEE free template flow — template passed directly by consumer)
+    const editTemplateSource = hasTemplateDetails ? Email.templateDetails : (hasTemplateProp ? templateData : null);
+
+    if (editTemplateSource && !hasBEETemplate && templatesActions?.setBEETemplate && !beeTemplateSetRef.current) {
       // Check if it's a BEE template
-      const editTemplateData = Email.templateDetails;
+      const editTemplateData = editTemplateSource;
       const getIsDragDrop = (data) => {
         if (!data) return false;
         const baseDragDrop = get(data, 'versions.base.is_drag_drop', false);
@@ -265,13 +272,17 @@ const useEmailWrapper = ({
           || activeTabData.id
           || get(editTemplateData, 'versions.base.drag_drop_id')
           || get(editTemplateData, 'versions.base.id')
+          || get(editTemplateData, 'base.drag_drop_id')
+          || get(editTemplateData, 'base.id')
           || editTemplateData._id;
 
         const isBEESupport = (location?.query?.isBEESupport !== "false") || false;
         // IMPORTANT: isBEEAppEnable should be consistent across full mode and library mode
         // It represents whether BEE is enabled for the organization, not the mode
         // This ensures the same template behaves the same way in both modes
-        const isBEEAppEnable = checkBeeEditorEnabled();
+        // isDragDrop is always true here — pass true directly rather than relying on
+        // checkBeeEditorEnabled() which may return false while getCmsAccounts is pending
+        const isBEEAppEnable = isDragDrop || checkBeeEditorEnabled();
         // Check if we're in edit mode - check multiple sources for id
         const hasParamsId = params?.id
           || location?.query?.id
@@ -291,11 +302,11 @@ const useEmailWrapper = ({
       }
     }
 
-    // Reset ref when template changes (template details cleared)
-    if (!hasTemplateDetails && beeTemplateSetRef.current) {
+    // Reset ref when all template sources are gone (prevents duplicate calls on re-render)
+    if (!hasTemplateDetails && !hasTemplateProp && beeTemplateSetRef.current) {
       beeTemplateSetRef.current = false;
     }
-  }, [Email?.templateDetails, Email?.BEETemplate, Email?.getTemplateDetailsInProgress, Email?.fetchingCmsSettings, templatesActions, emailActions, params?.id, location?.query, checkBeeEditorEnabled, isFullMode]);
+  }, [Email?.templateDetails, Email?.BEETemplate, Email?.getTemplateDetailsInProgress, Email?.fetchingCmsSettings, templatesActions, emailActions, params?.id, location?.query, checkBeeEditorEnabled, isFullMode, templateData]);
 
   const onChange = useCallback((e) => {
     const { target: { value } } = e;

package/v2Containers/Viber/messages.js

@@ -210,4 +210,8 @@ export default defineMessages({
     id: `${scope}.cancel`,
     defaultMessage: 'Cancel',
   },
+  assetIdMissingError: {
+    id: `${scope}.assetIdMissingError`,
+    defaultMessage: 'Asset upload initiated but no asset ID was returned from the server. Unable to track processing status.',
+  },
 });

package/v2Containers/Viber/reducer.js

@@ -25,32 +25,32 @@ function viberReducer(state = initialState, action) {
   switch (action.type) {
     case types.CREATE_VIBER_TEMPLATE_REQUEST:
       return state
-        .set('createTemplateInProgress', true)
-        .set('createTemplateError', false)
-        .set('createTemplateErrorMessage', fromJS(""));
+      .set('createTemplateInProgress', true)
+      .set('createTemplateError', false)
+      .set('createTemplateErrorMessage', fromJS(""));
     case types.CREATE_VIBER_TEMPLATE_SUCCESS:
       return state.set('createTemplateInProgress', false)
-        .set('response', action.data)
-        .set('createTemplateError', (action.statusCode !== undefined && action.statusCode > 300))
-        .set('createTemplateErrorMessage', fromJS(action.errorMsg));
+      .set('response', action.data)
+      .set('createTemplateError', (action.statusCode !== undefined && action.statusCode > 300))
+      .set('createTemplateErrorMessage', fromJS(action.errorMsg));
     case types.CREATE_VIBER_TEMPLATE_FAILURE:
       return state
-        .set('createTemplateInProgress', false)
-        .set('createTemplateError', true)
-        .set('createTemplateErrorMessage', fromJS(action.errorMsg));
+      .set('createTemplateInProgress', false)
+      .set('createTemplateError', true)
+      .set('createTemplateErrorMessage', fromJS(action.errorMsg));
     case types.UPLOAD_VIBER_ASSET_REQUEST:
       return state
-        .set('uploadAssetSuccess', false)
-        .set('assetUploading', true);
+      .set('uploadAssetSuccess', false)
+      .set('assetUploading', true);
     case types.UPLOAD_VIBER_ASSET_SUCCESS:
       return state
-        .set('uploadAssetSuccess', (action.statusCode !== undefined && action.statusCode !== '' && action.statusCode < 300))
-        .set('assetUploading', false)
-        .set(action.templateType !== undefined ? `uploadedAssetData${action.templateType}` : 'uploadedAssetData', fromJS(action.data));
+      .set('uploadAssetSuccess', (action.statusCode !== undefined && action.statusCode !== '' && action.statusCode < 300))
+      .set('assetUploading', false)
+      .set(action.templateType !== undefined ? `uploadedAssetData${action.templateType}` : 'uploadedAssetData', fromJS(action.data));
     case types.UPLOAD_VIBER_ASSET_FAILURE:
       return state
-        .set('uploadAssetSuccess', false)
-        .set('assetUploading', false);
+      .set('uploadAssetSuccess', false)
+      .set('assetUploading', false);
     case asyncUploadCases.PROCESSING:
       return asyncUploadCases.handleProcessing(state, action);
     case asyncUploadCases.COMPLETED:
@@ -61,16 +61,16 @@ function viberReducer(state = initialState, action) {
       return asyncUploadCases.handleTimeout(state, action);
     case types.CLEAR_VIBER_ASSET:
       return state
-        .delete(action.templateType !== undefined ? `uploadedAssetData${action.templateType}` : 'uploadedAssetData')
+      .delete(action.templateType !== undefined ? `uploadedAssetData${action.templateType}` : 'uploadedAssetData')
         .set('assetProcessing', fromJS({}))
         .set('assetUploading', false)
         .set('uploadAssetSuccess', false);
     // FOR EDIT
     case types.EDIT_VIBER_TEMPLATE_REQUEST:
       return state
-        .set('editTemplateInProgress', true)
-        .set('editTemplateError', false)
-        .set('editTemplateErrorMessage', fromJS(""));
+      .set('editTemplateInProgress', true)
+      .set('editTemplateError', false)
+      .set('editTemplateErrorMessage', fromJS(""));
     case types.EDIT_VIBER_TEMPLATE_SUCCESS:
       return state.set('editTemplateInProgress', false)
         .set('editResponse', action.data)

package/v2Containers/Viber/sagas.js

@@ -6,24 +6,26 @@ import { pollAssetStatus } from '../../sagas/assetPolling';
 import { createPollingConfig } from '../../utils/asyncAssetUpload';
 import { ASSET_STATUS } from '../../utils/assetStatusConstants';
 import * as types from './constants';
+import messages from './messages';
 
 export function* uploadViberAsset(params) {
   try {
     const result = yield call(Api.uploadFile, params);
-    const responseData = result.response || {};
-    const statusCode = result?.status?.code || result?.statusCode || 200;
+    const responseData = result?.response || {};
+    const statusCode = result?.status?.code || result?.statusCode;
+    const asset = responseData?.asset || responseData;
 
     if (statusCode === 202 || responseData?.processingStatus === ASSET_STATUS.PROCESSING) {
-      const assetId = responseData.assetId || responseData.asset?._id;
-      const { templateType } = params;
-      const assetType = params.assetType || responseData.asset?.type?.toLowerCase() || 'image';
+      const assetId = asset?._id || responseData?.assetId;
+      const { templateType } = params || {};
+      const assetType = params?.assetType || asset?.type?.toLowerCase() || 'image';
 
       if (assetId) {
         yield put({
           type: types.UPLOAD_VIBER_ASSET_PROCESSING,
           payload: {
             assetId,
-            asset: responseData.asset,
+            asset,
             processingStatus: ASSET_STATUS.PROCESSING,
           },
         });
@@ -36,12 +38,11 @@ export function* uploadViberAsset(params) {
         const pollingConfig = createPollingConfig(assetType, assetId, actionTypes, templateType);
         yield call(pollAssetStatus, pollingConfig);
       } else {
-        const errorMessage = 'Asset upload initiated but no asset ID was returned from the server. Unable to track processing status.';
         yield put({
           type: types.UPLOAD_VIBER_ASSET_FAILED,
           payload: {
             assetId: undefined,
-            error: errorMessage,
+            error: messages.assetIdMissingError,
           },
           templateType,
         });
@@ -49,9 +50,9 @@ export function* uploadViberAsset(params) {
     } else {
       yield put({
         type: types.UPLOAD_VIBER_ASSET_SUCCESS,
-        data: responseData.asset,
+        data: asset,
         statusCode,
-        templateType: params.templateType,
+        templateType: params?.templateType,
       });
     }
   } catch (error) {
@@ -67,12 +68,7 @@ export function* createViberTemplate({ template, callback }) {
       errorMsg = result.message;
       throw errorMsg;
     }
-    yield put({
-      type: types.CREATE_VIBER_TEMPLATE_SUCCESS,
-      data: result.response,
-      statusCode: result.status ? result.status.code : '',
-      errorMsg,
-    });
+    yield put({ type: types.CREATE_VIBER_TEMPLATE_SUCCESS, data: result.response, statusCode: result.status ? result.status.code : '', errorMsg });
     if (callback) {
       callback(result.response);
     }
@@ -96,12 +92,7 @@ export function* editTemplate({ template, callback }) {
     if (callback) {
       callback(result.response);
     }
-    yield put({
-      type: types.EDIT_VIBER_TEMPLATE_SUCCESS,
-      data: result.response,
-      statusCode: result.status ? result.status.code : '',
-      errorMsg,
-    });
+    yield put({ type: types.EDIT_VIBER_TEMPLATE_SUCCESS, data: result.response, statusCode: result.status ? result.status.code : '', errorMsg });
   } catch (error) {
     yield put({ type: types.EDIT_VIBER_TEMPLATE_FAILURE, error, errorMsg });
     if (callback) {
@@ -112,6 +103,7 @@ export function* editTemplate({ template, callback }) {
 
 export function* getTemplateDetails({id, callback}) {
   try {
+    
     const result = yield call(Api.getTemplateDetails, {id, channel: 'VIBER'});
     yield put({ type: types.GET_VIBER_TEMPLATE_DETAILS_SUCCESS, data: result.response });
     if (callback) {
@@ -125,19 +117,28 @@ export function* getTemplateDetails({id, callback}) {
 
 function* watchUploadViberAsset() {
   yield takeLatest(types.UPLOAD_VIBER_ASSET_REQUEST, uploadViberAsset);
+  
+  
 }
 
 
 function* watchCreateTemplate() {
+  
   yield takeLatest(types.CREATE_VIBER_TEMPLATE_REQUEST, createViberTemplate);
+  
+  
 }
 
 function* watchGetTemplateDetails() {
   yield takeLatest(types.GET_VIBER_TEMPLATE_DETAILS_REQUEST, getTemplateDetails);
+  
+  
 }
 
 function* watchEditTemplate() {
   yield takeLatest(types.EDIT_VIBER_TEMPLATE_REQUEST, editTemplate);
+  
+  
 }
 
 export default [
@@ -154,4 +155,4 @@ export function* v2ViberSagas() {
     watchGetTemplateDetails(),
     watchEditTemplate(),
   ]);
-}
+}

package/v2Containers/Viber/tests/saga.test.js

@@ -7,6 +7,7 @@ import * as sagas from '../sagas';
 import * as types from '../constants';
 import { pollAssetStatus } from '../../../sagas/assetPolling';
 import { ASSET_STATUS } from '../../../utils/assetStatusConstants';
+import messages from '../messages';
 
 describe('Viber Sagas', () => {
   describe('uploadViberAsset Saga', () => {
@@ -141,7 +142,7 @@ describe('Viber Sagas', () => {
           type: types.UPLOAD_VIBER_ASSET_FAILED,
           payload: {
             assetId: undefined,
-            error: 'Asset upload initiated but no asset ID was returned from the server. Unable to track processing status.',
+            error: messages.assetIdMissingError,
           },
           templateType: 0,
         })
@@ -181,7 +182,7 @@ describe('Viber Sagas', () => {
         .run();
     });
 
-    it('defaults statusCode to 200 when no status info present', () => {
+    it('passes undefined statusCode through when no status info present (no default)', () => {
       const mockResponse = { response: { asset: mockAsset } };
       return expectSaga(sagas.uploadViberAsset, mockParams)
         .provide([
@@ -190,7 +191,7 @@ describe('Viber Sagas', () => {
         .put({
           type: types.UPLOAD_VIBER_ASSET_SUCCESS,
           data: mockAsset,
-          statusCode: 200,
+          statusCode: undefined,
           templateType: 0,
         })
         .run();
@@ -204,7 +205,53 @@ describe('Viber Sagas', () => {
         ])
         .put({
           type: types.UPLOAD_VIBER_ASSET_SUCCESS,
-          data: undefined,
+          data: {},
+          statusCode: 201,
+          templateType: 0,
+        })
+        .run();
+    });
+
+    it('normalizes a flat async response (asset fields at top level) for polling', () => {
+      // API returns a flat asset object instead of { asset: {...} }
+      const flatResponse = {
+        status: { code: 202 },
+        response: {
+          _id: 'flat-asset-789',
+          type: 'VIDEO',
+          processingStatus: ASSET_STATUS.PROCESSING,
+        },
+      };
+      return expectSaga(sagas.uploadViberAsset, { ...mockParams, assetType: undefined })
+        .provide([
+          [matchers.call.fn(Api.uploadFile), flatResponse],
+          [matchers.call.fn(pollAssetStatus), undefined],
+        ])
+        .put({
+          type: types.UPLOAD_VIBER_ASSET_PROCESSING,
+          payload: {
+            assetId: 'flat-asset-789',
+            asset: flatResponse.response,
+            processingStatus: ASSET_STATUS.PROCESSING,
+          },
+        })
+        .call.fn(pollAssetStatus)
+        .run();
+    });
+
+    it('normalizes a flat sync response (asset fields at top level)', () => {
+      const flatAsset = { _id: 'flat-sync-1', url: 'https://cdn/x.jpg' };
+      const flatResponse = {
+        status: { code: 201 },
+        response: flatAsset,
+      };
+      return expectSaga(sagas.uploadViberAsset, mockParams)
+        .provide([
+          [matchers.call.fn(Api.uploadFile), flatResponse],
+        ])
+        .put({
+          type: types.UPLOAD_VIBER_ASSET_SUCCESS,
+          data: flatAsset,
           statusCode: 201,
           templateType: 0,
         })