@capillarytech/creatives-library 8.0.345 → 8.0.346

package/package.json

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

package/services/api.js

@@ -361,26 +361,6 @@ export const deleteTemplate = ({channel, id}) => {
   //return API.deleteResource(url);
 };
 
-export const archiveTemplate = ({ channel, id }) => {
-  const url = `${API_ENDPOINT}/templates/archive/${id}/${channel}`;
-  return request(url, getAPICallObject('PUT'));
-};
-
-export const unarchiveTemplate = ({ channel, id }) => {
-  const url = `${API_ENDPOINT}/templates/unarchive/${id}/${channel}`;
-  return request(url, getAPICallObject('PUT'));
-};
-
-export const bulkArchiveTemplates = ({ channel, ids }) => {
-  const url = `${API_ENDPOINT}/templates/archive/bulk/${channel}`;
-  return request(url, getAPICallObject('PUT', { ids }));
-};
-
-export const bulkUnarchiveTemplates = ({ channel, ids }) => {
-  const url = `${API_ENDPOINT}/templates/unarchive/bulk/${channel}`;
-  return request(url, getAPICallObject('PUT', { ids }));
-};
-
 export const deleteRcsTemplate = ({ templateName }) => {
   const url = `${API_ENDPOINT}/templates/${templateName}/RCS`;
   return request(url, getAPICallObject('DELETE'))

package/services/tests/api.test.js

@@ -1086,62 +1086,3 @@ describe('createTestCustomer', () => {
     expect(lastCall[1].body).toBe(JSON.stringify(payload));
   });
 });
-
-import {
-  archiveTemplate,
-  unarchiveTemplate,
-  bulkArchiveTemplates,
-  bulkUnarchiveTemplates,
-} from '../api';
-
-describe('archiveTemplate', () => {
-  beforeEach(() => {
-    global.fetch = jest.fn().mockReturnValue(Promise.resolve({ json: () => Promise.resolve({}) }));
-  });
-
-  it('should call PUT on archive endpoint', () => {
-    archiveTemplate({ channel: 'EMAIL', id: 'id123' });
-    expect(global.fetch).toHaveBeenCalled();
-    const lastCall = global.fetch.mock.calls[global.fetch.mock.calls.length - 1];
-    expect(lastCall[1].method).toBe('PUT');
-  });
-});
-
-describe('unarchiveTemplate', () => {
-  beforeEach(() => {
-    global.fetch = jest.fn().mockReturnValue(Promise.resolve({ json: () => Promise.resolve({}) }));
-  });
-
-  it('should call PUT on unarchive endpoint', () => {
-    unarchiveTemplate({ channel: 'EMAIL', id: 'id123' });
-    expect(global.fetch).toHaveBeenCalled();
-    const lastCall = global.fetch.mock.calls[global.fetch.mock.calls.length - 1];
-    expect(lastCall[1].method).toBe('PUT');
-  });
-});
-
-describe('bulkArchiveTemplates', () => {
-  beforeEach(() => {
-    global.fetch = jest.fn().mockReturnValue(Promise.resolve({ json: () => Promise.resolve({}) }));
-  });
-
-  it('should call PUT on bulk archive endpoint with ids', () => {
-    bulkArchiveTemplates({ channel: 'EMAIL', ids: ['id1', 'id2'] });
-    expect(global.fetch).toHaveBeenCalled();
-    const lastCall = global.fetch.mock.calls[global.fetch.mock.calls.length - 1];
-    expect(lastCall[1].method).toBe('PUT');
-  });
-});
-
-describe('bulkUnarchiveTemplates', () => {
-  beforeEach(() => {
-    global.fetch = jest.fn().mockReturnValue(Promise.resolve({ json: () => Promise.resolve({}) }));
-  });
-
-  it('should call PUT on bulk unarchive endpoint with ids', () => {
-    bulkUnarchiveTemplates({ channel: 'EMAIL', ids: ['id1', 'id2'] });
-    expect(global.fetch).toHaveBeenCalled();
-    const lastCall = global.fetch.mock.calls[global.fetch.mock.calls.length - 1];
-    expect(lastCall[1].method).toBe('PUT');
-  });
-});

package/v2Components/CapCustomSkeleton/index.js

@@ -28,7 +28,7 @@ export default function CapCustomSkeleton(props) {
                   xs={24}
                   sm={12}
                   md={8}
-                  lg={8}
+                  lg={6}
                 >
                   <CapSkeleton
                     active

package/v2Components/CapCustomSkeleton/tests/__snapshots__/index.test.js.snap

@@ -20,7 +20,7 @@ exports[`CapCustomSkeleton test renders correct CapCustomSkeleton component 1`]
     >
       <CapColumn
         key="0"
-        lg={8}
+        lg={6}
         md={8}
         sm={12}
         xs={24}
@@ -40,7 +40,7 @@ exports[`CapCustomSkeleton test renders correct CapCustomSkeleton component 1`]
       </CapColumn>
       <CapColumn
         key="1"
-        lg={8}
+        lg={6}
         md={8}
         sm={12}
         xs={24}
@@ -60,7 +60,7 @@ exports[`CapCustomSkeleton test renders correct CapCustomSkeleton component 1`]
       </CapColumn>
       <CapColumn
         key="2"
-        lg={8}
+        lg={6}
         md={8}
         sm={12}
         xs={24}
@@ -80,7 +80,7 @@ exports[`CapCustomSkeleton test renders correct CapCustomSkeleton component 1`]
       </CapColumn>
       <CapColumn
         key="3"
-        lg={8}
+        lg={6}
         md={8}
         sm={12}
         xs={24}
@@ -100,7 +100,7 @@ exports[`CapCustomSkeleton test renders correct CapCustomSkeleton component 1`]
       </CapColumn>
       <CapColumn
         key="4"
-        lg={8}
+        lg={6}
         md={8}
         sm={12}
         xs={24}
@@ -120,7 +120,7 @@ exports[`CapCustomSkeleton test renders correct CapCustomSkeleton component 1`]
       </CapColumn>
       <CapColumn
         key="5"
-        lg={8}
+        lg={6}
         md={8}
         sm={12}
         xs={24}
@@ -140,7 +140,7 @@ exports[`CapCustomSkeleton test renders correct CapCustomSkeleton component 1`]
       </CapColumn>
       <CapColumn
         key="6"
-        lg={8}
+        lg={6}
         md={8}
         sm={12}
         xs={24}
@@ -160,7 +160,7 @@ exports[`CapCustomSkeleton test renders correct CapCustomSkeleton component 1`]
       </CapColumn>
       <CapColumn
         key="7"
-        lg={8}
+        lg={6}
         md={8}
         sm={12}
         xs={24}
@@ -180,7 +180,7 @@ exports[`CapCustomSkeleton test renders correct CapCustomSkeleton component 1`]
       </CapColumn>
       <CapColumn
         key="8"
-        lg={8}
+        lg={6}
         md={8}
         sm={12}
         xs={24}
@@ -200,7 +200,7 @@ exports[`CapCustomSkeleton test renders correct CapCustomSkeleton component 1`]
       </CapColumn>
       <CapColumn
         key="9"
-        lg={8}
+        lg={6}
         md={8}
         sm={12}
         xs={24}
@@ -220,7 +220,7 @@ exports[`CapCustomSkeleton test renders correct CapCustomSkeleton component 1`]
       </CapColumn>
       <CapColumn
         key="10"
-        lg={8}
+        lg={6}
         md={8}
         sm={12}
         xs={24}
@@ -240,7 +240,7 @@ exports[`CapCustomSkeleton test renders correct CapCustomSkeleton component 1`]
       </CapColumn>
       <CapColumn
         key="11"
-        lg={8}
+        lg={6}
         md={8}
         sm={12}
         xs={24}

package/v2Containers/CreativesContainer/SlideBoxFooter.js

@@ -24,7 +24,6 @@ function SlideBoxFooter(props) {
     slidBoxContent,
     onSave,
     onEditTemplate,
-    isTemplateArchived,
     onCreateNextStep,
     isFullMode,
     fetchingCmsData,
@@ -215,7 +214,7 @@ function SlideBoxFooter(props) {
             <FormattedMessage {...(continueButtonLabel || messages.continue)} />
           </CapButton>
         )}
-        {slidBoxContent === PREVIEW && !isTemplateArchived && (
+        {slidBoxContent === PREVIEW && (
           <CapButton onClick={onEditTemplate} type="secondary">
             <FormattedMessage {...messages.creativesTemplatesEdit} />
           </CapButton>
@@ -228,7 +227,6 @@ SlideBoxFooter.propTypes = {
   slidBoxContent: PropTypes.node,
   onSave: PropTypes.func,
   onEditTemplate: PropTypes.func,
-  isTemplateArchived: PropTypes.bool,
   onCreateNextStep: PropTypes.func,
   shouldShowContinueFooter: PropTypes.func,
   shouldShowDoneFooter: PropTypes.func,

package/v2Containers/CreativesContainer/index.js

@@ -260,10 +260,6 @@ export class Creatives extends React.Component {
   };
 
   onEditTemplate = () => {
-    if (this.props.templateData && this.props.templateData.isArchived) {
-      CapNotification.error({ message: this.props.intl.formatMessage(messages.cannotEditArchivedTemplate) });
-      return;
-    }
     this.setState({ slidBoxContent: 'editTemplate', showSlideBox: true, templateNameExists: true });
   };
 
@@ -2140,7 +2136,6 @@ export class Creatives extends React.Component {
               onSave={this.saveMessage}
               onDiscard={this.discardMessage}
               onEditTemplate={this.onEditTemplate}
-              isTemplateArchived={!!(this.props.templateData && this.props.templateData.isArchived)}
               slidBoxContent={slidBoxContent}
               onCreateNextStep={this.onCreateNextStep}
               currentChannel={currentChannel.toUpperCase()}

package/v2Containers/CreativesContainer/messages.js

@@ -390,8 +390,4 @@ export default defineMessages({
     id: `${scope}.personalizationTokensErrorMessage`,
     defaultMessage: `Personalization tags are not supported for anonymous customers, please remove the tags.`,
   },
-  "cannotEditArchivedTemplate": {
-    id: `${scope}.cannotEditArchivedTemplate`,
-    defaultMessage: 'Cannot edit an archived template. Please unarchive it first.',
-  },
 });

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

@@ -295,7 +295,6 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit all data
         isEmptyContent={false}
         isFullMode={false}
         isLiquidValidationError={false}
-        isTemplateArchived={false}
         isTemplateNameEmpty={false}
         onCreateNextStep={[Function]}
         onDiscard={[Function]}
@@ -435,7 +434,6 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit min data
         isEmptyContent={false}
         isFullMode={false}
         isLiquidValidationError={false}
-        isTemplateArchived={false}
         isTemplateNameEmpty={false}
         onCreateNextStep={[Function]}
         onDiscard={[Function]}
@@ -575,7 +573,6 @@ exports[`Test SlideBoxContent container it should clear the url, on channel chan
         isEmptyContent={false}
         isFullMode={false}
         isLiquidValidationError={false}
-        isTemplateArchived={false}
         isTemplateNameEmpty={false}
         onCreateNextStep={[Function]}
         onDiscard={[Function]}

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();
+  });
 });