@capillarytech/creatives-library 8.0.87-alpha.6 → 8.0.87-alpha.7

package/package.json

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

package/services/api.js

@@ -569,13 +569,9 @@ export const getLiquidTags = (content) => {
   return request(url, getAPICallObject("POST", { content }, false, true));
 };
 
-export const postMetaId = (payload) => {
-  const url = `${API_ENDPOINT}/templates/metaId`;
-  // TODO: remove this after testing
-  return {
-    status: true,
-    metaId: "2334",
-  };
+export const createCentralCommsMetaId = (payload) => {
+  console.log("createCentralCommsMetaId: API call: ", { payload });
+  const url = `${API_ENDPOINT}/createCentralCommsMetaId/TRANSACTION`;
   return request(url, getAPICallObject('POST', payload));
 };
 

package/v2Components/FormBuilder/index.js

@@ -82,7 +82,6 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
     super(props);
     this.state = {
       formData: {},
-      prevFormData: {},
       errorData: {},
       currentTab: 1,
       currentLangTab: 'en',
@@ -141,14 +140,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
   componentWillMount() {
     this.setState({usingTabContainer: this.props.usingTabContainer ? this.props.usingTabContainer : false});
     if (this.props.formData && (this.props.isEdit || (!this.props.isEdit && !_.isEmpty(this.props.formData)))) {
-      console.log('**** componentWillMount: ', {
-        formData: this.props.formData,
-        prevFormData: this.props.formData
-      });
-      this.setState({
-        formData: this.props.formData, 
-        prevFormData: this.props.formData
-      }, () => {
+      this.setState({formData: this.props.formData}, () => {
         // if (!this.props.isNewVersionFlow) {
         this.initialiseForm(this.props.schema, false, true);
         // }
@@ -180,32 +172,6 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
     // }
     if (nextProps.isEdit) {
       if (!_.isEqual(nextProps.formData, this.state.formData) && !_.isEmpty(nextProps.formData)) {
-
-        const oldContent = convert(this.state.prevFormData?.base?.en?.["template-content"]);
-        const newContent = convert(this.state.formData?.base?.en?.["template-content"]);
-        console.log("**** componentWillReceiveProps: ", {
-          formData: this.state.formData,
-          prevFormData: this.state.prevFormData,
-          nextPropsFormData: nextProps.formData
-        });
-        if (!_.isEmpty(oldContent)){
-          console.log("**** oldContent is empty: ", {
-            oldContent,
-            newContent
-          });
-          this.setState({
-            prevFormData: nextProps.formData
-          });
-        } else if (oldContent !== newContent) {
-            console.log("**** oldContent !== newContent: ", {
-              oldContent,
-              newContent
-            });
-            this.setState({
-              prevFormData: this.state.formData
-            });
-          }
-        
         if (type === 'embedded' && !isLibraryModule) { //TODO: has to be checked and changed.
           this.setState({checkValidation: true, formData: nextProps.formData}, () => {
             this.validateForm();
@@ -1100,7 +1066,6 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
     if(templateContent){this.setState((prevState) => {
       console.log('**** handleLiquidTemplateSubmit: ', { prevState, templateContent });
       return {
-        // prevFormData: { ...prevState.formData },
         formData: {
           ...prevState?.formData,
           base: {
@@ -1116,23 +1081,6 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
       this.metaIDSaveWrapper();
     });}
   }
-
-  checkDiffInContent = () => {
-    //oldCOntent will be prop based
-    //newContent will be state based
-    //newcontent is this.state.formData?.base?.en?.["template-content"]
-    //oldContent is this.props.formData?.base?.en?.["template-content"]
-    //will check if the new content has any new tags or not
-    const oldContent = convert(this.state.prevFormData?.base?.en?.["template-content"]);
-    const newContent = convert(this.state.formData?.base?.en?.["template-content"]);
-    console.log("**** checkDiffInContent", { oldContent, newContent });
-    if (_.isEmpty(oldContent)) {
-      return false;
-    } else if (!_.isEqual(oldContent, newContent)) {
-      return true;
-    }
-    return false;
-  };
   
   metaIDSaveWrapper = () => {
     const {
@@ -1142,27 +1090,45 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
       clientName,
       module, 
       metaId,
-      setMetaId,
+      setMetaId = () => {},
     } = this.props.loyaltyMetaData;
+    const { formatMessage } = this.props.intl;
     const handleMetaIDResult = (result) => {
       console.log("**** handleMetaIDResult: 1", { result });
-      if (result.status && this.props.onSubmit) {
-        console.log("**** handleMetaIDResult: 2", { result });
+      if (result.status === 200 && this.props.onSubmit) {
+        console.log("**** handleMetaIDResult: 2.1", { result });
         setMetaId(result?.metaId);
         this.props.onSubmit(this.state.formData);
       } else {
         // this.setState({ metaID: null });
-        this.props.showLiquidErrorInFooter(this.state.liquidErrorMessage); //add a custom message
+        console.log("**** handleMetaIDResult: 2.2 ", { result });
+        this.setState(
+          prevState => ({
+            liquidErrorMessage: {
+              ...prevState.liquidErrorMessage,
+              STANDARD_ERROR_MSG: result?.errors?.length > 0
+                ? [
+                    ...(prevState.liquidErrorMessage?.STANDARD_ERROR_MSG || []),
+                    formatMessage(messages.emailBodyEmptyError)
+                  ]
+                : prevState.liquidErrorMessage?.STANDARD_ERROR_MSG,
+              LIQUID_ERROR_MSG: result?.errors?.map(
+                error => error?.message
+              ) ?? [formatMessage(messages.somethingWentWrong)]
+            }
+          }),
+          () => {
+            this.props.showLiquidErrorInFooter(this.state.liquidErrorMessage);
+          }
+        );
         this.props.stopValidation();
         return;
       }
     };
     console.log("**** metaIDSaveWrapper: BODY", { actionName, actionId, ouId, clientName, module, metaId, setMetaId, messageDetails: this.props.messageDetails });
     const content = this.state.formData?.base?.en?.["template-content"] || "";
-    console.log("**** metaIDSaveWrapper: checkDiffInContent: ", this.checkDiffInContent());
     // Only generate metaId for loyalty module and specific action
     if (this.props.isLoyaltyModule && actionName === 'SEND_COMMUNICATION_ACTION') {
-      if (this.checkDiffInContent()) {
         //need to pass payload , this will be same as the payload for template creation/edit api
         const payload = {
           ouId: ouId || -1,
@@ -1179,10 +1145,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
           props: this.props,
           state: this.state
         });
-        this.props.actions.postMetaId(payload, handleMetaIDResult);
-      } else {
-        this.props.onSubmit(this.state.formData);
-      }
+        this.props.actions.createCentralCommsMetaId(payload, handleMetaIDResult);
     } else {
       this.props.onSubmit(this.state.formData);
     }

package/v2Containers/Cap/actions.js

@@ -86,10 +86,10 @@ export const getLiquidTags = (data,callback) => {
   };
 };
 
-export const postMetaId = (data, callback) => {
-  console.log("postMetaId action", data, callback);
+export const createCentralCommsMetaId = (data, callback) => {
+  console.log("createCentralCommsMetaId action", data, callback);
   return {
-    type: types.GET_META_ID_REQUEST,
+    type: types.CREATE_CENTRAL_COMMS_META_ID_REQUEST,
     data,
     callback,
   };

package/v2Containers/Cap/constants.js

@@ -64,6 +64,6 @@ export const GET_LIQUID_TAGS_FAILURE = 'cap/GET_LIQUID_TAGS_FAILURE_V2';
 export const GET_LIQUID_TAGS_REQUEST = 'cap/GET_LIQUID_TAGS_REQUEST_V2';
 export const GET_LIQUID_TAGS_SUCCESS = 'cap/GET_LIQUID_TAGS_SUCCESS_V2';
 
-export const GET_META_ID_FAILURE = 'cap/GET_META_ID_FAILURE_V2';
-export const GET_META_ID_REQUEST = 'cap/GET_META_ID_REQUEST_V2';
-export const GET_META_ID_SUCCESS = 'cap/GET_META_ID_SUCCESS_V2';
+export const CREATE_CENTRAL_COMMS_META_ID_FAILURE = 'cap/CREATE_CENTRAL_COMMS_META_ID_FAILURE_V2';
+export const CREATE_CENTRAL_COMMS_META_ID_REQUEST = 'cap/CREATE_CENTRAL_COMMS_META_ID_REQUEST_V2';
+export const CREATE_CENTRAL_COMMS_META_ID_SUCCESS = 'cap/CREATE_CENTRAL_COMMS_META_ID_SUCCESS_V2';

package/v2Containers/Cap/reducer.js

@@ -199,11 +199,11 @@ function capReducer(state = fromJS(initialState.cap), action) {
       return state
         .set('demoVideoAndLinkJSONStatus', types.FAILURE)
         .set('demoVideoAndLinkJSONError', action?.error);
-    case types.GET_META_ID_REQUEST:
+    case types.CREATE_CENTRAL_COMMS_META_ID_REQUEST:
       return state.set('metaTagsStatus', types.REQUEST);
-    case types.GET_META_ID_SUCCESS:
+    case types.CREATE_CENTRAL_COMMS_META_ID_SUCCESS:
       return state.set('metaTagsStatus', types.SUCCESS);
-    case types.GET_META_ID_FAILURE:
+    case types.CREATE_CENTRAL_COMMS_META_ID_FAILURE:
       return state.set('metaTagsStatus', types.FAILURE);
     default:
       return state;

package/v2Containers/Cap/sagas.js

@@ -186,25 +186,21 @@ const getTopbarData = (parentModule) => {
   }
 };
 
-export function* postMetaId(action) {
+export function* createCentralCommsMetaId(action) {
   try {
-    console.log("postMetaId saga", action);
-    // const result = yield call(Api.postMetaId, action?.data);
-    const result = {
-      status: true,
-      metaId: "2334",
-    };
-    console.log("postMetaId saga result", result);
+    console.log("createCentralCommsMetaId saga", action);
+    const result = yield call(Api.createCentralCommsMetaId, action?.data);
+    console.log("createCentralCommsMetaId saga result", result);
     if (result) {
       if (action?.callback) {
         yield call(action?.callback, result);
       }
-      yield put({ type: types.GET_META_ID_SUCCESS, result });
+      yield put({ type: types.CREATE_CENTRAL_COMMS_META_ID_SUCCESS, result });
     } else {
-      yield put({ type: types.GET_META_ID_FAILURE });
+      yield put({ type: types.CREATE_CENTRAL_COMMS_META_ID_FAILURE });
     }
   } catch (error) {
-    yield put({ type: types.GET_META_ID_FAILURE, error });
+    yield put({ type: types.CREATE_CENTRAL_COMMS_META_ID_FAILURE, error });
   }
 }
 
@@ -248,7 +244,7 @@ export function* watchLiquidEntity() {
 }
 
 export function* watchMetaId() {
-  yield takeLatest(types.GET_META_ID_REQUEST, postMetaId);
+  yield takeLatest(types.CREATE_CENTRAL_COMMS_META_ID_REQUEST, createCentralCommsMetaId);
 }
 
 function* watchForOrgChange() {