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

package/package.json

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

package/v2Containers/Email/reducer.js

@@ -87,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

package/v2Containers/Email/sagas.js

@@ -103,18 +103,19 @@ export function* getAllAssets(assetType, queryParams) {
 }
 
 export function* getCmsSetting({
-  cmsType, projectId, cmsMode, langId, isEdmSupport,
+  cmsType, projectId, cmsMode, langId, isEdmSupport, isBEEAppEnable: isBEEAppEnableFromAction,
 }) {
   try {
     const emailState = yield select((state) => state.get('email'));
-    if (!emailState.get('cmsAccountsLoaded')) {
+    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');
-
+    const isBEEAppEnable = updatedState.get('isBeeEnabled') ?? isBEEAppEnableFromAction;
     const result = yield call(Api.getCmsTemplateSettingsV2, cmsType, projectId, cmsMode, langId, isEdmSupport, isBEEAppEnable);
-    yield put({ type: types.GET_CMS_EDITOR_DETAILS_SUCCESS, settings: result.data.response.cmsDetails });
+    const cmsAccountDetail = result.data?.response.cmsDetails || {};
+    const isBeeEnabled = cmsAccountDetail?.type === cmsType;
+    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/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

@@ -717,7 +717,7 @@ describe('getCmsSetting saga', () => {
         },
         [matchers.call.fn(Api.getCmsTemplateSettingsV2), fakeResponse],
       ])
-      .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();
   });
 
@@ -739,7 +739,7 @@ describe('getCmsSetting saga', () => {
         },
         [matchers.call.fn(Api.getCmsTemplateSettingsV2), fakeResponse],
       ])
-      .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();
   });
 
@@ -759,7 +759,7 @@ describe('getCmsSetting saga', () => {
         },
         [matchers.call.fn(Api.getCmsTemplateSettingsV2), fakeResponse],
       ])
-      .put({ type: types.GET_CMS_EDITOR_DETAILS_SUCCESS, settings: undefined })
+      .put({ type: types.GET_CMS_EDITOR_DETAILS_SUCCESS, settings: {}, isBeeEnabled: false })
       .run();
   });
 
@@ -778,6 +778,128 @@ describe('getCmsSetting saga', () => {
       .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();
+  });
 });