@capillarytech/creatives-library 8.0.14 → 8.0.17

package/package.json

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

package/utils/tagValidations.js

@@ -253,5 +253,16 @@ export const preprocessHtml = (content) => {
     "\n": "",  // Handling newlines by replacing them with an empty string
   };
 
-  return content?.replace(/'|"|&|<|>|"|\n/g, match => replacements[match]);
+
+  const styleTagRegex = /<style\b[^>]*>([\s\S]*?)<\/style>/gi;
+
+  const contentWithStyleFixes = content?.replace(styleTagRegex, (match, styleContent) => {
+    // Replace all occurrences of %} with % } within the style content
+    const modifiedStyleContent = styleContent?.replace(/%}/g, '% }');
+    // Reconstruct the <style> tag with the modified content
+    return match.replace(styleContent, modifiedStyleContent);
+  });
+
+  // Step 2: Perform the standard replacements on the entire content
+  return contentWithStyleFixes?.replace(/&#39;|&quot;|&amp;|&lt;|&gt;|"|\n/g, match => replacements[match]);
 };

package/utils/tests/tagValidations.test.js

@@ -415,5 +415,10 @@ describe('preprocessHtml', () => {
     const expectedOutput = "This is &amplt; not an entity.";
     expect(preprocessHtml(input)).toEqual(expectedOutput);
   });
+  it('Should handle style tags with %}', () => {
+    const input = "<style {line-height:0;font-size:75%} >sup{line-height:0;font-size:75%}</style> ";
+    const expectedOutput = "<style {line-height:0;font-size:75%} >sup{line-height:0;font-size:75% }</style> ";
+    expect(preprocessHtml(input)).toEqual(expectedOutput);
+  });
 
 });

package/v2Components/Ckeditor/index.js

@@ -19,8 +19,9 @@ import './style.scss';
 const loadScript = require('load-script');
 
 const defaultScriptUrl = `${window.location.origin}/arya/ui/library/ckeditor/ckeditor.js`;
-// const defaultScriptUrl = 'https://crm-nightly-new.cc.capillarytech.com/arya/ui/library/ckeditor/ckeditor.js';
-//Uncomment the above line to use CKEDITOR in local
+//const defaultScriptUrl = 'https://nightly.intouch.capillarytech.com/arya/ui/library/ckeditor/ckeditor.js';
+/*Uncomment the above line to use CKEDITOR in local
+*/
 const user = localStorage.getItem('user');
 let locale = 'en';
 if (user && JSON.parse(user).lang) {

package/v2Components/FormBuilder/index.js

@@ -1062,6 +1062,26 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
   continueSaveForm = (id) => {
 
   };
+  handleLiquidTemplateSubmit =(templateContent) => {
+    if(templateContent){this.setState((prevState) => {
+      return {
+        formData: {
+          ...prevState?.formData,
+          base: {
+            ...prevState?.formData?.base,
+            en: {
+              ...prevState?.formData?.base?.en,
+              "template-content": preprocessHtml(templateContent)
+            }
+          }
+        }
+      };
+    }, () => {
+      if (this.props.onSubmit) {
+        this.props.onSubmit(this.state.formData);
+      }
+    });}
+  }
   saveForm(saveForm) {
     if (this.props.isNewVersionFlow && !saveForm) {
       this.props.getValidationData();
@@ -1069,9 +1089,10 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
     }
     if ( this.state.isFormValid ) {
       if (this.liquidFlow) {
+        const templateContent = this.state.formData?.base?.en?.["template-content"] || "";
         //Converts given HTML content to plain text string.
         const content = convert(
-          this.state.formData?.base?.en?.["template-content"]
+          templateContent
         );
       /* 
         The `handleResult` function is used as a callback for `getLiquidTags` to handle the results post-processing. 
@@ -1124,7 +1145,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
               this.props.stopValidation();
               return;
             }
-            this.props.onSubmit(this.state.formData);
+            this.handleLiquidTemplateSubmit(templateContent);
           }
         };
         this.props.actions.getLiquidTags(preprocessHtml(content), handleResult);

package/v2Containers/Cap/sagas.js

@@ -259,6 +259,7 @@ export default [
 export function* capSagaForFetchSchemaForEntity() {
   yield all([
     watchFetchSchemaForEntity(),
+    watchLiquidEntity(),
   ])
 }
 
@@ -270,5 +271,6 @@ export function* v2CapSagas() {
     watchForFetchUserInfo(),
     watchGetTopbarMenuData(),
     watchForGetVideosConfig(),
+    watchLiquidEntity(),
   ])
 }