@capillarytech/creatives-library 7.17.98 → 7.17.100

package/package.json

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

package/v2Components/CapDeviceContent/index.js

@@ -297,6 +297,7 @@ const CapDeviceContent = (props) => {
           options={BUTTON_RADIO_OPTIONS}
           value={buttonType}
           onChange={onChangeButtonType}
+          disabled={!isAndroid}
           className="inapp-btn-radio-group"
         />
         {isBtnTypeCta && (

package/v2Components/CapDeviceContent/index.scss

@@ -50,7 +50,7 @@
             .dragger-button.re-upload {
                 top: 13rem;
                 position: absolute;
-                right: $CAP_SPACE_20;
+                right: -1rem;
                 color: $FONT_COLOR_05;
               }
         }

package/v2Components/CapDeviceContent/messages.js

@@ -73,7 +73,7 @@ export default defineMessages({
   },
   btnDesc: {
     id: `${prefix}.btnDesc`,
-    defaultMessage: 'These will be show clickable buttons below your message.',
+    defaultMessage: 'These will be shown as clickable buttons below your message.',
   },
   optional: {
     id: `${prefix}.optional`,

package/v2Components/CapInAppCTA/index.js

@@ -131,9 +131,9 @@ export const CapInAppCTA = (props) => {
           >
             <CapRow className="inapp-cta-row">
               <CapColumn>
-                <CapIcon size="s" type={'launch'} />
+                <CapIcon size="s" type={'launch'} className="btn-icon" />
               </CapColumn>
-              <CapColumn>
+              <CapColumn className="btn-text">
                 <CapLabel type="label2" className="inapp-saved-cta-button-text">
                   {text}
                 </CapLabel>

package/v2Components/CapInAppCTA/index.scss

@@ -90,4 +90,10 @@
 }
 .cta-del-icon {
     padding-left: 1rem;
+}
+.btn-text {
+    margin-left: $CAP_SPACE_08;
+}
+.btn-icon {
+    color: $CAP_G06;
 }

package/v2Components/FormBuilder/index.js

@@ -929,7 +929,8 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
         }
         // Check if template subject present in form data from Loyalty, DVS, Timeline
         if (index === 'template-subject' && type.toLowerCase() === 'embedded' && (currentModule.toLowerCase() === 'loyalty' || currentModule.toLowerCase() === 'dvs' || currentModule.toLowerCase() === 'timeline' || currentModule.toLowerCase() === 'library')) {
-          if (data && data.trim() === '') {
+          //checking email subject name validation
+          if (!data?.trim()) {
             errorData[index] = true;
             isValid = false;
           } else {

package/v2Containers/Email/index.js

@@ -2069,7 +2069,8 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       formData[0].selectedLanguages = [];
       let tabKey;
       if ((this.props.location.query.isLanguageSupport === undefined || this.props.location.query.isLanguageSupport === 'false')) {
-        formData['template-subject'] = data.base.subject ? data.base.subject : '';
+        // If formData['template-subject'] is empty, assign an empty string; otherwise, retain its current value or use data.base.subject.
+        formData['template-subject'] = formData?.['template-subject'] === '' ? '' : (data?.base?.subject || '');
         const baseLanguage = this.props.currentOrgDetails.basic_details.base_language;
         let languageIndex = _.findIndex(this.supportedLanguages, {iso_code: baseLanguage});
 
@@ -2134,16 +2135,17 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         this.addLanguage(false, formData, false, additionalLanguages);
       }
       formData.base = _.cloneDeep(formData[0]);
-
-      this.setState({formData, loading: false, injectedTags: data.tags, tabKey, isDragDrop: (data.base.is_drag_drop !== 0 )}, () => {
-        // this.setState({tabKey: ''});
-        const isBEEEnable = this.checkBeeEditorAllowedForLibrary();
-        _.forEach(formData[0].selectedLanguages, (language) => {
-          if (formData[0][language].is_drag_drop && isBEEEnable) {
-            this.props.actions.getCmsSetting(BEE_PLUGIN, formData[0][language].drag_drop_id, 'open', language, isEdmSupport, isBEEEnable);
-          }
+      if (formData?.['template-subject'] !== '') {
+        this.setState({formData, loading: false, injectedTags: data.tags, tabKey, isDragDrop: (data.base.is_drag_drop !== 0 )}, () => {
+          // this.setState({tabKey: ''});
+          const isBEEEnable = this.checkBeeEditorAllowedForLibrary();
+          _.forEach(formData[0].selectedLanguages, (language) => {
+            if (formData[0][language].is_drag_drop && isBEEEnable) {
+              this.props.actions.getCmsSetting(BEE_PLUGIN, formData[0][language].drag_drop_id, 'open', language, isEdmSupport, isBEEEnable);
+            }
+          });
         });
-      });
+      }
     } else {
       this.setState({injectedTags: data.tags});
     }

package/v2Containers/InApp/index.js

@@ -428,35 +428,17 @@ export const InApp = (props) => {
   const createModeContent = (
     <CapRow>
       {/* template name */}
-      <CapRow>
-        <CapHeading type="h4">
-          <FormattedMessage {...messages.creativeName} />
-        </CapHeading>
-        <CapInput
-          id="inapp-template-name-input"
-          className="inapp-template-name-input"
-          onChange={onTemplateNameChange}
-          placeholder={formatMessage(globalMessages.templateNamePlaceholder)}
-          value={templateName}
-          size="default"
+      <CapHeading type="h4">
+        <FormattedMessage {...messages.creativeName} />
+      </CapHeading>
+      <CapInput
+        id="inapp-template-name-input"
+        className="inapp-template-name-input"
+        onChange={onTemplateNameChange}
+        placeholder={formatMessage(globalMessages.templateNamePlaceholder)}
+        value={templateName}
+        size="default"
           />
-      </CapRow>
-      {/* Creative layout type*/}
-      <CapRow className="inapp-creative-layout">
-        <CapHeading type="h4">
-          <FormattedMessage {...messages.creativeLayout} />
-        </CapHeading>
-        <CapHeading type="h6" className="inapp-creative-layout-desc">
-          <FormattedMessage {...messages.creativeLayoutDesc} />
-        </CapHeading>
-      </CapRow>
-      <CapRadioGroup
-        id="inapp-layout-radio"
-        options={LAYOUT_RADIO_OPTIONS}
-        value={templateLayoutType}
-        onChange={onTemplateLayoutTypeChange}
-        className="inapp-layout-radio"
-        />
     </CapRow>
   );
   //create methods end
@@ -716,9 +698,29 @@ export const InApp = (props) => {
       <CapRow className="cap-inapp-creatives">
         <CapColumn span={14}>
           {isFullMode && createModeContent}
+          {/* Creative layout type*/}
+          {(isFullMode || !isEditFlow) && (
+            <>
+              <CapRow className="inapp-creative-layout">
+                <CapHeading type="h4">
+                  <FormattedMessage {...messages.creativeLayout} />
+                </CapHeading>
+                <CapHeading type="h6" className="inapp-creative-layout-desc">
+                  <FormattedMessage {...messages.creativeLayoutDesc} />
+                </CapHeading>
+              </CapRow><CapRadioGroup
+                id="inapp-layout-radio"
+                options={LAYOUT_RADIO_OPTIONS}
+                value={templateLayoutType}
+                onChange={onTemplateLayoutTypeChange}
+                className="inapp-layout-radio" />
+            </>)
+          }
           {/* device tab */}
           <CapTab
-            panes={PANES.filter((devicePane) => devicePane?.isSupported === true)}
+            panes={PANES.filter(
+              (devicePane) => devicePane?.isSupported === true
+            )}
             onChange={(value) => {
               setPanes(value);
             }}
@@ -746,12 +748,10 @@ export const InApp = (props) => {
                 ) : (
                   <FormattedMessage {...globalMessages.done} />
                 )
+              ) : isFullMode ? (
+                <FormattedMessage {...messages.create} />
               ) : (
-                isFullMode ? (
-                  <FormattedMessage {...messages.create} />
-                ) : (
-                  <FormattedMessage {...globalMessages.done} />
-                )
+                <FormattedMessage {...globalMessages.done} />
               )}
             </CapButton>
           </>