@capillarytech/creatives-library 8.0.345-alpha.9 → 8.0.346

package/package.json

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

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -705,27 +705,8 @@ export function SlideBoxContent(props) {
           // and getDetails?type=BEE_PLUGIN would never fire. Routing BEE
           // templates through the direct <Email> path — which is already
           // battle-tested for the CKEditor flow — sidesteps that entirely.
-          const vBase = templateData?.versions?.base;
-          const vBaseActiveTab = vBase?.activeTab || vBase?.selectedLanguages?.[0] || 'en';
           const isBEETemplate = templateData?.base?.is_drag_drop === true
-            || templateData?.base?.is_drag_drop === 1
-            || vBase?.[vBaseActiveTab]?.is_drag_drop === true
-            || vBase?.[vBaseActiveTab]?.is_drag_drop === 1;
-          console.log('[SlideBoxContent] BEE routing debug', {
-            supportCKEditor,
-            'templateData._id': templateData?._id,
-            'templateData.type': templateData?.type,
-            'templateData.base': templateData?.base,
-            'templateData.base.is_drag_drop': templateData?.base?.is_drag_drop,
-            'templateData.base.drag_drop_id': templateData?.base?.drag_drop_id,
-            vBase,
-            vBaseActiveTab,
-            'vBase[vBaseActiveTab]': vBase?.[vBaseActiveTab],
-            'vBase[vBaseActiveTab].is_drag_drop': vBase?.[vBaseActiveTab]?.is_drag_drop,
-            'vBase[vBaseActiveTab].drag_drop_id': vBase?.[vBaseActiveTab]?.drag_drop_id,
-            isBEETemplate,
-            routingTo: (supportCKEditor || isBEETemplate) ? 'Email (direct)' : 'EmailWrapper',
-          });
+            || templateData?.base?.is_drag_drop === 1;
           if (supportCKEditor || isBEETemplate) {
             return (
               <Email

package/v2Containers/CreativesContainer/index.js

@@ -966,13 +966,10 @@ export class Creatives extends React.Component {
       case constants.EMAIL:
         if (template?.value?.base) {
           let emailBase = template.value.base;
-          const { html_content, drag_drop_id: formDragDropId } = emailBase || {};
+          const { html_content } = emailBase || {};
           if (!html_content) {
             emailBase = templateRecords.base;
           }
-          if (!emailBase.drag_drop_id && formDragDropId) {
-            emailBase = { ...emailBase, drag_drop_id: formDragDropId };
-          }
           const newHtmlContent = await updateImagesInHtml(html_content);
           templateData = {
             ...templateData, ...emailBase, emailBody: newHtmlContent, emailSubject: (emailBase && emailBase.subject) ? emailBase.subject : '',

package/v2Containers/Email/index.js

@@ -224,7 +224,6 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
           || _.get(this.props.Templates.BEETemplate, 'versions.base.drag_drop_id')
           || _.get(this.props.Templates.BEETemplate, 'versions.base.id')
           || this.props.Templates.BEETemplate?._id;
-          console.log('[Rafeeq manzoor] comes here 1');
         this.props.actions.getCmsSetting(BEE_PLUGIN, dragDropId, 'open', undefined, isBEESupport, isBEEAppEnable);
       } else if (this.props.location.query.module !== "library" || (this.props.location.query.module === "library" && !this.props.templateData)) {
         // Extract drag_drop_id - check multiple possible paths
@@ -235,7 +234,6 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
           || _.get(this.props.Templates.BEETemplate, 'versions.base.drag_drop_id')
           || _.get(this.props.Templates.BEETemplate, 'versions.base.id')
           || this.props.Templates.BEETemplate?._id;
-        console.log('[Rafeeq manzoor] comes here 2');
         this.props.actions.getCmsSetting(BEE_PLUGIN, dragDropId, 'create', undefined, isBEESupport, isBEEAppEnable);
       }
     }
@@ -288,10 +286,8 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         
         if (this.props.params.id) {
           const activeTabForLang = beeTemplate.versions?.base?.activeTab || 'en';
-          console.log('[Rafeeq manzoor] comes here 3');
           this.props.actions.getCmsSetting(BEE_PLUGIN, dragDropId, 'open', activeTabForLang, isBEESupport, isBEEAppEnable);
         } else {
-          console.log('[Rafeeq manzoor] comes here 4');
           this.props.actions.getCmsSetting(BEE_PLUGIN, dragDropId, 'create', undefined, isBEESupport, isBEEAppEnable);
         }
       }
@@ -456,10 +452,8 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
           // Extract langId from active tab
           const activeTabForLang = beeTemplate.versions?.base?.activeTab || 'en';
           if (hasParamsId) {
-            console.log('[Rafeeq manzoor] comes here 5');
             this.props.actions.getCmsSetting(BEE_PLUGIN, dragDropId, 'open', activeTabForLang, isBEESupport, isBEEAppEnable);
           } else if (nextProps.location.query.module !== "library" || (nextProps.location.query.module === "library" && !nextProps.templateData)) {
-            console.log('[Rafeeq manzoor] comes here 6');
             this.props.actions.getCmsSetting(BEE_PLUGIN, dragDropId, 'create', undefined, isBEESupport, isBEEAppEnable);
           }
         }
@@ -476,10 +470,6 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
           }
         });
       }
-      console.log('[Rafeeq manzoor] here we have data 1', this.state.isEdit, nextProps.location.query.module);
-      console.log('[Rafeeq manzoor] here we have data 2', nextProps.templateData, !_.isEmpty(nextProps.templateData), this.props.params.id, nextProps.isGetFormData);
-      console.log('[Rafeeq manzoor] here we have data 3', _.isEmpty(_.get(this, `state.formData['template-subject']`)));
-      
       if (this.state.isEdit && nextProps.location.query.module === "library" && !_.isEmpty(nextProps.templateData) && !this.props.params.id && !nextProps.isGetFormData && _.isEmpty(_.get(this, `state.formData['template-subject']`))) {
         this.startTemplateCreation(nextProps.templateData);
       }
@@ -1248,7 +1238,6 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         //   formData.base.activeTab = language;
         // }
         if (language && editData.versions.base[language].is_drag_drop && isBEEAppEnable) {
-          console.log('[Rafeeq manzoor] comes here 7');
           this.props.actions.getCmsSetting(BEE_PLUGIN, editData._id, 'open', language, isBEESupport, isBEEAppEnable);
         }
       });
@@ -1472,7 +1461,6 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       const currentTab = this.state.currentTab - 1;
       const baseLanguage = this.props.currentOrgDetails.basic_details.base_language ? this.props.currentOrgDetails.basic_details.base_language : 'en';
       if (formData[currentTab][baseLanguage].is_drag_drop && isBEEAppEnable) {
-        console.log('[Rafeeq manzoor] comes here 8');
         this.props.actions.getCmsSetting(BEE_PLUGIN, formData[currentTab][baseLanguage].drag_drop_id, 'duplicate', baseLanguage, isEdmSupport, isBEEAppEnable);
       }
     });
@@ -1651,9 +1639,6 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       if (content.id) {
         tmpData.id = content.id;
       }
-      if (content.drag_drop_id) {
-        tmpData.drag_drop_id = content.drag_drop_id;
-      }
     }
     newFormData.base = _.cloneDeep(tmpData);
     newFormData.secondary_templates.push({template_data: tmpData});
@@ -2530,7 +2515,6 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
           const isBEEAppEnable = this.checkBeeEditorAllowedForLibrary();
           if (templates.drag_drop_id && isBEEAppEnable) {
             tempData.drag_drop_id = templates.drag_drop_id;
-            console.log('[Rafeeq manzoor] comes here 9');
             this.props.actions.getCmsSetting(BEE_PLUGIN, tempData._id, 'open', tempData.iso_code, isEdmSupport, isBEEAppEnable);
           }
           // formData.usingTabContainer = true;
@@ -2551,17 +2535,13 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         });
         this.addLanguage(false, formData, false, additionalLanguages);
       }
-      console.log("[Rafeeq manzoor] comes here lib 1", formData[0])
       formData.base = _.cloneDeep(formData[0]);
       if (formData?.['template-subject'] !== '') {
-        console.log("[Rafeeq manzoor] comes here lib 1 if", formData)
         this.setState({formData, loading: false, injectedTags: data.tags, tabKey, isDragDrop: (data.base.is_drag_drop !== 0 )}, () => {
           // this.setState({tabKey: ''});
           const isBEEEnable = this.checkBeeEditorAllowedForLibrary();
-          console.log("[Rafeeq manzoor] comes here lib 1 isBEEEnable", isBEEEnable)
           _.forEach(formData[0].selectedLanguages, (language) => {
             if (formData[0][language].is_drag_drop && isBEEEnable) {
-              console.log('[Rafeeq manzoor] comes here 10');
               this.props.actions.getCmsSetting(BEE_PLUGIN, formData[0][language].drag_drop_id, 'open', language, isEdmSupport, isBEEEnable);
             }
           });
@@ -2904,7 +2884,6 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       // let getQuery = '';
       const isEdmSupport = (this.props.location.query.isEdmSupport !== "false") || false;
       const isBEEAppEnable = this.checkBeeEditorAllowedForLibrary();
-      console.log('[Rafeeq manzoor] comes here 11');
       this.props.actions.getCmsSetting(BEE_PLUGIN, data._id, 'create', this.state.formData[this.state.currentTab - 1].activeTab, isEdmSupport, isBEEAppEnable);
       // this.props.templatesActions.setEdmTemplate(data);
       this.toggleEdmEmailTemplateSelection();

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) {
@@ -85,6 +87,7 @@ function emailReducer(state = initialState, action) {
     case types.GET_CMS_EDITOR_DETAILS_SUCCESS:
       return state
         .set('fetchingCmsSettings', false)
+        .set('isBeeEnabled', action.isBeeEnabled)
         .set('CmsSettings', fromJS(action.settings));
     case types.GET_CMS_EDITOR_DETAILS_FAILURE:
       return state
@@ -110,13 +113,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,14 +103,19 @@ export function* getAllAssets(assetType, queryParams) {
 }
 
 export function* getCmsSetting({
-  cmsType, projectId, cmsMode, langId, isEdmSupport, isBEEAppEnable,
+  cmsType, projectId, cmsMode, langId, isEdmSupport, isBEEAppEnable: isBEEAppEnableFromAction,
 }) {
   try {
+    const emailState = yield select((state) => state.get('email'));
+    if (!emailState.get('cmsAccountsLoaded') && emailState.get('fetchingCmsAccounts')) {
+      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') ?? isBEEAppEnableFromAction;
     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 });
+    yield put({ type: types.GET_CMS_EDITOR_DETAILS_SUCCESS, settings: cmsAccountDetail, isBeeEnabled });
   } 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/reducer.test.js

@@ -16,6 +16,53 @@ describe('emailReducer', () => {
     expect(emailReducer(undefined, action)).toMatchSnapshot();
   });
 
+  it.concurrent('it handles GET_CMS_EDITOR_DETAILS_SUCCESS action — sets isBeeEnabled true and CmsSettings', () => {
+    const initialState = fromJS({ isBeeEnabled: null, fetchingCmsSettings: true });
+    const action = {
+      type: types.GET_CMS_EDITOR_DETAILS_SUCCESS,
+      isBeeEnabled: true,
+      settings: { isDragDrop: true, editorType: 'bee' },
+    };
+    const result = emailReducer(initialState, action);
+    expect(result.get('fetchingCmsSettings')).toBe(false);
+    expect(result.get('isBeeEnabled')).toBe(true);
+    expect(result.getIn(['CmsSettings', 'isDragDrop'])).toBe(true);
+  });
+
+  it.concurrent('it handles GET_CMS_EDITOR_DETAILS_SUCCESS action — sets isBeeEnabled false', () => {
+    const initialState = fromJS({ isBeeEnabled: true, fetchingCmsSettings: true });
+    const action = {
+      type: types.GET_CMS_EDITOR_DETAILS_SUCCESS,
+      isBeeEnabled: false,
+      settings: {},
+    };
+    const result = emailReducer(initialState, action);
+    expect(result.get('fetchingCmsSettings')).toBe(false);
+    expect(result.get('isBeeEnabled')).toBe(false);
+  });
+
+  it.concurrent('it handles GET_CMS_EDITOR_DETAILS_SUCCESS action — overwrites stale isBeeEnabled from CLEAR_ALL_VALUES (null)', () => {
+    const initialState = fromJS({ isBeeEnabled: null, fetchingCmsSettings: true });
+    const action = {
+      type: types.GET_CMS_EDITOR_DETAILS_SUCCESS,
+      isBeeEnabled: true,
+      settings: { type: 'bee' },
+    };
+    const result = emailReducer(initialState, action);
+    expect(result.get('isBeeEnabled')).toBe(true);
+  });
+
+  it.concurrent('it handles GET_CMS_EDITOR_DETAILS_SUCCESS action — sets CmsSettings to empty object when settings is {}', () => {
+    const initialState = fromJS({ CmsSettings: { old: 'data' } });
+    const action = {
+      type: types.GET_CMS_EDITOR_DETAILS_SUCCESS,
+      isBeeEnabled: false,
+      settings: {},
+    };
+    const result = emailReducer(initialState, action);
+    expect(result.get('CmsSettings').toJS()).toEqual({});
+  });
+
   it.concurrent('it handles GET_CMS_ACCOUNTS_REQUEST action (line 111-113)', () => {
     const initialState = fromJS({
       isBeeEnabled: true, // Start with true to verify it gets set to 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,10 +710,14 @@ 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 })
+      .put({ type: types.GET_CMS_EDITOR_DETAILS_SUCCESS, settings: fakeResponse.data.response.cmsDetails, isBeeEnabled: true })
       .run();
   });
 
@@ -727,10 +732,14 @@ 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 })
+      .put({ type: types.GET_CMS_EDITOR_DETAILS_SUCCESS, settings: fakeResponse.data.response.cmsDetails, isBeeEnabled: false })
       .run();
   });
 
@@ -743,10 +752,14 @@ 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 })
+      .put({ type: types.GET_CMS_EDITOR_DETAILS_SUCCESS, settings: {}, isBeeEnabled: false })
       .run();
   });
 
@@ -755,11 +768,138 @@ 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 })
       .run();
   });
+
+  it('should wait for accounts when fetchingCmsAccounts is true and cmsAccountsLoaded is false (accounts succeed)', () => {
+    const fakeResponse = {
+      data: { response: { cmsDetails: { type: 'bee', settings: {} } } },
+    };
+    let selectCallCount = 0;
+
+    return expectSaga(sagas.getCmsSetting, basePayload)
+      .provide([
+        {
+          select(effect, next) {
+            selectCallCount += 1;
+            if (selectCallCount === 1) {
+              return fromJS({ cmsAccountsLoaded: false, fetchingCmsAccounts: true, isBeeEnabled: null });
+            }
+            return fromJS({ cmsAccountsLoaded: true, fetchingCmsAccounts: false, isBeeEnabled: true });
+          },
+        },
+        [matchers.call.fn(Api.getCmsTemplateSettingsV2), fakeResponse],
+      ])
+      .dispatch({ type: types.GET_CMS_ACCOUNTS_SUCCESS, isBeeEnabled: true })
+      .put({ type: types.GET_CMS_EDITOR_DETAILS_SUCCESS, settings: { type: 'bee', settings: {} }, isBeeEnabled: true })
+      .run();
+  });
+
+  it('should wait for accounts when fetchingCmsAccounts is true and cmsAccountsLoaded is false (accounts fail)', () => {
+    const fakeResponse = {
+      data: { response: { cmsDetails: { type: 'ck', settings: {} } } },
+    };
+    let selectCallCount = 0;
+
+    return expectSaga(sagas.getCmsSetting, basePayload)
+      .provide([
+        {
+          select(effect, next) {
+            selectCallCount += 1;
+            if (selectCallCount === 1) {
+              return fromJS({ cmsAccountsLoaded: false, fetchingCmsAccounts: true, isBeeEnabled: null });
+            }
+            return fromJS({ cmsAccountsLoaded: true, fetchingCmsAccounts: false, isBeeEnabled: false });
+          },
+        },
+        [matchers.call.fn(Api.getCmsTemplateSettingsV2), fakeResponse],
+      ])
+      .dispatch({ type: types.GET_CMS_ACCOUNTS_FAILURE })
+      .put({ type: types.GET_CMS_EDITOR_DETAILS_SUCCESS, settings: { type: 'ck', settings: {} }, isBeeEnabled: false })
+      .run();
+  });
+
+  it('should skip wait and use isBEEAppEnableFromAction as fallback when cmsAccountsLoaded is false but fetchingCmsAccounts is false', () => {
+    const fakeResponse = {
+      data: { response: { cmsDetails: { type: 'bee', settings: {} } } },
+    };
+
+    return expectSaga(sagas.getCmsSetting, { ...basePayload, isBEEAppEnable: true })
+      .provide([
+        {
+          select(effect, next) {
+            return fromJS({ cmsAccountsLoaded: false, fetchingCmsAccounts: false, isBeeEnabled: null });
+          },
+        },
+        [matchers.call.fn(Api.getCmsTemplateSettingsV2), fakeResponse],
+      ])
+      .put({ type: types.GET_CMS_EDITOR_DETAILS_SUCCESS, settings: { type: 'bee', settings: {} }, isBeeEnabled: true })
+      .run();
+  });
+
+  it('should use state isBeeEnabled (null) and fall back to isBEEAppEnableFromAction via ?? operator', () => {
+    const fakeResponse = {
+      data: { response: { cmsDetails: { type: 'bee', settings: {} } } },
+    };
+
+    return expectSaga(sagas.getCmsSetting, { ...basePayload, isBEEAppEnable: true })
+      .provide([
+        {
+          select(effect, next) {
+            return fromJS({ cmsAccountsLoaded: true, fetchingCmsAccounts: false, isBeeEnabled: null });
+          },
+        },
+        [matchers.call.fn(Api.getCmsTemplateSettingsV2), fakeResponse],
+      ])
+      .call(Api.getCmsTemplateSettingsV2, basePayload.cmsType, basePayload.projectId, basePayload.cmsMode, basePayload.langId, basePayload.isEdmSupport, true)
+      .put({ type: types.GET_CMS_EDITOR_DETAILS_SUCCESS, settings: { type: 'bee', settings: {} }, isBeeEnabled: true })
+      .run();
+  });
+
+  it('should use state isBeeEnabled false over isBEEAppEnableFromAction true via ?? operator (false is not null/undefined)', () => {
+    const fakeResponse = {
+      data: { response: { cmsDetails: { type: 'bee', settings: {} } } },
+    };
+
+    return expectSaga(sagas.getCmsSetting, { ...basePayload, isBEEAppEnable: true })
+      .provide([
+        {
+          select(effect, next) {
+            return fromJS({ cmsAccountsLoaded: true, fetchingCmsAccounts: false, isBeeEnabled: false });
+          },
+        },
+        [matchers.call.fn(Api.getCmsTemplateSettingsV2), fakeResponse],
+      ])
+      .call(Api.getCmsTemplateSettingsV2, basePayload.cmsType, basePayload.projectId, basePayload.cmsMode, basePayload.langId, basePayload.isEdmSupport, false)
+      .put({ type: types.GET_CMS_EDITOR_DETAILS_SUCCESS, settings: { type: 'bee', settings: {} }, isBeeEnabled: true })
+      .run();
+  });
+
+  it('should derive isBeeEnabled false when cmsDetails type is undefined', () => {
+    const fakeResponse = {
+      data: { response: { cmsDetails: { settings: {} } } },
+    };
+
+    return expectSaga(sagas.getCmsSetting, basePayload)
+      .provide([
+        {
+          select(effect, next) {
+            return fromJS({ cmsAccountsLoaded: true, fetchingCmsAccounts: false, isBeeEnabled: true });
+          },
+        },
+        [matchers.call.fn(Api.getCmsTemplateSettingsV2), fakeResponse],
+      ])
+      .put({ type: types.GET_CMS_EDITOR_DETAILS_SUCCESS, settings: { settings: {} }, isBeeEnabled: false })
+      .run();
+  });
 });