@capillarytech/creatives-library 8.0.290-alpha.4 → 8.0.291

package/v2Components/HtmlEditor/HTMLEditor.js

@@ -102,6 +102,7 @@ const HTMLEditor = forwardRef(({
   onTagSelect = null,
   onContextChange = null,
   globalActions = null,
+  isLiquidEnabled = false, // Controls Liquid tab visibility in ValidationTabs
   isFullMode = true, // Full mode vs library mode - controls layout and visibility
   onErrorAcknowledged = null, // Callback when user clicks redirection icon to acknowledge errors
   onValidationChange = null, // Callback when validation state changes (for parent to track errors)
@@ -572,6 +573,7 @@ const HTMLEditor = forwardRef(({
     content,
     layout,
     validation,
+    isLiquidEnabled,
     editorRef: getActiveEditorRef(),
     handleLabelInsert,
     handleSave,
@@ -591,6 +593,7 @@ const HTMLEditor = forwardRef(({
     content,
     layout,
     validation,
+    isLiquidEnabled,
     getActiveEditorRef,
     handleLabelInsert,
     handleSave,
@@ -779,6 +782,7 @@ HTMLEditor.propTypes = {
   onTagSelect: PropTypes.func,
   onContextChange: PropTypes.func, // Deprecated: use globalActions instead
   globalActions: PropTypes.object,
+  isLiquidEnabled: PropTypes.bool, // Controls Liquid tab visibility in validation
   isFullMode: PropTypes.bool, // Full mode vs library mode
   onErrorAcknowledged: PropTypes.func, // Callback when user clicks redirection icon to acknowledge errors
   onValidationChange: PropTypes.func, // Callback when validation state changes
@@ -812,6 +816,7 @@ HTMLEditor.defaultProps = {
   onTagSelect: null,
   onContextChange: null,
   globalActions: null, // Redux actions for API calls
+  isLiquidEnabled: false,
   isFullMode: true, // Default to full mode
   onErrorAcknowledged: null, // Callback when user clicks redirection icon to acknowledge errors
   onValidationChange: null, // Callback when validation state changes

package/v2Components/HtmlEditor/__tests__/HTMLEditor.apiErrors.test.js

@@ -229,6 +229,7 @@ const defaultProps = {
   channel: 'EMAIL',
   userLocale: 'en',
   moduleFilterEnabled: true,
+  isLiquidEnabled: false,
   isFullMode: true,
   onErrorAcknowledged: jest.fn(),
   onValidationChange: jest.fn(),

package/v2Components/HtmlEditor/__tests__/HTMLEditor.test.js

@@ -3201,6 +3201,7 @@ describe('HTMLEditor', () => {
             onTagSelect={onTagSelect}
             onContextChange={onContextChange}
             globalActions={globalActions}
+            isLiquidEnabled={true}
             isFullMode={false}
             onErrorAcknowledged={onErrorAcknowledged}
             onValidationChange={onValidationChange}
@@ -3260,6 +3261,20 @@ describe('HTMLEditor', () => {
       expect(screen.getByTestId('device-toggle')).toBeInTheDocument();
     });
 
+    it('should handle isLiquidEnabled prop', () => {
+      render(
+        <TestWrapper>
+          <HTMLEditor isLiquidEnabled={true} />
+        </TestWrapper>
+      );
+
+      act(() => {
+        jest.runAllTimers();
+      });
+
+      expect(screen.getByTestId('editor-toolbar')).toBeInTheDocument();
+    });
+
     it('should handle isFullMode prop', () => {
       render(
         <TestWrapper>

package/v2Components/HtmlEditor/components/CodeEditorPane/index.js

@@ -69,7 +69,7 @@ const CodeEditorPaneComponent = ({
 }) => {
   const context = useEditorContext();
   const {
-    content, validation, variant,
+    content, validation, variant, isLiquidEnabled,
   } = context || {};
   const { content: contentValue, updateContent } = content || {};
   const editorRef = useRef(null);
@@ -298,6 +298,7 @@ const CodeEditorPaneComponent = ({
         <ValidationErrorDisplay
           validation={validation}
           onErrorClick={onErrorClick}
+          isLiquidEnabled={isLiquidEnabled}
           className="code-editor-pane__validation"
         />
       </div>

package/v2Containers/Cap/mockData.js

@@ -2,9 +2,11 @@ export const expectedStateGetLiquidTagsRequest = {
   fetchingLiquidTags: true,
   fetchingSchema: true,
   fetchingSchemaError: "",
+  liquidTags: [],
   messages: [],
   metaEntities: {
     layouts: [],
+    tagLookupMap: {},
     tags: [],
   },
   orgID: "",
@@ -15,9 +17,11 @@ export const expectedStateGetLiquidTagsFailure = {
   fetchingLiquidTags: false,
   fetchingSchema: true,
   fetchingSchemaError: "",
+  liquidTags: [],
   messages: [],
   metaEntities: {
     layouts: [],
+    tagLookupMap: {},
     tags: [],
   },
   orgID: "",
@@ -28,9 +32,11 @@ export const expectedStateGetLiquidTagsSuccess = {
   fetchingLiquidTags: false,
   fetchingSchema: true,
   fetchingSchemaError: "",
+  liquidTags: [],
   messages: [],
   metaEntities: {
     layouts: [],
+    tagLookupMap: {},
     tags: [],
   },
   orgID: "",
@@ -41,9 +47,11 @@ export const expectedStateGetSchemaForEntitySuccessTAG = {
   fetchingLiquidTags: false,
   fetchingSchema: false,
   fetchingSchemaError: false,
+  liquidTags: [],
   messages: [],
   metaEntities: {
     layouts: undefined,
+    tagLookupMap: { undefined: { definition: {} } },
     tags: { standard: { random: "32" } },
   },
   orgID: "",
@@ -54,9 +62,11 @@ export const expectedStateGetSchemaForEntitySuccess = {
   fetchingLiquidTags: false,
   fetchingSchema: false,
   fetchingSchemaError: false,
+  liquidTags: [],
   messages: [],
   metaEntities: {
     layouts: undefined,
+    tagLookupMap: undefined,
     tags: undefined,
   },
   orgID: "",
@@ -68,9 +78,13 @@ export const expectedForwardedTags = {
   fetchingSchema: false,
   fetchingSchemaError: '',
   injectedTags: undefined,
+  liquidTags: [],
   messages: [],
   metaEntities: {
     layouts: [],
+    tagLookupMap: {
+
+    },
     tags: [],
   },
   orgID: "",

package/v2Containers/Cap/reducer.js

@@ -1,11 +1,13 @@
 /**
  * Created by vivek on 22/5/17.
  */
-import { fromJS } from 'immutable';
+import { fromJS, Map as ImmutableMap } from 'immutable';
 import _ from 'lodash';
 import * as types from './constants';
 import initialState from '../../initialState';
 import { FAILURE } from '../App/constants';
+import { TAG } from '../Whatsapp/constants';
+import { getTagMapValue, getForwardedMapValues, getLoyaltyTagsMapValue } from '../../utils/tagValidations';
 
 function capReducer(state = fromJS(initialState.cap), action) {
   switch (action.type) {
@@ -96,6 +98,39 @@ function capReducer(state = fromJS(initialState.cap), action) {
       return state
         .set('fetchingLiquidTags', false);
     case types.GET_SCHEMA_FOR_ENTITY_SUCCESS: {
+      //Process standard tags
+      const standardTagMapInitial = _.keyBy(
+        action?.data?.metaEntities?.standard,
+        item => item?.definition?.value
+      );
+      // Mapping only the `definition` object instead of the entire item, to reduce space used
+      const standardTagMap = _.mapValues(standardTagMapInitial, item => ({
+        definition: item?.definition ?? {},
+      }));
+
+      // Process custom tags
+      const customSubtags = getTagMapValue(action?.data?.metaEntities?.custom)
+      // Process extended tags
+      const extendedSubtags = getTagMapValue(action?.data?.metaEntities?.extended);
+
+      const loyaltySubTagsData = getLoyaltyTagsMapValue(action?.data?.metaEntities?.loyaltyTags);
+
+      const getExistingTagLookupMap = (state) => {
+        if (!state || !state.get) return {};
+        const tagLookupMap = state.getIn(['metaEntities', 'tagLookupMap']);
+        return state.get('metaEntities') && ImmutableMap.isMap(tagLookupMap)
+          ? tagLookupMap.toJS()
+          : {};
+      };
+
+      // Combine all maps
+      const combinedTagMap = {
+        ...standardTagMap,
+        ...customSubtags,
+        ...extendedSubtags,
+        ...loyaltySubTagsData,
+        ...getExistingTagLookupMap(state),
+      };
       const stateMeta = state.get("metaEntities");
       return state
         .set('fetchingSchema', false)
@@ -103,6 +138,7 @@ function capReducer(state = fromJS(initialState.cap), action) {
         .set('metaEntities', {
           layouts: action.data && action.entityType === 'LAYOUT' ? action.data.metaEntities : stateMeta?.layouts,
           tags: action.data && action.entityType === 'TAG' ? action.data.metaEntities : stateMeta?.tags,
+          tagLookupMap: action?.data && action?.entityType === TAG ? combinedTagMap : stateMeta?.tagLookupMap,
         })
         .set('fetchingSchemaError', false);
     }
@@ -110,6 +146,7 @@ function capReducer(state = fromJS(initialState.cap), action) {
       return state.set('metaEntities', {
         layouts: [],
         tags: [],
+        tagLookupMap: {},
       });
     // eslint-disable-next-line no-case-declarations
     case types.HIDE_TAGS:
@@ -117,8 +154,23 @@ function capReducer(state = fromJS(initialState.cap), action) {
       metaEntities.tags.standard = _.filter(state.get('metaEntities').tags.standard, (tag) => action.tagList.indexOf(tag.definition.value) === -1);
       metaEntities.tags.custom = _.filter(state.get('metaEntities').tags.custom, (tag) => action.tagList.indexOf(tag.name) === -1);
       return state.setIn(['metaEntities'], metaEntities);
-    case types.SET_INJECTED_TAGS:
-      return state.set("injectedTags", action.injectedTags);
+    case types.SET_INJECTED_TAGS: 
+
+      // Deep clone the tagLookupMap to avoid direct mutations
+      let updatedMetaEntitiesTagLookUp = _.cloneDeep(state.getIn(['metaEntities', 'tagLookupMap']));
+      const formattedInjectedTags = getForwardedMapValues(action?.injectedTags);
+      // Merge the injectedTags with the existing tagLookupMap
+      updatedMetaEntitiesTagLookUp = {
+        ...formattedInjectedTags || {},
+        ...updatedMetaEntitiesTagLookUp || {},
+      };
+      return state.set("injectedTags", action.injectedTags).setIn(
+        ["metaEntities"],
+        fromJS({
+          ...state.get("metaEntities"),
+          tagLookupMap: updatedMetaEntitiesTagLookUp
+        })
+      );
     case types.GET_TOPBAR_MENU_DATA_REQUEST:
       return state.set('topbarMenuData', fromJS({ status: 'request' }));
     case types.GET_TOPBAR_MENU_DATA_SUCCESS:

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

@@ -21,6 +21,7 @@ import {
   expectedStateGetSchemaForEntitySuccessTAG,
   expectedStateGetSchemaForEntitySuccess,
 } from '../mockData';
+import { TAG } from '../../Whatsapp/constants';
 import { loadItem } from '../../../services/localStorageApi';
 
 
@@ -117,3 +118,104 @@ describe('should handle GET_SUPPORT_VIDEOS_CONFIG', () => {
     expect(reducer(mockedInitialState, action).toJS())?.fetchingSchema?.toEqual(true);
   });
 });
+
+describe('GET_SCHEMA_FOR_ENTITY_SUCCESS handler', () => {
+  it.concurrent('should handle existing tagLookupMap correctly when metaEntities and tagLookupMap exist', () => {
+    const initialStateTest = fromJS({
+      token: loadItem('token') || '',
+      orgID: loadItem('orgID') || '',
+      messages: [],
+      metaEntities: {
+        tags: [{ id: 1, name: 'tag1' }],
+        layouts: ['layout1', 'layout2'],
+        tagLookupMap: {
+          existingTag: { definition: { value: 'existing' } },
+          anotherTag: { definition: { value: 'another' } },
+        },
+        standard: [],
+      },
+      liquidTags: [],
+      fetchingLiquidTags: false,
+      fetchingSchema: false,
+      fetchingSchemaError: '',
+    });
+
+    let action = {
+      type: GET_SCHEMA_FOR_ENTITY_SUCCESS,
+      entityType: TAG,
+      data: {
+        metaEntities: {
+          standard: [],
+          custom: [],
+          extended: [],
+        },
+      },
+    };
+
+    let newState = reducer(initialStateTest, action);
+    let metaEntities = newState.get('metaEntities');
+
+    expect(metaEntities).toEqual(expect.objectContaining({
+      tagLookupMap: expect.objectContaining({
+        existingTag: expect.objectContaining({
+          definition: expect.objectContaining({
+            value: 'existing',
+          }),
+        }),
+      }),
+    }));
+
+    action = {
+      type: GET_SCHEMA_FOR_ENTITY_SUCCESS,
+      entityType: 'LAYOUT',
+      data: {
+        metaEntities: {
+          layouts: ['layout1', 'layout2'],
+          standard: [],
+        },
+      },
+    };
+    newState = reducer(initialStateTest, action);
+    metaEntities = newState.get('metaEntities');
+    expect(metaEntities).toEqual(expect.objectContaining({
+      layouts: expect.objectContaining({
+        layouts: expect.arrayContaining(['layout1', 'layout2']),
+      }),
+    }));
+  });
+
+  it.concurrent('should handle non-existent tagLookupMap by returning empty object', () => {
+    const initialStateTest = fromJS({
+      token: loadItem('token') || '',
+      orgID: loadItem('orgID') || '',
+      messages: [],
+      metaEntities: {
+        tagLookupMap: {},
+      },
+      liquidTags: [],
+      fetchingLiquidTags: false,
+      fetchingSchema: false,
+      fetchingSchemaError: '',
+    });
+
+    const action = {
+      type: GET_SCHEMA_FOR_ENTITY_SUCCESS,
+      entityType: TAG,
+      data: {
+        metaEntities: {
+          standard: [],
+          custom: [],
+          extended: [],
+        },
+      },
+    };
+
+    const newState = reducer(initialStateTest, action);
+    const metaEntities = newState.get('metaEntities');
+
+    // Updated assertions to handle plain object
+    expect(metaEntities).toBeDefined();
+    expect(metaEntities.tagLookupMap).toBeDefined();
+    expect(metaEntities.tagLookupMap).toEqual({});
+  });
+});

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -566,7 +566,6 @@ export function SlideBoxContent(props) {
           handleTestAndPreview={handleTestAndPreview}
           handleCloseTestAndPreview={handleCloseTestAndPreview}
           isTestAndPreviewMode={isTestAndPreviewMode}
-          onValidationFail={onValidationFail}
         />
       )}
       {isEditFTP && (
@@ -633,7 +632,6 @@ export function SlideBoxContent(props) {
         getLiquidTags={getLiquidTags}
         getDefaultTags={type}
         isFullMode={isFullMode}
-        onValidationFail={onValidationFail}
         forwardedTags={forwardedTags}
         selectedOfferDetails={selectedOfferDetails}
         onPreviewContentClicked={onPreviewContentClicked}
@@ -782,7 +780,6 @@ export function SlideBoxContent(props) {
           <MobliPushEdit
             getFormLibraryData={getFormData}
             setIsLoadingContent={setIsLoadingContent}
-            getLiquidTags={getLiquidTags}
             location={{
               pathname: `/mobilepush/edit/`,
               query,
@@ -855,7 +852,6 @@ export function SlideBoxContent(props) {
             mobilePushCreateMode={mobilePushCreateMode}
             isGetFormData={isGetFormData}
             getFormData={getFormData}
-            getLiquidTags={getLiquidTags}
             templateData={templateData}
             type={type}
             step={templateStep}
@@ -884,7 +880,7 @@ export function SlideBoxContent(props) {
           />
         ) : (
           <MobilePushNew
-            key="creatives-mobilepush-create-new"
+            key="creatives-mobilepush-wrapper"
             date={new Date().getMilliseconds()}
             setIsLoadingContent={setIsLoadingContent}
             onMobilepushModeChange={onMobilepushModeChange}

package/v2Containers/CreativesContainer/SlideBoxFooter.js

@@ -6,7 +6,7 @@ import CapError from '@capillarytech/cap-ui-library/CapError';
 import PropTypes from 'prop-types';
 import messages from './messages';
 import ErrorInfoNote from '../../v2Components/ErrorInfoNote';
-import { PREVIEW, EMAIL, SMS, EDIT_TEMPLATE, MOBILE_PUSH } from './constants';
+import { PREVIEW } from './constants';
 import { EMAIL_CREATE_MODES } from '../EmailWrapper/constants';
 import { hasSupportCKEditor } from '../../utils/common';
 import { getMessageForDevice, getTitleForDevice } from '../../utils/commonUtils';
@@ -15,7 +15,7 @@ function getFullModeSaveBtn(slidBoxContent, isCreatingTemplate) {
   if (isCreatingTemplate) {
     return <FormattedMessage {...messages.creativesTemplatesDone} />;
   }
-  return slidBoxContent === EDIT_TEMPLATE
+  return slidBoxContent === "editTemplate"
     ? <FormattedMessage {...messages.creativesTemplatesUpdate} />
     : <FormattedMessage {...messages.creativesTemplatesSaveFullMode} />;
 }
@@ -52,13 +52,8 @@ function SlideBoxFooter(props) {
   // Calculate if buttons should be disabled
   // Only apply validation state checks for EMAIL channel in HTML Editor mode (not BEE/DragDrop)
   // For other channels, BEE editor, or when htmlEditorValidationState is not provided, don't disable based on validation
-  const isEmailChannel = currentChannel?.toUpperCase() === EMAIL;
-  const isSmsChannel = currentChannel?.toUpperCase() === SMS;
-  // Use templateData.type in library/edit so footer shows when editing a mobile push template (currentChannel may not be set to template channel)
-  const isMobilePushChannel =
-    currentChannel?.toUpperCase() === MOBILE_PUSH ||
-    (templateData?.type && templateData.type.toUpperCase() === MOBILE_PUSH);
-  const isEditMode = slidBoxContent === EDIT_TEMPLATE;
+  const isEmailChannel = currentChannel?.toUpperCase() === 'EMAIL';
+  const isEditMode = slidBoxContent === 'editTemplate';
 
   // Use selectedEmailCreateMode for accurate mode detection in create mode (emailCreateMode is mapped for backwards compatibility)
   // In edit mode: htmlEditorValidationState is initialized as {} but only updated by HTML Editor
@@ -134,11 +129,8 @@ function SlideBoxFooter(props) {
   const isBEEEditorModeInCreate = !isHTMLEditorMode && !isEditMode;
   const isBEEEditorMode = isBEEEditorModeInEdit || isBEEEditorModeInCreate;
   const hasBEEEditorErrors = isEmailChannel && isBEEEditorMode && (hasStandardErrors || hasLiquidErrors) && (!htmlEditorValidationState || !htmlEditorHasErrors);
-  const hasSmsValidationErrors = isSmsChannel && (hasStandardErrors || hasLiquidErrors);
-  // Mobile Push OLD: footer only for extractTags/Aira liquid errors, not standard tag errors
-  const hasMobilePushValidationErrors = isMobilePushChannel && hasLiquidErrors;
 
-  const shouldShowErrorInfoNote = hasBEEEditorErrors || hasSmsValidationErrors || hasMobilePushValidationErrors || isSupportCKEditor;
+  const shouldShowErrorInfoNote = hasBEEEditorErrors || isSupportCKEditor;
 
   // Check for personalization tokens in title/message when anonymous user tries to save
   const hasPersonalizationTokens = () => {

package/v2Containers/CreativesContainer/index.js

@@ -132,6 +132,7 @@ export class Creatives extends React.Component {
       },
       hasPersonalizationTokenError: false, // Track personalization token errors in form
     };
+    this.liquidFlow = Boolean(commonUtil.hasLiquidSupportFeature());
     this.creativesTemplateSteps = {
       1: 'modeSelection',
       2: 'templateSelection', // only for email in current flows wil be used for mpush, line and wechat as well.
@@ -255,23 +256,12 @@ export class Creatives extends React.Component {
   };
 
   onShowTemplates = () => {
-    this.setState({
-      slidBoxContent: 'templates',
-      showSlideBox: true,
-      isGetFormData: false,
-      liquidErrorMessage: { STANDARD_ERROR_MSG: [], LIQUID_ERROR_MSG: [] },
-      isLiquidValidationError: false,
-    });
+    this.setState({ slidBoxContent: 'templates', showSlideBox: true, isGetFormData: false });
     this.resetStep();
   };
 
   onChannelChange = (channel) => {
-    this.setState({
-      currentChannel: channel,
-      templateData: null,
-      liquidErrorMessage: { STANDARD_ERROR_MSG: [], LIQUID_ERROR_MSG: [] },
-      isLiquidValidationError: false,
-    });
+    this.setState({ currentChannel: channel, templateData: null });
   }
 
   onCreateNextStep = () => {
@@ -1479,12 +1469,11 @@ export class Creatives extends React.Component {
   }
 
   getFormData = (template) => {
-    // Always reset isGetFormData so the child does not re-send form data on every re-render
-    // (e.g. when user fixes validation error by typing, we must not auto-close the slidebox)
-    this.setState({ isGetFormData: false });
     if (template.validity) {
       this.setState(
-        {},
+        {
+          isGetFormData: false,
+        },
         () => {
           const templateData = this.state.templateData ? this.state.templateData : template; //select existing or create new content
           const channel = templateData.type;
@@ -1568,8 +1557,6 @@ export class Creatives extends React.Component {
       ...prevState,
       templateData: undefined,
       showSlideBox: false,
-      liquidErrorMessage: { STANDARD_ERROR_MSG: [], LIQUID_ERROR_MSG: [] },
-      isLiquidValidationError: false,
     }), () => this.props.handleCloseCreatives(reloadTemplates));
   };
 
@@ -1777,18 +1764,8 @@ export class Creatives extends React.Component {
   }
 
   showLiquidErrorInFooter = (errorMessagesFromFormBuilder, currentFormBuilderTab) => {
-    const liquidMsgs = get(errorMessagesFromFormBuilder, constants.LIQUID_ERROR_MSG, []);
-    const standardMsgs = get(errorMessagesFromFormBuilder, constants.STANDARD_ERROR_MSG, []);
-    const hasLiquid = Array.isArray(liquidMsgs) ? liquidMsgs.length > 0 : !isEmpty(liquidMsgs);
-    const hasStandard = Array.isArray(standardMsgs) ? standardMsgs.length > 0 : !isEmpty(standardMsgs);
-    const isLiquidValidationError = hasLiquid || hasStandard;
-    // Don't overwrite existing liquid error with empty only for Mobile Push OLD (FormBuilder/clear calls empty there); SMS/others clear on input change
-    const isMobilePush = this.state.currentChannel?.toUpperCase() === constants.MOBILE_PUSH;
-    if (!hasLiquid && !hasStandard && this.state.isLiquidValidationError && isMobilePush) {
-      return;
-    }
     this.setState({
-      isLiquidValidationError,
+      isLiquidValidationError: !isEmpty(get(errorMessagesFromFormBuilder, constants.LIQUID_ERROR_MSG, [])) || !isEmpty(get(errorMessagesFromFormBuilder, constants.STANDARD_ERROR_MSG, [])),
       liquidErrorMessage: errorMessagesFromFormBuilder,
       activeFormBuilderTab: currentFormBuilderTab === 1 ? constants.ANDROID : (currentFormBuilderTab === 2 ? constants.IOS : null), // Update activeFormBuilderTab, default to 1 if undefined
     });
@@ -1988,6 +1965,14 @@ export class Creatives extends React.Component {
       const channelsToRemove = allChannels.filter((channel) => !allowedChannels.includes(channel));
       updatedChannelsToHide = [...new Set([...updatedChannelsToHide, ...channelsToRemove])];
     }
+    // In library mode (journey module), hide mobilepush and wechat channels from engagement blocks
+    // unless the current engagement block itself is that channel (e.g. mobilepush block should show mobilepush tab)
+    const isJourneyModule = (this.props.messageDetails?.type || '').toLowerCase() === constants.JOURNEY;
+    if (!isFullMode && isJourneyModule) {
+      const currentChannelNorm = (currentChannel || '').toLowerCase();
+      const journeyChannelsToHide = ['mobilepush', 'wechat'].filter((ch) => ch !== currentChannelNorm);
+      updatedChannelsToHide = [...new Set([...updatedChannelsToHide, ...journeyChannelsToHide])];
+    }
 
     return (
       <SlideBoxWrapper

package/v2Containers/Email/index.js

@@ -26,7 +26,7 @@ import * as globalActions from '../Cap/actions';
 import './_email.scss';
 import {getMessageObject} from '../../utils/messageUtils';
 import EmailPreview from '../../v2Components/EmailPreview';
-import { getDecodedFileName, hasSupportCKEditor } from '../../utils/common';
+import { getDecodedFileName, hasLiquidSupportFeature, hasSupportCKEditor } from '../../utils/common';
 import Pagination from '../../v2Components/Pagination';
 import * as creativesContainerActions from '../CreativesContainer/actions';
 import withCreatives from '../../hoc/withCreatives';
@@ -170,6 +170,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         deleteLanguage: this.deleteLanguage,
       },
     };
+    this.liquidFlow =  hasLiquidSupportFeature();
   }
   componentWillMount() {
     const formData = this.initFormData(this.props, true); //_.cloneDeep(this.state.formData);
@@ -254,6 +255,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       layout: 'EMAIL',
       type: 'LAYOUT',
       version: 'v2',
+      liquidFlow:this.liquidFlow,
     };
     this.props.globalActions.fetchSchemaForEntity(query);
     window.addEventListener("message", this.handleFrameTasks);
@@ -345,6 +347,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
           type: 'TAG',
           context: this.props.location.query.type === 'embedded' ? this.props.location.query.module : 'default',
           embedded: this.props.location.query.type === 'embedded' ? this.props.location.query.type : 'full',
+          liquidFlow:this.liquidFlow
         };
         if (this.props.getDefaultTags) {
           query.context = this.props.getDefaultTags;
@@ -2370,6 +2373,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       type: 'TAG',
       context: (data || '').toLowerCase() === 'all' ? 'default' : (data || '').toLowerCase(),
       embedded: 'full',
+      liquidFlow:this.liquidFlow
     };
     this.props.globalActions.fetchSchemaForEntity(query);
   }