@capillarytech/creatives-library 7.17.193 → 7.17.194-alpha.1

package/config/app.js

@@ -6,7 +6,7 @@ const config = {
     api_endpoint: '/arya/api/v1/creatives',
     campaigns_api_endpoint: '/iris/v2/campaigns',
     campaigns_api_org_endpoint: '/iris/v2/org/campaign',
-    liquid_endpoint:'/iris/v2/liquid',
+    liquid_endpoint:'/iris/v2/template',
     auth_endpoint: '/arya/api/v1/auth',
     arya_endpoint: '/arya/api/v1',
     login_url: '/auth/login',

package/package.json

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

package/v2Components/ErrorInfoNote/index.js

@@ -2,8 +2,6 @@ import React from "react";
 import PropTypes from "prop-types";
 import {
   CapButton,
-  CapDivider,
-  CapHeader,
   CapIcon,
   CapLabel,
   CapList,

package/v2Components/ErrorInfoNote/style.scss

@@ -2,7 +2,6 @@
 
 .error-container {
   margin-bottom: $CAP_SPACE_08;
-  width: 68rem;
   margin-top: $CAP_SPACE_12;
   background-color: $CAP_COLOR_05;
   border-radius: $CAP_SPACE_04;

package/v2Components/FormBuilder/index.js

@@ -1090,8 +1090,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
             this.props.stopValidation();
             return;
           }
-
-          if (result?.data?.length > 0) {
+          else if (result?.data?.length > 0) {
             const extractedLiquidTags = extractNames(result?.data);
             // Extracts the supported liquid tags from the given content.
             const supportedLiquidTags = checkSupport(
@@ -1122,8 +1121,8 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
               this.props.stopValidation();
               return;
             }
+            this.props.onSubmit(this.state.formData);
           }
-          this.props.onSubmit(this.state.formData);
         };
         this.props.actions.getLiquidTags(preprocessHtml(content), handleResult);
       } else {
@@ -3750,7 +3749,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
 
 
     return (
-      <CapSpin spinning={this.liquidFlow && this.props.liquidExtractionInProgress}>
+      <CapSpin spinning={this.liquidFlow && this.props.liquidExtractionInProgress} tip={this.props.intl.formatMessage(messages.liquidSpinText)} >
       <CapRow>
         {this.props.schema ? this.renderForm() : ""}
         <SlideBox

package/v2Components/FormBuilder/messages.js

@@ -94,4 +94,8 @@ export default defineMessages({
     id: 'creatives.componentsV2.FormBuilder.somethingWentWrong',
     defaultMessage: 'Something went wrong while validating content , pls try again later',
   },
+  liquidSpinText:{
+    id: 'creatives.componentsV2.FormBuilder.liquidSpinText',
+    defaultMessage: 'Validating the template, it might take a few seconds',
+  },
 });

package/v2Containers/Cap/reducer.js

@@ -88,15 +88,12 @@ function capReducer(state = fromJS(initialState.cap), action) {
     case types.GET_LIQUID_TAGS_REQUEST:
       return state
         .set('fetchingLiquidTags', true)
-        .set('fetchingSchemaError', false);
     case types.GET_LIQUID_TAGS_FAILURE:
       return state
         .set('fetchingLiquidTags', false)
-        .set('fetchingSchemaError', true);
     case types.GET_LIQUID_TAGS_SUCCESS: 
       return state
         .set('fetchingLiquidTags', false)
-        .set('fetchingSchemaError', false);
     case types.GET_SCHEMA_FOR_ENTITY_SUCCESS: {
       const stateMeta = state.get('metaEntities');
       const standardTagMap = _.keyBy(action?.data?.metaEntities?.standard, item => item?.definition?.value);

package/v2Containers/Cap/sagas.js

@@ -801,24 +801,26 @@ export function* fetchSchemaForEntity(queryParams) {
 
 export function* getLiquidTags(action) {
   try {
-    let result = yield call(Api.getLiquidTags, String(action?.data));
+    let result = yield call(Api.getLiquidTags, action?.data);
     if (result) {
-      if(result?.errors?.length > 0) {
-        const getAskAiraErrorResponse = yield call(Api.askAiraForLiquid, {templateContent: action?.data,errorMessage: result?.errors?.[0]?.message});
-        if(getAskAiraErrorResponse?.result?.errors?.length > 0){
+      if (result?.errors?.length > 0) {
+        const getAskAiraErrorResponse = yield call(Api.askAiraForLiquid, {
+          templateContent: action?.data,
+          errorMessage: result?.errors?.[0]?.message,
+        });
+        if (getAskAiraErrorResponse?.result?.errors?.length > 0) {
           result = getAskAiraErrorResponse?.result;
         }
       }
       if (action?.callback) {
         yield call(action?.callback, result);
       }
-      yield put({ type: types.GET_LIQUID_TAGS_SUCCESS});
+      yield put({ type: types.GET_LIQUID_TAGS_SUCCESS });
     } else {
-      yield put({ type: types.GET_LIQUID_TAGS_FAILURE, error: true });
+      yield put({ type: types.GET_LIQUID_TAGS_FAILURE });
     }
-
   } catch (error) {
-    yield put({ type: types.GET_LIQUID_TAGS_FAILURE, error});
+    yield put({ type: types.GET_LIQUID_TAGS_FAILURE });
   }
 }
 const getTopbarData = (parentModule) => {

package/v2Containers/Cap/tests/reducer.test.js

@@ -64,7 +64,7 @@ describe('should handle GET_SUPPORT_VIDEOS_CONFIG', () => {
     const action = {
       type: GET_LIQUID_TAGS_REQUEST,
     };
-    const expectedState = {"fetchingLiquidTags": true, "fetchingSchema": true, "fetchingSchemaError": false, "liquidTags": [], "messages": [], "metaEntities": {"layouts": [], "tagMap": {}, "tags": []}, "orgID": "", "token": ""};
+    const expectedState = {"fetchingLiquidTags": true, "fetchingSchema": true, "fetchingSchemaError": "", "liquidTags": [], "messages": [], "metaEntities": {"layouts": [], "tagMap": {}, "tags": []}, "orgID": "", "token": ""};
     expect(reducer(mockedInitialState, action).toJS()).toEqual(expectedState);
   });
 
@@ -72,7 +72,7 @@ describe('should handle GET_SUPPORT_VIDEOS_CONFIG', () => {
     const action = {
       type: GET_LIQUID_TAGS_FAILURE,
     };
-    const expectedState ={"fetchingLiquidTags": false, "fetchingSchema": true, "fetchingSchemaError": true, "liquidTags": [], "messages": [], "metaEntities": {"layouts": [], "tagMap": {}, "tags": []}, "orgID": "", "token": ""}
+    const expectedState ={"fetchingLiquidTags": false, "fetchingSchema": true, "fetchingSchemaError": "", "liquidTags": [], "messages": [], "metaEntities": {"layouts": [], "tagMap": {}, "tags": []}, "orgID": "", "token": ""}
     expect(reducer(mockedInitialState, action).toJS()).toEqual(expectedState);
   });
 
@@ -80,11 +80,7 @@ describe('should handle GET_SUPPORT_VIDEOS_CONFIG', () => {
     const action = {
       type: GET_LIQUID_TAGS_SUCCESS,
     };
-    const initialState = fromJS({
-      fetchingLiquidTags: true,
-      fetchingSchemaError: false,
-    });
-    const expectedState ={"fetchingLiquidTags": false, "fetchingSchema": true, "fetchingSchemaError": false, "liquidTags": [], "messages": [], "metaEntities": {"layouts": [], "tagMap": {}, "tags": []}, "orgID": "", "token": ""}
+    const expectedState ={"fetchingLiquidTags": false, "fetchingSchema": true, "fetchingSchemaError": "", "liquidTags": [], "messages": [], "metaEntities": {"layouts": [], "tagMap": {}, "tags": []}, "orgID": "", "token": ""}
     expect(reducer(mockedInitialState, action).toJS()).toEqual(expectedState);
   });
 

package/v2Containers/CreativesContainer/SlideBoxFooter.js

@@ -15,7 +15,7 @@ function getFullModeSaveBtn(slidBoxContent) {
 function SlideBoxFooter(props) {
   const { slidBoxContent, onSave, onEditTemplate, onCreateNextStep, isFullMode, fetchingCmsData, isTemplateNameEmpty, errorMessages, isLiquidValidationError} = props;
   return (
-    <div>
+    <div className='footer-width'>
       {isLiquidValidationError && (<ErrorInfoNote  errorMessages={errorMessages} />)}
       <div>
         {props.shouldShowDoneFooter() && (
@@ -25,7 +25,7 @@ function SlideBoxFooter(props) {
                 <FormattedMessage {...messages.templateNameEmpty} />
               </CapError>
             )}
-            <CapRow className={isLiquidValidationError && "liquid-flex"}>
+            <CapRow>
               <CapButton
                 onClick={onSave}
                 disabled={isTemplateNameEmpty || fetchingCmsData || false}

package/v2Containers/CreativesContainer/index.scss

@@ -79,8 +79,6 @@ $classPrefix: add-creatives-section;
     margin-left: $CAP_SPACE_24;
 }
 
-.liquid-flex {
-    display: flex;
-    vertical-align: sub;
-    align-items: center;
+.footer-width {
+    width: 100%;;
 }