@capillarytech/creatives-library 7.17.204-alpha.0 → 7.17.204

package/package.json

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

package/services/api.js

@@ -357,10 +357,11 @@ export const getUserList = () => {
   return API.get(url);// request(url, getAPICallObject('GET'));
 };
 
-export const fetchSchemaForEntity = ({queryParams}) => {
+export const fetchSchemaForEntity = async ({queryParams}) => {
   if (queryParams.version === "v2" && queryParams.type === "LAYOUT") {
     const schema = getSchema(queryParams.layout);
-    return schema.then((layout) => layout).catch((err) => {
+    // Added async/await to ensure the schema object is resolved before returning it
+    return await schema.then((layout) => layout).catch((err) => {
       console.error(err);
     });
   }

package/services/tests/api.test.js

@@ -11,8 +11,10 @@ import {
   getTemplateInfoById,
   askAiraForLiquid,
   getLiquidTags,
+  fetchSchemaForEntity,
 } from '../api';
 import { mockData } from './mockData';
+import getSchema from '../getSchema';
 const sampleFile = require('../../assets/line.png');
 
 let mockDecompressJsonObject;
@@ -24,6 +26,8 @@ jest.mock('@capillarytech/cap-ui-utils', () => {
   };
 });
 
+jest.mock('../getSchema', () => jest.fn());
+
 describe('getSenderDetails -- Test with valid responses', () => {
   it('Should return correct response', () =>
     expect(getSenderDetails('WHATSAPP', -1)).toEqual(Promise.resolve()));
@@ -438,4 +442,33 @@ describe('getLiquidTags -- Test with various responses', () => {
       error: 'Internal Server Error',
     });
   });
-});
+});
+
+describe('fetchSchemaForEntity', () => {
+  it('should fetch schema for version v2 and type LAYOUT', async () => {
+    const queryParams = { version: 'v2', type: 'LAYOUT', layout: 'testLayout' };
+    const mockLayout = { id: 'layout1', name: 'Test Layout' };
+
+    getSchema.mockReturnValue(Promise.resolve(mockLayout));
+
+    const result = await fetchSchemaForEntity({ queryParams });
+
+    expect(getSchema).toHaveBeenCalledWith(queryParams.layout);
+    expect(result).toEqual(mockLayout);
+  });
+
+  it('should handle errors when fetching schema', async () => {
+    const queryParams = { version: 'v2', type: 'LAYOUT', layout: 'testLayout' };
+    const mockError = new Error('Failed to fetch schema');
+
+    getSchema.mockReturnValue(Promise.reject(mockError));
+
+    console.error = jest.fn();
+
+    const result = await fetchSchemaForEntity({ queryParams });
+
+    expect(getSchema).toHaveBeenCalledWith(queryParams.layout);
+    expect(result).toBeUndefined();
+    expect(console.error).toHaveBeenCalledWith(mockError);
+  });
+});

package/utils/tagValidations.js

@@ -93,7 +93,6 @@ export const validateTags = ({
   injectedTagsParams,
   location,
   tagModule,
-  eventContextTags,
 }) => {
   const tags = tagsParam;
   const injectedTags = transformInjectedTags(injectedTagsParams);
@@ -146,12 +145,6 @@ export const validateTags = ({
           }
         }
       }
-      // Journey Event Context Tags support
-      eventContextTags?.forEach((tag) => {
-        if (tagValue === tag?.tagName) {
-          ifSupported = true;
-        }
-      });
       ifSupported = ifSupported || checkIfSupportedTag(tagValue, injectedTags);
       if (!ifSupported) {
         response.unsupportedTags.push(tagValue);

package/v2Components/FormBuilder/index.js

@@ -1262,14 +1262,6 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
             }
           }
         }
-
-        // Event Context Tags support
-        this.props?.eventContextTags?.forEach((tag) => {
-          if (tagValue === tag?.tagName) {
-            ifSupported = true;
-          }
-        });
-
         ifSupported = ifSupported || this.checkIfSupportedTag(tagValue, injectedTags);
         if (!ifSupported && !this.liquidFlow) {
           response.unsupportedTags.push(tagValue);
@@ -2597,7 +2589,6 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                 id={val.id}
                 userLocale={this.props.userLocale}
                 selectedOfferDetails={this.props.selectedOfferDetails}
-                eventContextTags={this.props.eventContextTags}
               />
             </CapColumn>
           );
@@ -3219,7 +3210,6 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                     userLocale={this.state.translationLang}
                     selectedOfferDetails={this.props.selectedOfferDetails}
                     channel={channel}
-                    eventContextTags={this.props.eventContextTags}
                   />
                 </CapColumn>
               );
@@ -3494,7 +3484,6 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                   saveBeeData={this.props.saveBeeData}
                   onContextChange={this.props.onContextChange}
                   moduleFilterEnabled={isModuleFilterEnabled}
-                  eventContextTags={this.props.eventContextTags}
                 />
               </CapColumn>
             );

package/v2Containers/BeeEditor/index.js

@@ -48,7 +48,6 @@ function BeeEditor(props) {
     actions,
     BEESelect,
     currentOrgDetails,
-    eventContextTags,
   } = props;
   const { saveRowRequest } = BEESelect;
   const {formatMessage} = intl;
@@ -281,7 +280,6 @@ function BeeEditor(props) {
             className: "bee-editor-tag-list",
           }}
           onContextChange={onContextChange}
-          eventContextTags={eventContextTags}
         />
         <CapModal
           className="custom-row-modal"
@@ -325,7 +323,6 @@ BeeEditor.propTypes = {
   injectedTags: PropTypes.object,
   onContextChange: PropTypes.func,
   userLocale: PropTypes.string,
-  eventContextTags: PropTypes.array,
 };
 
 const mapStateToProps = () => createStructuredSelector({

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -155,7 +155,6 @@ export function SlideBoxContent(props) {
       moduleType,
       showLiquidErrorInFooter,
       creativesMode,
-      eventContextTags,
     } = props;
   const type = (messageDetails.type || '').toLowerCase(); // type is context in get tags values : outbound | dvs | referral | loyalty | coupons
   const query = { type: !isFullMode && 'embedded', module: isFullMode ? 'default' : 'library', isEditFromCampaigns: (templateData || {}).isEditFromCampaigns};
@@ -396,7 +395,6 @@ export function SlideBoxContent(props) {
     onCreateComplete,
     selectedOfferDetails,
     getFormData,
-    eventContextTags,
   };
 
   return (
@@ -431,7 +429,6 @@ export function SlideBoxContent(props) {
         smsRegister={smsRegister}
         enableNewChannels={enableNewChannels}
         hideTestAndPreviewBtn={hideTestAndPreviewBtn}
-        eventContextTags={eventContextTags}
         />
       )}
       {isPreview && (
@@ -511,7 +508,6 @@ export function SlideBoxContent(props) {
           handleClose={handleClose}
           onCreateComplete={onCreateComplete}
           smsRegister={smsRegister}
-          eventContextTags={eventContextTags}
         />
       )}
       {isEditFTP && (
@@ -547,7 +543,6 @@ export function SlideBoxContent(props) {
             query,
             search: '',
           }}
-          eventContextTags={eventContextTags}
         />
       }
       {
@@ -578,7 +573,6 @@ export function SlideBoxContent(props) {
         onCreateComplete={onCreateComplete}
         smsRegister={smsRegister}
         onShowTemplates={onShowTemplates}
-        eventContextTags={eventContextTags}
       />
         )}
 
@@ -610,7 +604,6 @@ export function SlideBoxContent(props) {
         getCmsTemplatesInProgress={getCmsTemplatesInProgress}
         moduleType={moduleType}
         showLiquidErrorInFooter={showLiquidErrorInFooter}
-        eventContextTags={eventContextTags}
       />
         )}
       {(isEditEmailWithId || isEmailEditWithContent) && (
@@ -639,7 +632,6 @@ export function SlideBoxContent(props) {
         onTestContentClicked={onTestContentClicked}
         moduleType={moduleType}
         showLiquidErrorInFooter={showLiquidErrorInFooter}
-        eventContextTags={eventContextTags}
       />
         )}
       {isEditMPush &&
@@ -665,38 +657,35 @@ export function SlideBoxContent(props) {
           type={type}
           hideTestAndPreviewBtn={hideTestAndPreviewBtn}
           creativesMode={creativesMode}
-          eventContextTags={eventContextTags}
         />
         }
       {isCreateMPush &&
-        <MobilepushWrapper
-          key="creatives-mobilepush-wrapper"
-          date={new Date().getMilliseconds()}
-          setIsLoadingContent={setIsLoadingContent}
-          onMobilepushModeChange={onMobilepushModeChange}
-          mobilePushCreateMode={mobilePushCreateMode}
-          isGetFormData={isGetFormData}
-          getFormData={getFormData}
-          templateData={templateData}
-          type={type}
-          step={templateStep}
-          showNextStep={onCreateNextStep}
-          isFullMode={isFullMode}
-          onEnterTemplateName={onEnterTemplateName}
-          onRemoveTemplateName={onRemoveTemplateName}
-          cap={cap}
-          onResetStep={onResetStep}
-          showTemplateName={showTemplateName}
-          query={query}
-          forwardedTags={forwardedTags}
-          onValidationFail={onValidationFail}
-          selectedOfferDetails={selectedOfferDetails}
-          onPreviewContentClicked={onPreviewContentClicked}
-          hideTestAndPreviewBtn={hideTestAndPreviewBtn}
-          onTestContentClicked={onTestContentClicked}
-          eventContextTags={eventContextTags}
-        />
-      }
+      <MobilepushWrapper
+        key="creatives-mobilepush-wrapper"
+        date={new Date().getMilliseconds()}
+        setIsLoadingContent={setIsLoadingContent}
+        onMobilepushModeChange={onMobilepushModeChange}
+        mobilePushCreateMode={mobilePushCreateMode}
+        isGetFormData={isGetFormData}
+        getFormData={getFormData}
+        templateData={templateData}
+        type={type}
+        step={templateStep}
+        showNextStep={onCreateNextStep}
+        isFullMode={isFullMode}
+        onEnterTemplateName={onEnterTemplateName}
+        onRemoveTemplateName={onRemoveTemplateName}
+        cap={cap}
+        onResetStep={onResetStep}
+        showTemplateName={showTemplateName}
+        query={query}
+        forwardedTags={forwardedTags}
+        onValidationFail={onValidationFail}
+        selectedOfferDetails={selectedOfferDetails}
+        onPreviewContentClicked={onPreviewContentClicked}
+        hideTestAndPreviewBtn={hideTestAndPreviewBtn}
+        onTestContentClicked={onTestContentClicked}/>
+        }
       {
         isCreateFacebook && (
           <Facebook
@@ -713,7 +702,6 @@ export function SlideBoxContent(props) {
             fbAdManager={fbAdManager}
             onSelectTemplate={onSelectTemplate}
             orgUnitId={orgUnitId}
-            eventContextTags={eventContextTags}
           />
         )
       }
@@ -733,7 +721,6 @@ export function SlideBoxContent(props) {
             getFormSubscriptionData={getFormData}
             fbAdManager={fbAdManager}
             onSelectTemplate={onSelectTemplate}
-            eventContextTags={eventContextTags}
           />
         )
       }
@@ -755,7 +742,6 @@ export function SlideBoxContent(props) {
             selectedAccount={selectedAccount}
             handleClose={handleClose}
             selectedOfferDetails={selectedOfferDetails}
-            eventContextTags={eventContextTags}
           />
         )
       }
@@ -774,7 +760,6 @@ export function SlideBoxContent(props) {
             createNew
             handleClose={handleClose}
             selectedOfferDetails={selectedOfferDetails}
-            eventContextTags={eventContextTags}
           />
         )
       }
@@ -789,7 +774,6 @@ export function SlideBoxContent(props) {
           onShowTemplates={onShowTemplates}
           templateData={templateData}
           selectedOfferDetails={selectedOfferDetails}
-          eventContextTags={eventContextTags}
           createNew/>
       )}
 
@@ -806,13 +790,11 @@ export function SlideBoxContent(props) {
         onShowTemplates={onShowTemplates}
         templateData={templateData}
         selectedOfferDetails={selectedOfferDetails}
-        eventContextTags={eventContextTags}
         createNew/> }
 
       {isCreateWhatsapp && (<Whatsapp
         isFullMode={isFullMode}
         onCreateComplete={onCreateComplete}
-        eventContextTags={eventContextTags}
         handleClose={handleClose}/>
       )}
 
@@ -823,7 +805,6 @@ export function SlideBoxContent(props) {
         getDefaultTags={type}
         forwardedTags={forwardedTags}
         selectedOfferDetails={selectedOfferDetails}
-        eventContextTags={eventContextTags}
         params={{
           id: templateData._id,
         }}
@@ -847,7 +828,6 @@ export function SlideBoxContent(props) {
         isGetFormData={isGetFormData}
         templateData={templateData}
         getDefaultTags={type}
-        eventContextTags={eventContextTags}
       />
       )}
 
@@ -859,7 +839,6 @@ export function SlideBoxContent(props) {
         forwardedTags={forwardedTags}
         onCreateComplete={onCreateComplete}
         selectedOfferDetails={selectedOfferDetails}
-        eventContextTags={eventContextTags}
         params={{
           id: templateData._id,
         }}

package/v2Containers/CreativesContainer/index.js

@@ -1213,7 +1213,6 @@ export class Creatives extends React.Component {
       editor,
       smsRegister,
       enableNewChannels,
-      eventContextTags,
     } = this.props;
     const mapTemplateCreate =
       slidBoxContent === "createTemplate" &&
@@ -1314,7 +1313,6 @@ export class Creatives extends React.Component {
               moduleType={this.props.messageDetails?.type}
               showLiquidErrorInFooter={this.showLiquidErrorInFooter}
               creativesMode={creativesMode} // An existing prop that we're using here. Required to ensure correct account details in Edit or Preview in case of Embedded mode.
-              eventContextTags={eventContextTags}
           />
           }
           footer={this.shouldShowFooter() &&
@@ -1373,7 +1371,6 @@ Creatives.propTypes = {
   selectedAccount: PropTypes.object,
   strategy: PropTypes.string,
   orgUnitId: PropTypes.number,
-  eventContextTags: PropTypes.array,
 };
 const mapStatesToProps = () => createStructuredSelector({
   isLoading: isLoadingSelector(),

package/v2Containers/Email/index.js

@@ -2733,7 +2733,6 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
                   isEmailLoading={isLoading}
                   moduleType={moduleType}
                   showLiquidErrorInFooter={this.props.showLiquidErrorInFooter}
-                  eventContextTags={this.props?.eventContextTags}
               /> : ''}
             </Col>
           </Row>

package/v2Containers/EmailWrapper/index.js

@@ -215,7 +215,6 @@ export class EmailWrapper extends React.Component { // eslint-disable-line react
       currentOrgDetails,
       moduleType,
       showLiquidErrorInFooter,
-      eventContextTags,
     } = this.props;
     const {
       templateName,
@@ -288,7 +287,6 @@ export class EmailWrapper extends React.Component { // eslint-disable-line react
                 onTestContentClicked={onTestContentClicked}
                 editor={editor}
                 moduleType={moduleType}
-                eventContextTags={eventContextTags}
               />}
               {!isShowEmailCreate && (
                 <CmsTemplatesComponent
@@ -334,7 +332,6 @@ EmailWrapper.propTypes = {
   moduleType: PropTypes.string,
   onEnterTemplateName: PropTypes.func,
   onRemoveTemplateName: PropTypes.func,
-  eventContextTags: PropTypes.array,
 };
 
 const mapStateToProps = createStructuredSelector({

package/v2Containers/MobilePush/Create/index.js

@@ -1789,7 +1789,6 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
                 templateData={this.props.templateData}
                 hideTestAndPreviewBtn={this.props.hideTestAndPreviewBtn}
                 isFullMode={this.props.isFullMode}
-                eventContextTags={this.props?.eventContextTags}
               />
             </CapColumn>
             {this.props.iosCtasData && this.state.showIosCtaTable &&
@@ -1881,7 +1880,6 @@ Create.propTypes = {
   getFormLibraryData: PropTypes.func,
   onPreviewContentClicked: PropTypes.func,
   onTestContentClicked: PropTypes.func,
-  eventContextTags: PropTypes.array,
 };
 
 const mapStateToProps = createStructuredSelector({

package/v2Containers/MobilePush/Edit/index.js

@@ -36,6 +36,7 @@ import { MOBILE_PUSH } from '../../CreativesContainer/constants';
 import { getCdnUrl } from '../../../utils/cdnTransformation';
 import { MAPP_SDK } from './constants';
 import { isEmbeddedEditOrPreview } from '../../../utils/commonUtils';
+import { EMBEDDED } from '../../Whatsapp/constants';
 
 const PrefixWrapper = styled.div`
   margin-right: 16px;
@@ -110,27 +111,35 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     let selectedWeChatAccount = {};
     const queryType = String(get(this.props, 'location.query.type', ''))?.toLowerCase();
     const creativesMode = String(get(this.props, 'creativesMode', ''))?.toLowerCase();
+    const { Edit: EditProps, Templates } = this.props || {};
+    const { selectedWeChatAccount: editSelectedWeChatAccount, templateDetails } = EditProps || {};
+    const { id: selectedWeChatAccountId } = editSelectedWeChatAccount || {};
+    const { definition } = templateDetails || {};
+    const { accountId: templateAccountId } = definition || {};
+    const { Edit: nextEdit } = nextProps || {};
     if (isEmbeddedEditOrPreview(queryType, creativesMode)) {
-      selectedWeChatAccount = !_.isEmpty(this.props.Edit.selectedWeChatAccount)
-        ? this.props.Edit.selectedWeChatAccount
-        : nextProps.Edit.selectedWeChatAccount;
-    } else if (!_.isEmpty(this.props.Templates.selectedWeChatAccount)) {
-      selectedWeChatAccount = this.props.Templates.selectedWeChatAccount;
+      selectedWeChatAccount = !_.isEmpty(editSelectedWeChatAccount)
+        ? editSelectedWeChatAccount
+        : nextEdit?.selectedWeChatAccount;
+    } else if (!_.isEmpty(Templates?.selectedWeChatAccount)) {
+      selectedWeChatAccount = Templates?.selectedWeChatAccount;
     }
 
-    if (this.props.location.query.type === 'embedded' && !nextProps.Edit.fetchingWeCrmAccounts && !_.isEqual(this.props.Edit.weCrmAccounts, nextProps.Edit.weCrmAccounts) && (!selectedWeChatAccount || _.isEmpty(selectedWeChatAccount))) {
-      this.setMobilePushAccountOptions(nextProps.Edit.weCrmAccounts, get(this.props, "templateData.definition.accountId"));
+    if (queryType === EMBEDDED && !nextEdit?.fetchingWeCrmAccounts && !_.isEqual(EditProps?.weCrmAccounts, nextEdit?.weCrmAccounts) && (!selectedWeChatAccount || _.isEmpty(selectedWeChatAccount))) {
+      this.setMobilePushAccountOptions(nextEdit?.weCrmAccounts, get(this.props, "templateData.definition.accountId"));
     }
-    // Check if the query type is 'embedded' and the creatives mode is either 'edit' or 'preview'. Also, ensure that the selected WeChat account ID is not equal to the account ID in the template details.
-   // If all conditions are met, set the mobile push account options using the provided weCrmAccounts and the account ID from templateData.
-    if (isEmbeddedEditOrPreview(queryType, creativesMode) && !_.isEqual(this.props.Edit.selectedWeChatAccount?.id, this.props.Edit.templateDetails?.definition?.accountId)) {
-      this.setMobilePushAccountOptions(nextProps.Edit.weCrmAccounts, get(this.props, "templateData.definition.accountId"));
+    // Check if the current mode is either embedded edit or preview, and if the selected WeChat account ID,
+    // template account ID, and the next props' weCrmAccounts are available, and if fetchingWeCrmAccounts is false,
+    // and if the selected WeChat account ID is not equal to the template account ID.
+    // If all conditions are met, set the mobile push account options using the next props' weCrmAccounts and the template account ID.
+    if (isEmbeddedEditOrPreview(queryType, creativesMode) && nextEdit?.weCrmAccounts && templateAccountId && selectedWeChatAccountId && !_.isEqual(selectedWeChatAccountId, templateAccountId)) {
+      this.setMobilePushAccountOptions(nextEdit?.weCrmAccounts, templateAccountId);
     }
-    if (!_.isEmpty(nextProps.Edit.selectedWeChatAccount) && !_.isEqual(this.props.Edit.selectedWeChatAccount, nextProps.Edit.selectedWeChatAccount) && (this.props.location.query.type === 'embedded') && this.props.location.query.module === "loyalty") {
+    if (!_.isEmpty(nextEdit?.selectedWeChatAccount) && !_.isEqual(editSelectedWeChatAccount, nextEdit?.selectedWeChatAccount) && (queryType === EMBEDDED) && this.props.location.query.module === "loyalty") {
       const params = {
         name: '',
         sortBy: 'Most Recent',
-        accountId: nextProps.Edit.selectedWeChatAccount.id,
+        accountId: nextEdit?.selectedWeChatAccount?.id,
       };
       this.props.actions.getMobilepushTemplatesList('mobilepush', params);
     }
@@ -159,7 +168,6 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
         this.setTemplateOptions(nextProps.Edit.mobilepushTemplates);
       }
     }
-
     this.handleEditSchemaOnPropsChange(nextProps, selectedWeChatAccount);
     if (nextProps.Edit.uploadedAssetData) {
       const formData = _.cloneDeep(this.state.formData);
@@ -1924,7 +1932,6 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
                 templateData={this.props.templateData}
                 hideTestAndPreviewBtn={this.props.hideTestAndPreviewBtn}
                 isFullMode={this.props.isFullMode}
-                eventContextTags={this.props?.eventContextTags}
               />}
             </CapColumn>
             {this.props.iosCtasData && this.state.showIosCtaTable &&
@@ -2020,7 +2027,6 @@ Edit.propTypes = {
   onPreviewContentClicked: PropTypes.func,
   onTestContentClicked: PropTypes.func,
   creativesMode: PropTypes.string,
-  eventContextTags: PropTypes.array,
 };
 
 const mapStateToProps = createStructuredSelector({

package/v2Containers/MobilepushWrapper/index.js

@@ -72,9 +72,7 @@ export class MobilepushWrapper extends React.Component { // eslint-disable-line
   }
 
   render() {
-    const {mobilePushCreateMode, step, getFormData, setIsLoadingContent, isGetFormData, query, isFullMode, showTemplateName, type, onValidationFail, onPreviewContentClicked, onTestContentClicked, templateData, 
-      eventContextTags,
-    } = this.props;
+    const {mobilePushCreateMode, step, getFormData, setIsLoadingContent, isGetFormData, query, isFullMode, showTemplateName, type, onValidationFail, onPreviewContentClicked, onTestContentClicked, templateData} = this.props;
     const {templateName} = this.state;
     const isShowMobilepushCreate = !isEmpty(mobilePushCreateMode);
     return (
@@ -121,7 +119,6 @@ export class MobilepushWrapper extends React.Component { // eslint-disable-line
               onTestContentClicked={onTestContentClicked}
               templateData={templateData}
               hideTestAndPreviewBtn={this.props.hideTestAndPreviewBtn}
-              eventContextTags={eventContextTags}
           />
 
 
@@ -147,7 +144,6 @@ MobilepushWrapper.propTypes = {
   showTemplateName: PropTypes.func,
   type: PropTypes.string,
   onValidationFail: PropTypes.func,
-  eventContextTags: PropTypes.array,
 };
 
 

package/v2Containers/Sms/Create/index.js

@@ -989,7 +989,6 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
                 selectedOfferDetails={this.props.selectedOfferDetails}
                 onTestContentClicked={this.props.onTestContentClicked}
                 onPreviewContentClicked={this.props.onPreviewContentClicked}
-                eventContextTags={this.props?.eventContextTags}
               />
             </CapColumn>
           </CapRow>
@@ -1016,7 +1015,6 @@ Create.propTypes = {
   getFormSubscriptionData: PropTypes.func,
   isLoadingMetaEntities: PropTypes.bool,
   selectedOfferDetails: PropTypes.array,
-  eventContextTags: PropTypes.array,
 };
 
 const mapStateToProps = createStructuredSelector({

package/v2Containers/Sms/Edit/index.js

@@ -987,7 +987,6 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
                 selectedOfferDetails={this.props.selectedOfferDetails}
                 onPreviewContentClicked={this.props.onPreviewContentClicked}
                 onTestContentClicked={this.props.onTestContentClicked}
-                eventContextTags={this.props.eventContextTags}
               />
             </CapColumn>
           </CapRow>
@@ -1017,7 +1016,6 @@ Edit.propTypes = {
   // route: PropTypes.object,
   injectedTags: PropTypes.object,
   selectedOfferDetails: PropTypes.array,
-  eventContextTags: PropTypes.array,
 };
 
 const mapStateToProps = createStructuredSelector({

package/v2Containers/SmsTrai/Edit/index.js

@@ -71,7 +71,6 @@ export const SmsTraiEdit = (props) => {
     getFormSubscriptionData,
     templateData = {},
     selectedOfferDetails,
-    eventContextTags,
   } = props || {};
   const { formatMessage } = intl;
   const [loading, updateLoading] = useState(true);
@@ -570,7 +569,6 @@ export const SmsTraiEdit = (props) => {
                     injectedTags={injectedTags || {}}
                     hidePopover={disablehandler()}
                     selectedOfferDetails={selectedOfferDetails}
-                    eventContextTags={eventContextTags}
                   />
                 }
               />

package/v2Containers/SmsWrapper/index.js

@@ -29,7 +29,6 @@ const SmsWrapper = (props) => {
     handleClose,
     smsRegister,
     onShowTemplates,
-    eventContextTags,
   } = props;
 
   const smsProps = {
@@ -45,7 +44,6 @@ const SmsWrapper = (props) => {
     selectedOfferDetails,
     onPreviewContentClicked,
     onTestContentClicked,
-    eventContextTags,
   };
   const isTraiDlt = isTraiDLTEnable(isFullMode, smsRegister);
   return <>

package/v2Containers/TagList/index.js

@@ -22,7 +22,6 @@ import './_tagList.scss';
 import { selectCurrentOrgDetails, makeSelectFetchingSchemaError } from '../Cap/selectors';
 import { injectIntl } from 'react-intl';
 import { scope } from './messages';
-import messages from './messages';
 import { handleInjectedData, hasGiftVoucherFeature, hasPromoFeature, hasBadgesFeature, transformBadgeTags } from '../../utils/common';
 import { GIFT_VOUCHER_RELATED_TAGS, PROMO_ENGINE_RELATED_TAGS, BADGES_RELATED_TAGS, BADGES_ENROLL, BADGES_ISSUE } from '../../containers/App/constants';
 
@@ -84,9 +83,7 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
   generateTags = (props) => {
     let tags = {};
     let injectedTags = {};
-    const eventContextTagsObj = {};
-
-    const {selectedOfferDetails, eventContextTags } = props;
+    const {selectedOfferDetails } = props;
     if (props.injectedTags && !_.isEmpty(props.injectedTags)) {
       const formattedInjectedTags = handleInjectedData(
         props.injectedTags,
@@ -104,28 +101,7 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
         this.transformCouponTags(selectedOfferDetails, tags);
       }
     }
-    if (eventContextTags?.length) {
-      const TAG_HEADER_MSG_LABEL = this.props.intl.formatMessage(messages.tagsBasedOnEntryTriggerEvent);
-      eventContextTagsObj.EventContextTags = {
-        name: TAG_HEADER_MSG_LABEL,
-        desc: TAG_HEADER_MSG_LABEL,
-        resolved: true,
-        'tag-header': true,
-        subtags: {},
-      };
-      eventContextTags.forEach((tag) => {
-        if (tag?.tagName) {
-          eventContextTagsObj.EventContextTags.subtags[tag?.tagName] = {
-              name: tag?.tagName,
-              desc: tag?.tagName,
-              resolved: true
-          }
-        }
-      });
-    }
-    console.log("Test >>> generateTags ", {eventTags: this.props.eventContextTags, eventContextTagsObj, tags, injectedTags});
-    this.setState({tags: _.merge( {}, tags, injectedTags, eventContextTagsObj )});
-    // this.setState({tags: _.merge( {}, tags, injectedTags)});
+    this.setState({tags: _.merge( {}, tags, injectedTags)});
   }
   populateTags(tagsList) {
     const mainTags = {};
@@ -342,7 +318,6 @@ TagList.propTypes = {
   channel: PropTypes.string,
   disabled: PropTypes.bool,
   fetchingSchemaError: PropTypes.bool,
-  eventContextTags: PropTypes.array,
 };
 
 const mapStateToProps = createStructuredSelector({

package/v2Containers/TagList/messages.js

@@ -11,8 +11,4 @@ export default defineMessages({
     id: `${scope}.header`,
     defaultMessage: 'This is TagList container !',
   },
-  tagsBasedOnEntryTriggerEvent: {
-    id: `${scope}.tagsBasedOnEntryTriggerEvent`,
-    defaultMessage: 'Tags based on entry trigger event',
-  },
 });

package/v2Containers/Viber/index.js

@@ -71,7 +71,6 @@ export const Viber = (props) => {
     viberData = {},
     selectedOfferDetails = [],
     currentOrgDetails,
-    eventContextTags,
   } = props || {};
 
   const { formatMessage } = intl;
@@ -271,7 +270,6 @@ export const Viber = (props) => {
           id={"viber_tags"}
           userLocale={localStorage.getItem("jlocale") || "en"}
           selectedOfferDetails={selectedOfferDetails}
-          eventContextTags={eventContextTags}
         />
       </CapColumn>
       <div className="viber-textarea-wrapper">

package/v2Containers/Whatsapp/index.js

@@ -128,8 +128,7 @@ export const Whatsapp = (props) => {
     loadingTags,
     getFormData,
     selectedOfferDetails,
-    currentOrgDetails,
-    eventContextTags,
+    currentOrgDetails
   } = props || {};
   const { formatMessage } = intl;
   const { TextArea } = CapInput;
@@ -502,7 +501,6 @@ export const Whatsapp = (props) => {
           injectedTagsParams: injectedTags,
           location,
           tagModule: getDefaultTags,
-          eventContextTags,
         }) || {};
       const unsupportedTagsLengthCheck =
         validationResponse?.unsupportedTags?.length > 0;
@@ -2053,7 +2051,6 @@ const isAuthenticationTemplate = isEqual(templateCategory, WHATSAPP_CATEGORIES.a
                 onContextChange={handleOnTagsContextChange}
                 injectedTags={injectedTags || {}}
                 selectedOfferDetails={selectedOfferDetails}
-                eventContextTags={eventContextTags}
               />
             )
           }

package/v2Containers/Zalo/index.js

@@ -65,7 +65,6 @@ export const Zalo = (props) => {
     injectedTags,
     getFormData,
     selectedOfferDetails,
-    eventContextTags,
   } = props || {};
   const {hostName = ''} = senderDetails;
   const { formatMessage } = intl;
@@ -256,7 +255,6 @@ export const Zalo = (props) => {
         injectedTagsParams: injectedTags,
         location,
         tagModule: getDefaultTags,
-        eventContextTags,
       }) || {};
     const { unsupportedTags = [], isBraceError } = tagValidationResponse;
     let tagError = '';
@@ -446,7 +444,6 @@ export const Zalo = (props) => {
                     injectedTags={injectedTags || {}}
                     selectedOfferDetails={selectedOfferDetails}
                     disabled={isFullMode}
-                    eventContextTags={eventContextTags}
                   />
                 }
               />