@capillarytech/creatives-library 7.17.169-alpha.3 → 7.17.169-alpha.4

package/package.json

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

package/v2Containers/CreativesContainer/index.js

@@ -125,7 +125,7 @@ export class Creatives extends React.Component {
         sourceAccountIdentifier = "",
         configs: { token = "" } = {},
       } = get(this.props, "Templates.selectedZaloAccount", {});
-      const { hostName = ''} = this.props.Templates.senderDetails || {};
+      const { hostName = ''} = get(this.props, "Templates.senderDetails", {});
       if (hostName === VIET_GUYS) {
         this.props.zaloActions.getTemplateInfoById({
           username: name,
@@ -136,7 +136,7 @@ export class Creatives extends React.Component {
           actionCallback: this.actionCallback,
         });
       } else {
-        window.open(template?.versions?.base?.content?.zalo?.previewUrl, '_blank');
+        window.open(get(template, 'versions.base.content.zalo.previewUrl'), '_blank');
       }
     }
   };

package/v2Containers/Templates/index.js

@@ -2119,7 +2119,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         id: template?._id,
         preview: true,
         actionCallback: this.actionCallback,
-      }) : window.open(template?.versions?.base?.content?.zalo?.previewUrl, '_blank');
+      }) : window.open(get(template, 'versions.base.content.zalo.previewUrl'), '_blank');
     }
   }
 

package/v2Containers/Templates/sagas.js

@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import { call, put, takeLatest, take, cancel, select } from 'redux-saga/effects';
 import { LOCATION_CHANGE } from 'react-router-redux';
 // import { schema, normalize } from 'normalizr';
@@ -176,7 +177,7 @@ export function* getSenderDetails({
     if (!apiResponse?.errors?.length) {
       yield put({
         type: types.GET_SENDER_DETAILS_SUCCESS,
-        payload: apiResponse?.entity?.[channel][0]?.domainProperties?.hostName || '',
+        payload: get(apiResponse, `entity.${channel}[0].domainProperties.hostName`, ''),
       });
     } else {
       yield put({

package/v2Containers/Zalo/index.js

@@ -75,7 +75,16 @@ export const Zalo = (props) => {
   const [username, setUsername] = useState('');
   const [templateName, setTemplateName] = useState('');
   const [templateId, setTemplateId] = useState('');
-  const [templateListParams, setTemplateListParams] = useState(templateData?.versions?.base?.content?.zalo?.listParams || ((hostName === VIET_GUYS &&  templateData?.templateConfigs?.varMapped ? Object.entries(templateData?.templateConfigs?.varMapped) : templateData?.templateConfigs?.varMapped) ?? []) || []);
+// Initialize the state for templateListParams based on the nested properties of templateData.
+// If templateData.versions.base.content.zalo.listParams is available, use it.
+// Otherwise, if hostName is VIET_GUYS and templateData.templateConfigs.varMapped is available,
+// convert it to an array of entries. If not, use templateData.templateConfigs.varMapped or an empty array.
+  const [templateListParams, setTemplateListParams] = useState(
+      (templateData?.versions?.base?.content?.zalo?.listParams ||
+      ((hostName === VIET_GUYS && templateData?.templateConfigs?.varMapped)
+        ? Object.entries(templateData?.templateConfigs?.varMapped)
+        : templateData?.templateConfigs?.varMapped)) ?? []
+    );
   const [templatePreviewUrl, setTemplatePreviewUrl] = useState('');
   const [templateStatus, setZaloTemplateStatus] = useState(
     ZALO_STATUSES.ENABLE,
@@ -172,7 +181,7 @@ export const Zalo = (props) => {
     });
 
   const setDataForEdit = (setValues) => {
-    if(senderDetails?.hostName === VIET_GUYS) {
+    if(hostName === VIET_GUYS) {
       const {
         name = '',
         _id: zaloId = '',
@@ -197,7 +206,7 @@ export const Zalo = (props) => {
         updateTemplateData(gapitTemplateId, templateName, handledListParams, previewUrl, ZALO_STATUSES.ENABLE);
       } else {
         const { _id: gapitTemplateId = '' } = templateData;
-        let data = gapitAllTemplateData.find(template => template._id == gapitTemplateId);
+        let data = gapitAllTemplateData?.find(template => template?._id == gapitTemplateId);
         const { templateName = "", listParams = [], previewUrl = "", status = "" } = data?.versions?.base?.content?.zalo || {};
         updateTemplateData(gapitTemplateId, templateName, listParams, previewUrl, status);
       }
@@ -390,7 +399,7 @@ export const Zalo = (props) => {
       varMap = templateListParams;
     } else {
       templateListParams?.forEach((listParam) => {
-        const { name, value } = listParam;
+        const { name = '', value = '' } = listParam;
         varMap[name] = value;
       }
       );