@capillarytech/creatives-library 8.0.184-beta.0 → 8.0.185

package/package.json

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

package/v2Containers/Templates/sagas.js

@@ -226,15 +226,13 @@ export function* watchGetCdnTransformationConfig() {
   );
 }
 
-// Zalo template info watcher - only for preview functionality from Templates component
+// Zalo template info watcher - only for preview if previewUrl is empty from Templates component
 export function* watchForGetTemplateInfoById() {
   yield takeLatest(ZALO_TEMPLATE_INFO_REQUEST, function* handleZaloTemplateInfoRequest(action) {
-    // Only handle requests that are specifically for preview (have preview flag)
-    // Ignore edit requests (handled by Zalo component saga)
-    if (action.payload && action.payload.preview && !action.payload.edit) {
+    // Honour only preview requests (Other functionality already handled by Zalo component saga)
+    if (action?.payload?.preview) {
       yield call(getTemplateInfoById, action);
     }
-    // If it's not a preview request or is an edit request, let the Zalo component handle it
   });
 }
 
@@ -251,7 +249,7 @@ export default [
   watchGetOrgLevelCampaignSettings,
   watchGetSenderDetails,
   watchGetCdnTransformationConfig,
-  watchForGetTemplateInfoById, // Restored for preview functionality from Templates component
+  watchForGetTemplateInfoById, // Zalo preview functionality from Templates component
 ];
 
 export function* v2TemplateSaga() {
@@ -264,7 +262,7 @@ export function* v2TemplateSaga() {
     watchGetCdnTransformationConfig(),
     watchFetchWeCrmAccounts(),
     watchGetSenderDetails(),
-    watchForGetTemplateInfoById(), // Restored for preview functionality from Templates component
+    watchForGetTemplateInfoById(), // Zalo preview functionality from Templates component
   ]);
 }
 

package/v2Containers/Templates/tests/sagas.test.js

@@ -13,13 +13,15 @@ import {
   getSenderDetails,
   fetchWeCrmAccounts,
   sendZippedFile,
-  fetchUserList
+  fetchUserList,
+  watchForGetTemplateInfoById
 } from '../sagas';
 
 import * as mockData from './mockData';
 import { ZALO } from '../../CreativesContainer/constants';
-import { VIET_GUYS } from '../../Zalo/constants';
+import { VIET_GUYS, ZALO_TEMPLATE_INFO_REQUEST } from '../../Zalo/constants';
 import { throwError } from 'redux-saga-test-plan/providers';
+import { getTemplateInfoById } from '../../Zalo/saga';
 
 describe('getCdnTransformationConfig saga', () => {
   it("handle valid response from api", () => {
@@ -322,4 +324,50 @@ describe('fetchUserList Saga', () => {
       })
       .run();
   });
+});
+
+describe('watchForGetTemplateInfoById saga', () => {
+  it('should call getTemplateInfoById when preview flag is true (preview request)', () => {
+    const action = {
+      type: ZALO_TEMPLATE_INFO_REQUEST,
+      payload: {
+        username: 'testUser',
+        oa_id: '12345',
+        token: 'testToken',
+        host: 'testHost',
+        id: 'template123',
+        preview: true,
+      },
+    };
+
+    expectSaga(watchForGetTemplateInfoById)
+      .provide([
+        [matchers.call.fn(getTemplateInfoById), undefined],
+      ])
+      .dispatch(action)
+      .call(getTemplateInfoById, action)
+      .run();
+  });
+
+  it('should not call getTemplateInfoById when preview flag is false or missing (edit request)', () => {
+    const action = {
+      type: ZALO_TEMPLATE_INFO_REQUEST,
+      payload: {
+        username: 'testUser',
+        oa_id: '12345',
+        token: 'testToken',
+        host: 'testHost',
+        id: 'template123',
+        // preview flag is missing (undefined)
+      },
+    };
+
+    expectSaga(watchForGetTemplateInfoById)
+      .provide([
+        [matchers.call.fn(getTemplateInfoById), undefined],
+      ])
+      .dispatch(action)
+      .not.call(getTemplateInfoById, action)
+      .run();
+  });
 });

package/v2Containers/Zalo/index.js

@@ -132,20 +132,15 @@ export const Zalo = (props) => {
     }
   }, [selectedZaloAccount, templateData]);
 
-  //gets template details - prevent duplicate calls with Templates saga
+  //gets template details
   useEffect(() => {
-    const hasRequiredData = zaloTempId && oa_id && token && username && hostName;
-
-    // Only make API call if we have all required data
-    // Add edit flag to distinguish from preview requests handled by Templates saga
-    if (hasRequiredData) {
+    if (zaloTempId && oa_id && token && username && hostName) {
       actions.getTemplateInfoById({
         username,
         oa_id,
         token,
         host: hostName,
         id: zaloTempId,
-        edit: true, // Flag to indicate this is an edit request, not preview
         actionCallback,
       });
     }