@capillarytech/creatives-library 7.17.60 → 7.17.61

package/package.json

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

package/v2Containers/Templates/index.js

@@ -626,7 +626,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     const zaloPreviewUrl = get(nextProps, 'Zalo.zaloTemplatePreviewData.versions.base.content.zalo.previewUrl', '');
     if (zaloPreviewUrl && this.state.channel.toLowerCase() === ZALO_LOWERCASE) {
         handlePreviewInNewTab(zaloPreviewUrl);
-        this.props.zaloActions.resetTemplateInfoData();
+        this.props.zaloActions.resetTemplatePreviewData();
     }
   }
 

package/v2Containers/Zalo/actions.js

@@ -1,6 +1,7 @@
 import {
   ZALO_TEMPLATE_INFO_REQUEST,
   ZALO_TEMPLATE_PREVIEW_RESET,
+  ZALO_TEMPLATE_INFO_RESET,
 } from "./constants";
 
 export function getTemplateInfoById(payload) {
@@ -10,8 +11,14 @@ export function getTemplateInfoById(payload) {
   };
 }
 
-export function resetTemplateInfoData() {
+export function resetTemplatePreviewData() {
   return {
     type: ZALO_TEMPLATE_PREVIEW_RESET,
   };
 }
+
+export function resetTemplateInfoData() {
+  return {
+    type: ZALO_TEMPLATE_INFO_RESET,
+  };
+}

package/v2Containers/Zalo/constants.js

@@ -24,6 +24,7 @@ export const ZALO_TEMPLATE_INFO_SUCCESS = `${prefix}/ZALO_TEMPLATE_INFO_SUCCESS`
 export const ZALO_TEMPLATE_INFO_ERROR = `${prefix}/ZALO_TEMPLATE_INFO_ERROR`;
 export const ZALO_TEMPLATE_PREVIEW_RESET = `${prefix}/ZALO_TEMPLATE_PREVIEW_RESET`;
 export const ZALO_TEMPLATE_PREVIEW_INFO = `${prefix}/ZALO_TEMPLATE_PREVIEW_INFO`;
+export const ZALO_TEMPLATE_INFO_RESET = `${prefix}/ZALO_TEMPLATE_INFO_RESET`;
 
 export const ZALO_STATUSES = {
   PENDING_REVIEW: 'PENDING_REVIEW',

package/v2Containers/Zalo/index.js

@@ -55,7 +55,7 @@ export const Zalo = (props) => {
     isFullMode,
     templateData = {},
     editData = {},
-    accountData = {},
+    accountData: { selectedZaloAccount = {} } = {},
     globalActions,
     location,
     getDefaultTags,
@@ -80,7 +80,14 @@ export const Zalo = (props) => {
   const [textAreaId, updateTextAreaId] = useState('');
   const { zaloTemplateInfoValue = {}, zaloTemplateInfoStatus = REQUEST } =
     editData;
-  const { _id, templateConfigs: { varMapped = {} } = {} } = templateData;
+  const {
+    _id = '',
+    accountId = '',
+    accountName = '',
+    templateConfigs: { id = '', varMapped = {} } = {},
+    token: zaloToken = '',
+  } = templateData;
+  const zaloTempId = _id || id;
   const ZaloFooter = styled.div`
     background-color: ${CAP_WHITE};
     position: fixed;
@@ -97,31 +104,34 @@ export const Zalo = (props) => {
 `;
   //gets account details
   useEffect(() => {
-    const accountObj = accountData.selectedZaloAccount || {};
-    if (!isEmpty(accountObj)) {
+    if (!isEmpty(selectedZaloAccount) || !isEmpty(templateData)) {
       const {
         sourceAccountIdentifier = '',
         configs: { token: accessToken = '' } = {},
         name = '',
-      } = accountObj;
-      setOaId(sourceAccountIdentifier);
-      setToken(accessToken);
-      setUsername(name);
+      } = selectedZaloAccount;
+      setOaId(sourceAccountIdentifier || accountId);
+      setToken(accessToken || zaloToken);
+      setUsername(name || accountName);
     }
-  }, [accountData.selectedZaloAccount]);
+  }, [selectedZaloAccount, templateData]);
 
   //gets template details
   useEffect(() => {
-    if (_id && oa_id && token && username && isEmpty(varMapped)) {
+    if (zaloTempId && oa_id && token && username) {
       actions.getTemplateInfoById({
         username,
         oa_id,
         token,
-        id: _id,
+        id: zaloTempId,
         actionCallback,
       });
     }
-  }, [_id, oa_id, token, username]);
+    //cleanup code
+    return () => {
+      actions.resetTemplateInfoData();
+    };
+  }, [zaloTempId, oa_id, token, username]);
 
   const handleSetValues = (paramsData = []) =>
     paramsData.map((paramData) => {
@@ -136,7 +146,7 @@ export const Zalo = (props) => {
   const setDataForEdit = (setValues) => {
     const {
       name = '',
-      _id: id = '',
+      _id: zaloId = '',
       versions: {
         base: {
           content: {
@@ -150,7 +160,7 @@ export const Zalo = (props) => {
       } = {},
     } = zaloTemplateInfoValue;
     setTemplateName(name);
-    setTemplateId(id);
+    setTemplateId(zaloId);
     setTemplateListParams(setValues ? handleSetValues(paramsData) : paramsData);
     setTemplatePreviewUrl(previewUrl);
     setZaloTemplateStatus(status);
@@ -165,7 +175,7 @@ export const Zalo = (props) => {
     if (!isEmpty(varMapped)) {
       setDataForEdit(true);
     }
-  }, [varMapped]);
+  }, [varMapped, zaloTemplateInfoValue]);
 
   useEffect(() => {
     let tag = get(metaEntities, `tags.standard`, []);
@@ -353,6 +363,7 @@ export const Zalo = (props) => {
         template: templatePreviewUrl,
         varMapped: varMap,
       },
+      token,
     };
     return payload;
   };

package/v2Containers/Zalo/reducer.js

@@ -5,6 +5,7 @@ import {
   ZALO_TEMPLATE_INFO_REQUEST,
   ZALO_TEMPLATE_PREVIEW_RESET,
   ZALO_TEMPLATE_PREVIEW_INFO,
+  ZALO_TEMPLATE_INFO_RESET,
   SUCCESS,
   REQUEST,
   ERROR,
@@ -48,6 +49,11 @@ const zaloReducer = (state = initialState, action) => {
         .set("zaloTemplateInfoStatus", REQUEST)
         .set("zaloTemplatePreviewData", "")
         .set("zaloTemplateInfoError", null);
+    case ZALO_TEMPLATE_INFO_RESET:
+      return state
+        .set("zaloTemplateInfoStatus", REQUEST)
+        .set("zaloTemplateInfoValue", "")
+        .set("zaloTemplateInfoError", null);
 
     default:
       return state;

package/v2Containers/Zalo/tests/actions.test.js

@@ -15,6 +15,12 @@ describe("Test zalo actions", () => {
     const expected = {
       type: types.ZALO_TEMPLATE_PREVIEW_RESET,
     };
+    expect(actions.resetTemplatePreviewData()).toEqual(expected);
+  });
+  it("has a type of ZALO_TEMPLATE_INFO_RESET action", () => {
+    const expected = {
+      type: types.ZALO_TEMPLATE_INFO_RESET,
+    };
     expect(actions.resetTemplateInfoData()).toEqual(expected);
   });
 });

package/v2Containers/Zalo/tests/index.test.js

@@ -19,6 +19,7 @@ import { render, screen, fireEvent } from '../../../utils/test-utils';
 
 const mockActions = {
   getTemplateInfoById: jest.fn(),
+  resetTemplateInfoData: jest.fn(),
 };
 const mockGlobalActions = {
   fetchSchemaForEntity: jest.fn(),

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

@@ -6,6 +6,7 @@ import {
   ZALO_TEMPLATE_INFO_ERROR,
   ZALO_TEMPLATE_PREVIEW_INFO,
   ZALO_TEMPLATE_PREVIEW_RESET,
+  ZALO_TEMPLATE_INFO_RESET,
   REQUEST,
   SUCCESS,
   ERROR,
@@ -76,6 +77,16 @@ describe("zalo reducer", () => {
       expect(zaloReducer(state, action)).toEqual(expectedResult);
     });
 
+    it("should handle ZALO_TEMPLATE_INFO_RESET action", () => {
+      action.type = ZALO_TEMPLATE_INFO_RESET;
+      state = state
+        .set("zaloTemplateInfoStatus", REQUEST)
+        .set("zaloTemplateInfoValue", "")
+        .set("zaloTemplateInfoError", null);
+      const expectedResult = state;
+      expect(zaloReducer(state, action)).toEqual(expectedResult);
+    });
+
     it("should handle default action", () => {
       action.type = "deafult_action";
       const expectedResult = state;