@capillarytech/creatives-library 8.0.271 → 8.0.272

package/v2Containers/SmsTrai/Edit/tests/__snapshots__/index.test.js.snap

@@ -2281,6 +2281,7 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
+        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -13480,6 +13481,7 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
+        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -24425,6 +24427,7 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
+        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -35370,6 +35373,7 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
+        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],

package/v2Containers/TagList/index.js

@@ -40,6 +40,7 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
       tags: [],
       tagsError: false,
       currentContext: null, // Track current context to detect changes
+      hasTriggeredInitialApiCall: false, // Track if we've triggered API call when popover opens
     };
     this.renderTags = this.renderTags.bind(this);
     this.populateTags = this.populateTags.bind(this);
@@ -51,6 +52,14 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
 
   componentDidMount() {
     this.generateTags(this.props);
+    // Trigger initial API call if tags are empty (similar to Email/SMS behavior)
+    const { tags, injectedTags, onContextChange } = this.props;
+    const hasNoTags = (!tags || tags.length === 0) && _.isEmpty(injectedTags);
+    if (hasNoTags && onContextChange) {
+      // Trigger API call with default 'Outbound' context to match CapTagList default
+      // This ensures tags are loaded when component mounts
+      this.getTagsforContext('Outbound');
+    }
   }
 
   componentWillReceiveProps(nextProps) {
@@ -59,23 +68,27 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
     // 2. Context change is happening (detected by different tag arrays)
     const { injectedTags: currentInjectedTags, tags: currentTags } = this.props;
     const { injectedTags: nextInjectedTags, tags: nextTags, fetchingSchemaError } = nextProps;
-    
+
     const isInitialLoad = _.isEmpty(currentInjectedTags) && _.isEmpty(currentTags);
     const isContextChange = !_.isEqual(nextTags, currentTags) && !_.isEmpty(currentTags);
-    
+
     if (isInitialLoad || isContextChange) {
       this.setState({loading: true});
     }
-    
+
     // Only reset loading for injectedTags changes if we're not currently loading due to context change
     if (!_.isEqual(nextInjectedTags, currentInjectedTags) && !this.state.loading) {
       this.setState({loading: false});
       this.clearLoadingTimeout();
     }
-    
+
     if (!_.isEqual(nextTags, currentTags)) {
       this.setState({loading: false});
       this.clearLoadingTimeout();
+      // Reset the flag when tags are received, so we can trigger API call again if needed
+      if (nextTags && nextTags.length > 0) {
+        this.setState({ hasTriggeredInitialApiCall: false });
+      }
     }
     if (fetchingSchemaError) {
       this.setState({tagsError: fetchingSchemaError, loading: false});
@@ -86,7 +99,7 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
   componentDidUpdate(prevProps) {
     const { tags, injectedTags, selectedOfferDetails } = this.props;
     const { tags: prevTags, injectedTags: prevInjectedTags, selectedOfferDetails: prevSelectedOfferDetails } = prevProps;
-    
+
     if (tags !== prevTags || injectedTags !== prevInjectedTags || selectedOfferDetails !== prevSelectedOfferDetails) {
       this.generateTags(this.props);
     }
@@ -111,17 +124,44 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
   getTagsforContext = (data) => {
     // Set loading state when context change is requested
     this.setState({loading: true, currentContext: data});
-    
+
     // Set a timeout to prevent infinite loading (fallback safety)
     this.clearLoadingTimeout();
     this.loadingTimeout = setTimeout(() => {
       this.setState({loading: false});
     }, 5000); // Reduced timeout to 5 seconds for better UX
-    
+
     const { onContextChange } = this.props;
-    onContextChange(data);
+    // Always call onContextChange if available - this triggers the API call
+    // The API call will fetch tags from /meta/TAG endpoint
+    if (onContextChange) {
+      onContextChange(data);
+    } else {
+      console.warn('TagList: onContextChange is not available. API call will not be triggered.');
+    }
   }
 
+  handlePopoverVisibilityChange = (visible) => {
+    // When popover opens, trigger API call if tags are empty or if we haven't triggered it yet
+    // This ensures API call happens when user clicks "Add Label" button
+    if (visible && this.props.onContextChange) {
+      const { tags, injectedTags } = this.props;
+      // Check if tags array is empty or if state tags are empty
+      const hasNoTags = (!tags || tags.length === 0) && _.isEmpty(injectedTags);
+      const hasNoStateTags = _.isEmpty(this.state.tags);
+      const hasNotTriggeredApiCall = !this.state.hasTriggeredInitialApiCall;
+
+      // Trigger API call if tags are not loaded yet OR if we haven't triggered it yet
+      if ((hasNoTags || hasNoStateTags || hasNotTriggeredApiCall)) {
+        // Mark that we've triggered the API call
+        this.setState({ hasTriggeredInitialApiCall: true });
+        // Trigger API call with default 'Outbound' context to match CapTagList default
+        // This will call onContextChange which triggers handleOnTagsContextChange in InApp
+        this.getTagsforContext('Outbound');
+      }
+    }
+  };
+
   generateTags = (props) => {
     let tags = {};
     let injectedTags = {};
@@ -149,11 +189,11 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
     if (eventContextTags?.length) {
       const TAG_HEADER_MSG_LABEL = this.props.intl.formatMessage(messages.entryEvent);
       eventContextTagsObj.eventContextTags = {
-        name: TAG_HEADER_MSG_LABEL,
-        desc: TAG_HEADER_MSG_LABEL,
-        resolved: true,
+        "name": TAG_HEADER_MSG_LABEL,
+        "desc": TAG_HEADER_MSG_LABEL,
+        "resolved": true,
         'tag-header': true,
-        subtags: {},
+        "subtags": {},
       };
 
       eventContextTags.forEach((tag) => {
@@ -164,11 +204,11 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
         // Initializing the tags profile if it doesn't exist
         if (!eventContextTagsObj?.eventContextTags?.subtags?.[profileId]) {
           eventContextTagsObj.eventContextTags.subtags[profileId] = {
-            name: profileName,
-            desc: profileName,
-            resolved: true,
+            "name": profileName,
+            "desc": profileName,
+            "resolved": true,
             'tag-header': true,
-            subtags: {},
+            "subtags": {},
           };
         }
         // Adding the current tag to the profile group
@@ -201,7 +241,7 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
     _.forEach(tagsList, (temp) => {
       const tag = temp.definition;
       const { intl } = this.props;
-    const { locale: userLocale } = intl || {};
+      const { locale: userLocale } = intl || {};
 
       // Check if the tag.value should be skipped based on feature control
       if (_.includes(excludedTags, tag.value)) {
@@ -209,8 +249,8 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
       }
       if (!tag['tag-header']) {
         mainTags[tag.value] = {
-          "name": tag?.label[userLocale] ? tag?.label[userLocale] : tag?.label?.en,
-          "desc": tag?.label[userLocale] ? tag?.label[userLocale] : tag?.label?.en,
+          name: tag?.label[userLocale] ? tag?.label[userLocale] : tag?.label?.en,
+          desc: tag?.label[userLocale] ? tag?.label[userLocale] : tag?.label?.en,
         };
       } else if (tag['tag-header'] && mainTags[tag.value]) {
         mainTags[tag.value].subtags = _.concat(mainTags[tag.value].subtags, tag.subtags);
@@ -366,12 +406,14 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
           visibleTaglist={this.props.visibleTaglist}
           hidePopover={this.props.hidePopover}
           onContextChange={this.getTagsforContext}
+          onVisibleChange={this.handlePopoverVisibilityChange}
           moduleFilterEnabled={this.props.moduleFilterEnabled}
           modalProps={this.props.modalProps}
           currentOrgDetails={this.props.currentOrgDetails}
           channel={this.props.channel}
           disabled={this.props.disabled}
           fetchingSchemaError={this?.state?.tagsError}
+          popoverPlacement={this.props.popoverPlacement}
         />
       </div>
     );
@@ -402,6 +444,7 @@ TagList.propTypes = {
   disabled: PropTypes.bool,
   fetchingSchemaError: PropTypes.bool,
   eventContextTags: PropTypes.array,
+  popoverPlacement: PropTypes.string,
   intl: PropTypes.shape({
     formatMessage: PropTypes.func.isRequired,
     locale: PropTypes.string,

package/v2Containers/Templates/_templates.scss

@@ -316,6 +316,64 @@
           }
         }
       }
+    .INAPP {
+      margin-bottom: $CAP_SPACE_12;
+      .inapp-container {
+        margin-top: $CAP_SPACE_24;
+      }
+      // Modal Layout - centered
+      .inapp-modal-layout {
+        position: absolute;
+        display: flex;
+        width: 12rem;
+        top: 10%;
+        left: 10%;
+        bottom: 5%;
+        overflow: hidden;
+        background-color: $CAP_WHITE;
+        border-radius: $CAP_SPACE_08;
+    }
+    
+    // Full Screen Layout
+    .inapp-fullscreen-layout {
+      position: absolute;
+      display: flex;
+      width: 12rem;
+      left: 10%;
+      top: 1%;
+      bottom: 1%;
+      overflow: hidden;
+      background-color: $CAP_WHITE;
+      border-radius: $CAP_SPACE_08;
+    }
+    
+    // Top Banner Layout
+    .inapp-top-banner-layout {
+      position: absolute;
+      display: flex;
+      width: 12rem;
+      left: 10%;
+      top: 1%;
+      bottom: 20%;
+      overflow: hidden;
+      background-color: $CAP_WHITE;
+      border-radius: $CAP_SPACE_08;
+    }
+    
+    // Bottom Banner Layout
+    .inapp-bottom-banner-layout {
+      position: absolute;
+      display: flex;
+      justify-content: center;
+      width: 12rem;
+      left: 10%;
+      top: 50%;
+      bottom: 2%;
+      overflow: hidden;
+      background-color: $CAP_WHITE;
+      border-radius: $CAP_SPACE_08;
+    }
+    }
   }
 
   .WEBPUSH {
@@ -897,7 +955,8 @@
 }
 
 .whatsapp-filters,
-.zalo-filters {
+.zalo-filters,
+.inapp-filters {
   display: flex;
   width: 100%;
   padding-left: 8px;

package/v2Containers/Templates/index.js

@@ -128,13 +128,14 @@ import {
   VIDEO,
   GIF,
 } from '../Whatsapp/constants';
-import { INAPP_LAYOUT_DETAILS } from '../InApp/constants';
+import { INAPP_LAYOUT_DETAILS, INAPP_MESSAGE_LAYOUT_TYPES, INAPP_MEDIA_TYPES, BIG_HTML, ANDROID, IOS } from '../InApp/constants';
 import { ZALO_STATUS_OPTIONS, ZALO_STATUSES } from '../Zalo/constants';
 import { getWhatsappContent, getWhatsappStatus, getWhatsappCategory, getWhatsappCta, getWhatsappQuickReply, getWhatsappAutoFill, getWhatsappCarouselButtonView } from '../Whatsapp/utils';
 import { getRCSContent } from '../Rcs/utils';
 import {RCS_STATUSES} from '../Rcs/constants';
 import zaloMessages from '../Zalo/messages';
 import rcsMessages from '../Rcs/messages';
+import inAppMessages from '../InApp/messages';
 import globalMessages from '../../v2Containers/Cap/messages';
 import { handlePreviewInNewTab } from '../../utils/common';
 
@@ -204,6 +205,29 @@ const SMS_FILTERS = {
   SERVICE_IMPLICIT: 'implicit',
 };
 
+const INAPP_LAYOUT_OPTIONS = [
+  {
+    key: 'popup',
+    value: INAPP_MESSAGE_LAYOUT_TYPES.MODAL,
+    label: <FormattedMessage {...inAppMessages.layoutModal} />,
+  },
+  {
+    key: 'topBanner',
+    value: INAPP_MESSAGE_LAYOUT_TYPES.TOPBANNER,
+    label: <FormattedMessage {...inAppMessages.layoutTopBanner} />,
+  },
+  {
+    key: 'bottomBanner',
+    value: INAPP_MESSAGE_LAYOUT_TYPES.BOTTOMBANNER,
+    label: <FormattedMessage {...inAppMessages.layoutBottomBanner} />,
+  },
+  {
+    key: 'fullScreen',
+    value: INAPP_MESSAGE_LAYOUT_TYPES.FULLSCREEN,
+    label: <FormattedMessage {...inAppMessages.layoutFullScreen} />,
+  },
+];
+
 const WHATSAPP_LOWERCASE = WHATSAPP.toLowerCase();
 const RCS_LOWERCASE = RCS.toLowerCase();
 const SMS_LOWERCASE = SMS.toLowerCase();
@@ -255,6 +279,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       selectedWhatsappStatus: '',
       selectedWhatsappCategory: '',
       selectedZaloStatus: '',
+      selectedInAppLayout: '',
       hostName: '',
       searchedZaloTemplates: [],
       searchingZaloTemplate: false,
@@ -1759,6 +1784,19 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     return templates;
   }
 
+  filterInAppTemplates = (templates) => {
+    const { selectedInAppLayout } = this.state;
+    if (!selectedInAppLayout) {
+      return templates;
+    }
+    return templates.filter((template) => {
+      const androidBodyType = get(template, 'versions.base.content.ANDROID.bodyType');
+      const iosBodyType = get(template, 'versions.base.content.IOS.bodyType');
+      const inappBodyType = androidBodyType || iosBodyType;
+      return inappBodyType === selectedInAppLayout;
+    });
+  }
+
   filterSMSTemplates = (templates) => {
     const { smsFilter } = this.state;
     if (SMS_FILTERS.ALL === smsFilter) {
@@ -1845,6 +1883,9 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       case ZALO:
         filteredTemplates = this.filterZaloTemplates(templates);
         break;
+      case INAPP:
+        filteredTemplates = this.filterInAppTemplates(templates);
+        break;
       default:
         break;
     }
@@ -2134,9 +2175,12 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
             templateData.isNewMobilePush = commonUtil.hasNewMobilePushFeatureEnabled();
           }
           break;
-        case INAPP:
+        case INAPP: {
+          // Pass the full template object to CapCustomCard so getInAppContent can extract the data
+          // Similar to how MOBILE_PUSH passes the full template when new feature is enabled
           templateData.content = template;
           break;
+        }
         case WECHAT:
           templateData.content = this.prepareWeChatPreviewData(template);
           break;
@@ -2514,7 +2558,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
 return (<div>
       {[WECHAT, MOBILE_PUSH, WEBPUSH, INAPP, WHATSAPP, ZALO, RCS].includes(currentChannel) && this.showAccountName()}
       {filterContent}
-      {[WHATSAPP, ZALO,RCS].includes(currentChannel) && this.selectedFilters()}
+      {[WHATSAPP, ZALO, INAPP,RCS].includes(currentChannel) && this.selectedFilters()}
         {<div>
           {!isEmpty(filteredTemplates) || !isEmpty(this.state.searchText) || !isEmpty(this.props.Templates.templateError) ? (
             <div className={!isEmpty(this.state.searchText) && isEmpty(cardDataList) ? '' : this.isFullMode() ? "v2-pagination-container" : "v2-pagination-container-half"}>
@@ -2729,6 +2773,9 @@ return (<div>
 
   prepareWeChatMappedPreviewData(content, templateTags, tagData) {
     let formattedContent = cloneDeep(content);
+    if (!formattedContent || typeof formattedContent !== 'string') {
+      return formattedContent || '';
+    }
     forEach(templateTags, (tag) => {
       if (tagData[tag].value !== undefined) {
         formattedContent = formattedContent.replace(`{{${tag}.DATA}}`, tagData[tag].value);
@@ -3981,14 +4028,19 @@ return (<div>
   }
 
   removeZaloFilter = () => this.setState({ selectedZaloStatus: null });
+  removeInAppLayoutFilter = () => this.setState({ selectedInAppLayout: '' });
 
   selectedFilters = () => {
-    const { selectedWhatsappStatus, selectedWhatsappCategory, selectedZaloStatus } = this.state;
+    const { selectedWhatsappStatus, selectedWhatsappCategory, selectedZaloStatus, selectedInAppLayout } = this.state;
     const {
       intl: {
         formatMessage,
       },
     } = this.props;
+    const getInAppLayoutLabel = (layoutValue) => {
+      const layoutOption = INAPP_LAYOUT_OPTIONS.find(opt => opt.value === layoutValue);
+      return layoutOption ? layoutOption.label : layoutValue;
+    };
     return (
       <CapRow type="flex" align="middle" className="selected-whatsapp-filters">
         {
@@ -4023,6 +4075,23 @@ return (<div>
             </CapTag>
           ) : null
         }
+        {
+          selectedInAppLayout ? (
+            <CapTag closable onClose={this.removeInAppLayoutFilter}>
+              {formatMessage(messages.layout)}: {getInAppLayoutLabel(selectedInAppLayout)}
+            </CapTag>
+          ) : null
+        }
+        {
+          selectedInAppLayout ? (
+            <CapLink
+              onClick={() => {
+                this.removeInAppLayoutFilter();
+              }}
+              title={this.props.intl.formatMessage(messages.clearAll)}
+            />
+          ) : null
+        }
       </CapRow>
     );
   }
@@ -4033,6 +4102,7 @@ return (<div>
   setLineFilter = (e) => this.setState({lineFilter: e.target.value});
   setSMSFilter = (e) => this.setState({smsFilter: e.target.value});
   setZaloStatus = (value) => this.setState({selectedZaloStatus: value?.item?.props?.value});
+  setInAppLayout = (value) => this.setState({selectedInAppLayout: value?.item?.props?.value});
 
   openCreativesFullMode = () => {
     const channelLowerCase = this.state.channel.toLowerCase();
@@ -4285,6 +4355,21 @@ return (<div>
           )
           : () => null
       }
+      {
+        channel.toUpperCase() === INAPP && (
+          <div className="inapp-filters">
+            <CapSelectFilter
+              placement="bottomLeft"
+              data={INAPP_LAYOUT_OPTIONS}
+              onSelect={this.setInAppLayout}
+              selectedValue={this.state.selectedInAppLayout}
+              placeholder="Layout"
+              showBadge
+              width="120px"
+            />
+          </div>
+        )
+      }
       <div style={{display: "flex", justifyContent: "space-between", alignItems: 'center'}}>
         {
           this.state?.channel?.toLowerCase() === WHATSAPP_LOWERCASE && (isWhatsappCountExeeded)? (

package/v2Containers/Templates/messages.js

@@ -558,6 +558,10 @@ export default defineMessages({
     id: `${scope}.rcsOnlyApprovedTemplates`,
     defaultMessage: 'Only "Approved" templates are available here, as you can use those templates to create a message.',
   },
+  "layout": {
+    id: `${scope}.layout`,
+    defaultMessage: `Layout`,
+  },
   "status": {
     id: `${scope}.status`,
     defaultMessage: 'Status',

package/v2Containers/TemplatesV2/TemplatesV2.style.js

@@ -14,8 +14,10 @@ export default css`
       margin: 0 auto;
       width: 100%;
       padding: ${CAP_SPACE_24} 0;
-      .ant-tabs-content{
-        margin-top: ${CAP_SPACE_16}
+      /* Only main channel tabs content, not HTML Editor validation panel tabs */
+      > .cap-tab-v2 > .ant-tabs-content-holder > .ant-tabs-content,
+      > .cap-tab-v2 > .ant-tabs-content {
+        margin-top: ${CAP_SPACE_16};
       }
     ` : `.cap-tab-v2 {
       height: calc(100vh - 11.25rem);