@capillarytech/creatives-library 8.0.105 → 8.0.106

package/config/app.js

@@ -17,16 +17,16 @@ const config = {
     accountConfig: (strs, accountId) => `${window.location.origin}/org/config/AccountAdd?q=a&channelId=2&accountId=${accountId}&edit=1`,
   },
   development: {
-    api_endpoint: 'https://devenv-crm.cc.capillarytech.com/arya/api/v1/creatives',
-    campaigns_api_endpoint: 'https://devenv-crm.cc.capillarytech.com/iris/v2/campaigns',
-    campaigns_api_org_endpoint: 'https://devenv-crm.cc.capillarytech.com/iris/v2/org/campaign',
-    auth_endpoint: 'https://devenv-crm.cc.capillarytech.com/arya/api/v1/auth',
-    arya_endpoint: 'https://devenv-crm.cc.capillarytech.com/arya/api/v1',
-    subscription_api_endpoint: 'https://devenv-crm.cc.capillarytech.com/arya/api/v1/org-settings/subscription',
-    exports_api_endpoint: 'https://devenv-crm.cc.capillarytech.com/arya/api/v1/export/data',
+    api_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/arya/api/v1/creatives',
+    campaigns_api_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/iris/v2/campaigns',
+    campaigns_api_org_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/iris/v2/org/campaign',
+    auth_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/arya/api/v1/auth',
+    arya_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/arya/api/v1',
+    subscription_api_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/arya/api/v1/org-settings/subscription',
+    exports_api_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/arya/api/v1/export/data',
     login_url: '/auth/login',
     dashboard_url: '/sms',
-    liquid_endpoint: 'https://devenv-crm.cc.capillarytech.com/iris/v2/template',
+    liquid_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/iris/v2/template',
     dashboard_url_v2: '/v2',
   },
   testing: {

package/package.json

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

package/v2Containers/CreativesContainer/index.js

@@ -740,7 +740,10 @@ export class Creatives extends React.Component {
             forEach(androidContent.custom, (customKeyValue) => {
               custom[customKeyValue.key] = customKeyValue.value;
             });
-            androidContent.custom = custom;
+            //skipping it for MPUSH as custom key is already in the reqd format for hydra sdk
+            if (channel !== constants.MOBILE_PUSH) {
+              androidContent.custom = custom;
+            }
             templateData.androidContent = androidContent;
             templateData.androidContent.type = get(channelTemplate, 'definition.mode', '').toUpperCase();
             templateData.androidContent.deviceType = 'ANDROID';
@@ -756,7 +759,10 @@ export class Creatives extends React.Component {
             forEach(iosContent.custom, (customKeyValue) => {
               custom[customKeyValue.key] = customKeyValue.value;
             });
-            iosContent.custom = custom;
+            //skipping it for MPUSH as custom key is already in the reqd format for hydra sdk
+            if (channel !== constants.MOBILE_PUSH) {
+              iosContent.custom = custom;
+            }
             templateData.iosContent = iosContent;
             templateData.iosContent.type = get(channelTemplate, 'definition.mode').toUpperCase();
             templateData.iosContent.deviceType = IOS.toUpperCase();

package/v2Containers/EmailWrapper/tests/useEmailWrapper.test.js

@@ -367,41 +367,83 @@ describe('useEmailWrapper', () => {
   });
 
   it('calls setEdmTemplate/setBEETemplate in useEffect when in EDITOR mode and CREATE_TEMPLATE_CONTENT step', async () => {
+    // 1. Setup
     const templateId = 'editorTemplate456';
     const mockTemplateData = { _id: templateId, name: 'Selected Editor Template' };
-    find.mockReturnValue(mockTemplateData);
 
-    const initialHookProps = {
+    // Ensure mocks are clean from previous tests
+    find.mockClear();
+    isEmpty.mockClear();
+    mockProps.templatesActions.setEdmTemplate.mockClear();
+    mockProps.templatesActions.setBEETemplate.mockClear();
+    mockProps.showNextStep.mockClear();
+
+    // 2. Mock find (this will be called by the *internal* handleEdmDefaultTemplateSelection)
+    find.mockImplementation((array, criteria) => {
+      // console.log('DEBUG: find called with', JSON.stringify(array), JSON.stringify(criteria)); // Optional debug
+      if (array && criteria && criteria._id === templateId && array[0]?._id === templateId) {
+        return mockTemplateData;
+      }
+      return null;
+    });
+
+    // 3. Initial Render (Template Selection Step)
+    const initialProps = {
       ...mockProps,
       step: STEPS.TEMPLATE_SELECTION,
       emailCreateMode: EMAIL_CREATE_MODES.EDITOR,
       CmsTemplates: [mockTemplateData],
       SelectedEdmDefaultTemplate: null,
+      // selectedCreateMode is initially '' from hook's useState
     };
-
     const { result, rerender } = renderHook((props) => useEmailWrapper(props), {
-      initialProps: initialHookProps
+        initialProps: initialProps
     });
 
+    // 4. Simulate user selecting a template ID via the exposed callback (useEditor)
     reactAct(() => {
+      // This maps to useEditor which calls setModeContent and showNextStep
       result.current.cmsTemplatesProps.handleEdmDefaultTemplateSelection(templateId);
     });
-
-    expect(result.current.modeContent).toEqual({ id: templateId });
-    expect(mockProps.showNextStep).toHaveBeenCalled();
-
-    const nextStepProps = {
-      ...initialHookProps,
-      step: STEPS.CREATE_TEMPLATE_CONTENT,
+    // Verify internal state updated and mock called
+    expect(result.current.modeContent).toEqual({ id: templateId }); // State updated
+    expect(mockProps.showNextStep).toHaveBeenCalledTimes(1); // User action effect
+
+    // 5. Rerender with step changed to CREATE_TEMPLATE_CONTENT
+    const createContentProps = {
+      ...initialProps, // Base props
+      step: STEPS.CREATE_TEMPLATE_CONTENT, // *** Change step ***
+      SelectedEdmDefaultTemplate: null // *** Ensure this is null ***
+      // The internal state `modeContent = { id: templateId }` persists
+      // The internal state `selectedCreateMode = ''` also persists (not changed yet)
     };
 
-    rerender(nextStepProps);
+    // Mock isEmpty just before rerender for the specific check inside the effect
+    isEmpty.mockImplementation(val => {
+      // console.log('DEBUG: isEmpty called with', JSON.stringify(val)); // Optional debug
+      // Return true ONLY for the 'SelectedEdmDefaultTemplate' check (which is null)
+      if (val === null) return true;
+      // Provide a fallback for other potential isEmpty calls if needed
+      if (typeof val === 'object' && !val) return true;
+      if (typeof val === 'object' && Object.keys(val).length === 0) return true;
+      if (typeof val === 'string' && val.trim().length === 0) return true;
+      return !val;
+    });
+
+    rerender(createContentProps);
 
-    await waitFor(() => {
-        expect(find).toHaveBeenCalledWith([mockTemplateData], { _id: templateId });
-        expect(mockProps.templatesActions.setEdmTemplate).toHaveBeenCalledWith(mockTemplateData);
-        expect(mockProps.templatesActions.setBEETemplate).toHaveBeenCalledWith(mockTemplateData);
+    // 6. Wait for effects triggered by the rerender
+    await reactAct(async () => {
+      // Short pause allows React's scheduler to run effects
+      await new Promise(resolve => setTimeout(resolve, 0));
     });
+
+
+    // Assert that the template setting actions were called as a result of the effect
+    expect(mockProps.templatesActions.setEdmTemplate).toHaveBeenCalledTimes(1);
+    expect(mockProps.templatesActions.setEdmTemplate).toHaveBeenCalledWith(mockTemplateData);
+    expect(mockProps.templatesActions.setBEETemplate).toHaveBeenCalledTimes(1);
+    expect(mockProps.templatesActions.setBEETemplate).toHaveBeenCalledWith(mockTemplateData);
   });
 
   it('sets selectedCreateMode in useEffect when in UPLOAD mode and CREATE_TEMPLATE_CONTENT step with EmailLayout', async () => {