@capillarytech/creatives-library 8.0.345-alpha.12 → 8.0.345-alpha.13

package/v2Containers/Sms/Create/index.js

@@ -33,10 +33,6 @@ import injectReducer from '../../../utils/injectReducer';
 import v2SmsCreateReducer from './reducer';
 import * as globalActions from '../../Cap/actions';
 import TestAndPreviewSlidebox from '../../../v2Components/TestAndPreviewSlidebox';
-import {
-  getSmsEmbeddedFooterValidity,
-  getSmsMessageFromFormData,
-} from '../smsFormDataHelpers';
 
 export class Create extends React.Component { // eslint-disable-line react/prefer-stateless-function
   constructor(props) {
@@ -57,11 +53,6 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
       isTestAndPreviewMode: false,
       pendingGetFormData: false,
     };
-    // Tracks the last validity value reported to SmsFallback so componentDidUpdate
-    // does not dispatch on every render and create an infinite update loop.
-    // Intentionally undefined (not true) so the first render always reports the
-    // real validity rather than assuming the form starts invalid.
-    this._lastReportedSmsFooterInvalid = undefined;
     this.saveFormData = this.saveFormData.bind(this);
     this.onFormDataChange = this.onFormDataChange.bind(this);
     this.onTemplateNameChange = this.onTemplateNameChange.bind(this);
@@ -168,9 +159,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
           layout: 'SMS',
           type: 'TAG',
           context: this.props.location.query.type === 'embedded' ? this.props.location.query.module : 'default',
-          embedded: this.props.forceFullTagContext
-            ? 'full'
-            : (this.props.location.query.type === 'embedded' ? this.props.location.query.type : 'full'),
+          embedded: this.props.location.query.type === 'embedded' ? this.props.location.query.type : 'full',
         };
         if (this.props.getDefaultTags) {
           query.context = this.props.getDefaultTags;
@@ -183,22 +172,6 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     }
   }
 
-  componentDidUpdate() {
-    if (!this.props.embeddedSmsFallback || typeof this.props.onEmbeddedSmsFooterValidity !== 'function') {
-      return;
-    }
-    const validity = getSmsEmbeddedFooterValidity(this.state.formData, this.state.tabCount);
-    const isInvalid = !!validity.isTemplateNameEmpty || !!validity.isMessageEmpty;
-    // Only dispatch when the validity value changes. Dispatching unconditionally caused
-    // an infinite loop: componentDidUpdate → dispatch → SmsFallback re-render →
-    // SmsCreate re-render → componentDidUpdate → ... even when state was unchanged.
-    // The instance variable handles both reference-based and mutation-based FormBuilder
-    // updates: validity is recomputed from current formData content, not by reference.
-    if (this._lastReportedSmsFooterInvalid === isInvalid) return;
-    this._lastReportedSmsFooterInvalid = isInvalid;
-    this.props.onEmbeddedSmsFooterValidity(validity);
-  }
-
   componentWillUnmount() {
     if (this.pendingGetFormDataTimeout) {
       clearTimeout(this.pendingGetFormDataTimeout);
@@ -302,10 +275,6 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     }
     const result = {};
     result.base = baseData;
-    /* Root field used by FormBuilder; embedded getFormSubscriptionData reads value.base */
-    if (formData['template-name'] !== undefined) {
-      result.base['template-name'] = formData['template-name'];
-    }
     if (this.state.isValid) {
       const msgObj = charCount.updateCharCount(baseData['sms-editor']);
       result.base.msg_count = msgObj.msgCount;
@@ -912,9 +881,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
       layout: 'SMS',
       type: 'TAG',
       context: (data && data.toLowerCase() === 'all') ? 'default' : (data && data.toLowerCase()),
-      embedded: this.props.forceFullTagContext
-        ? 'full'
-        : (this.props.location.query.type === 'embedded' ? this.props.location.query.type : 'full'),
+      embedded: this.props.location.query.type === 'embedded' ? this.props.location.query.type : 'full',
     };
     this.props.globalActions.fetchSchemaForEntity(query);
   }
@@ -922,29 +889,11 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
   removeStandAlone() {
     const schema = _.cloneDeep(this.state.schema);
     const childSections = _.get(schema, 'standalone.sections[0].childSections');
-    if (childSections) {
-      /* In-form Save / Test row (index 2) only exists when the schema has > 2 sections. */
-      if (childSections.length > 2) {
-        childSections.splice(2, 1);
-      }
-      /*
-       * Creatives library drops the standalone template-name block because `SlideBoxHeader`
-       * shows the name. This is independent of the section count — guard it separately so
-       * it still runs even when childSections.length <= 2 (e.g. schema arrives pre-trimmed).
-       * RCS SMS fallback uses the same slidebox footer but keeps the name in the form.
-       */
-      if (!this.props.embeddedSmsFallback) {
-        const fields = _.get(childSections, '[1].childSections[0].childSections');
-        if (fields && fields.length > 0) {
-          fields.splice(0, 1);
-          _.set(childSections, '[1].childSections[0].childSections', fields);
-        }
-      }
-      _.set(schema, 'standalone.sections[0].childSections', childSections);
-    }
-    // Always increment loadingStatus — isSmsLoading() requires >= 2 in library mode
-    // (isFullMode=false). The early return previously skipped this, leaving the
-    // spinner stuck forever when the schema had <= 2 childSections.
+    childSections.splice(2, 1);
+    const fields = _.get(childSections, '[1].childSections[0].childSections');//removing template name section
+    fields.splice(0, 1);
+    _.set(childSections, '[1].childSections[0].childSections', fields);
+    _.set(schema, 'standalone.sections[0].childSections', childSections);
     this.setState({ schema, loadingStatus: this.state.loadingStatus + 1 });
   }
 
@@ -989,8 +938,37 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     this.setState({startValidation: false});
   }
 
-  getTemplateContent = () =>
-    getSmsMessageFromFormData(this.state.formData, this.state.currentTab);
+  getTemplateContent = () => {
+    // Get SMS content from formData
+    if (!this.state.formData || !Array.isArray(this.state.formData) || this.state.formData.length === 0) {
+      return '';
+    }
+    const currentTabData = this.state.formData[this.state.currentTab - 1];
+    if (!currentTabData) {
+      return '';
+    }
+    
+    // PRIORITY 1: Check direct path first (most common for SMS)
+    // This handles: formData[0]['sms-editor']
+    if (currentTabData['sms-editor']) {
+      return currentTabData['sms-editor'];
+    }
+    
+    // PRIORITY 2: Check activeTab structure (for versioned templates)
+    // This handles: formData[0][activeTab]['sms-editor']
+    const activeTab = currentTabData?.activeTab || 'base';
+    if (currentTabData[activeTab]?.['sms-editor']) {
+      return currentTabData[activeTab]['sms-editor'];
+    }
+    
+    // PRIORITY 3: Check base explicitly (fallback)
+    // This handles: formData[0]['base']['sms-editor']
+    if (currentTabData['base']?.['sms-editor']) {
+      return currentTabData['base']['sms-editor'];
+    }
+    
+    return '';
+  }
 
   handleTestAndPreview = () => {
     // If parent is managing state (props exist), call parent handler
@@ -1019,35 +997,6 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
   }
 
   saveFormData() {
-    /*
-     * RCS SMS fallback slidebox (embeddedSmsFallback): parent passes isFullMode from RCS, but we must not
-     * call createTemplate — that spins CapSpin on createTemplateInProgress and is not the embedded contract.
-     * Same as library: hand off form payload via getFormSubscriptionData.
-     */
-    if (this.props.embeddedSmsFallback && this.props.getFormSubscriptionData) {
-      const { isTemplateNameEmpty, isMessageEmpty } = getSmsEmbeddedFooterValidity(
-        this.state.formData,
-        this.state.tabCount,
-      );
-      if (isTemplateNameEmpty || isMessageEmpty) {
-        this.setState({ startValidation: true, pendingGetFormData: false });
-        if (this.props.onValidationFail) {
-          this.props.onValidationFail();
-        }
-        return;
-      }
-      const payload = this.getFormData();
-      if (!payload.validity) {
-        if (this.props.onValidationFail) {
-          this.props.onValidationFail();
-        }
-        this.setState({ pendingGetFormData: false, startValidation: false });
-        return;
-      }
-      this.props.getFormSubscriptionData(payload);
-      this.setState({ pendingGetFormData: false, startValidation: false });
-      return;
-    }
     // In library mode: FormBuilder calls onSubmit only after liquid validation succeeds.
     // Submit to parent here so the slidebox can close with valid data.
     if (!this.props.isFullMode) {
@@ -1147,9 +1096,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
                 onTestContentClicked={this.props.onTestContentClicked}
                 onPreviewContentClicked={this.props.onPreviewContentClicked}
                 eventContextTags={this.props?.eventContextTags}
-                tagListGetPopupContainer={this.props.tagListGetPopupContainer}
-                tagListPopoverOverlayStyle={this.props.tagListPopoverOverlayStyle}
-                tagListPopoverOverlayClassName={this.props.tagListPopoverOverlayClassName}
+                waitEventContextTags={this.props?.waitEventContextTags}
               />
             </CapColumn>
           </CapRow>
@@ -1162,7 +1109,6 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
           formData={this.state.formData}
           content={this.getTemplateContent()}
           currentChannel={SMS}
-          smsRegister={this.props.smsRegister}
         />
       </div>
     );
@@ -1187,17 +1133,11 @@ Create.propTypes = {
   isLoadingMetaEntities: PropTypes.bool,
   selectedOfferDetails: PropTypes.array,
   eventContextTags: PropTypes.array,
+  waitEventContextTags: PropTypes.object,
   showTestAndPreviewSlidebox: PropTypes.bool,
   handleTestAndPreview: PropTypes.func,
   handleCloseTestAndPreview: PropTypes.func,
   isTestAndPreviewMode: PropTypes.bool,
-  smsRegister: PropTypes.any,
-  forceFullTagContext: PropTypes.bool,
-  embeddedSmsFallback: PropTypes.bool,
-  onEmbeddedSmsFooterValidity: PropTypes.func,
-  tagListGetPopupContainer: PropTypes.func,
-  tagListPopoverOverlayStyle: PropTypes.object,
-  tagListPopoverOverlayClassName: PropTypes.string,
 };
 
 const mapStateToProps = createStructuredSelector({

package/v2Containers/SmsTrai/Create/index.js

@@ -70,7 +70,6 @@ export const SmsTraiCreate = (props) => {
     onCreateComplete,
     isFullMode,
     onShowTemplates,
-    embeddedSmsFallback,
     traiSms: {
       duplicateDetails = {},
       duplicateDetailsError = '',
@@ -660,11 +659,9 @@ export const SmsTraiCreate = (props) => {
 
   const createCallback = ({ errorMessage }) => {
     if (!errorMessage) {
-      if (!embeddedSmsFallback) {
-        CapNotification.success({
-          message: formatMessage(messages.smsCreateNotification),
-        });
-      }
+      CapNotification.success({
+        message: formatMessage(messages.smsCreateNotification),
+      });
       actions.clearCreateResponse();
     } else {
       CapNotification.error({
@@ -744,9 +741,7 @@ export const SmsTraiCreate = (props) => {
       { templates: savedData },
       (resp, errorMessage) => {
         createCallback({ errorMessage });
-        if (embeddedSmsFallback) {
-          if (!errorMessage) onCreateComplete(savedData[0]);
-        } else if (isFullMode) {
+        if (isFullMode) {
           onCreateComplete();
         } else {
           onShowTemplates();

package/v2Containers/SmsTrai/Edit/constants.js

@@ -5,8 +5,6 @@
  */
 
 export const CHARLIMIT = 40;
-/** Display / soft cap label for DLT SMS body length (matches product UI). */
-export const SMS_TRAI_CONTENT_MAX_LENGTH = 1024;
 export const SMS = 'SMS';
 export const SMS_TRAI_VAR = '{#var#}';
 export const TAG = 'TAG';