@capillarytech/creatives-library 8.0.153 → 8.0.155

package/config/app.js

@@ -20,7 +20,7 @@ const config = {
     accountConfig: (strs, accountId) => `${window.location.origin}/org/config/AccountAdd?q=a&channelId=2&accountId=${accountId}&edit=1`,
   },
   development: {
-    api_endpoint: 'http://localhost:2022/arya/api/v1/creatives',
+    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',

package/index.js

@@ -103,13 +103,7 @@ import Rcs from './v2Containers/Rcs';
 import rcsReducer from './v2Containers/Rcs/reducer';
 import rcsSaga from './v2Containers/Rcs/sagas';
 
-// Utils
-import {
-  convertMediaTagsToUrls,
-  convertUrlsToMediaTags,
-} from './utils/transformTemplateConfig';
-
-//API Imports
+//API Imports 
 import { updateMetaConfig } from './services/api';
 
 export {default as Ebill} from './v2Containers/Ebill';
@@ -190,7 +184,5 @@ export { CapContainer,
   RcsContainer,
   ZaloContainer,
   InAppContainer,
-  convertMediaTagsToUrls,
-  convertUrlsToMediaTags,
   updateMetaConfig,
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "8.0.153",
+  "version": "8.0.155",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",
@@ -55,4 +55,4 @@
     "webpack-bugsnag-plugins": "^1.4.3",
     "whatwg-fetch": "3.0.0"
   }
-}
+}

package/services/api.js

@@ -329,11 +329,6 @@ export const getTemplateDetails = async ({id, channel}) => {
   return { ...compressedTemplatesData, response: decompressData};
 };
 
-export const getMediaDetails = async ({ id }) => {
-  const url = `${API_ENDPOINT}/media/${id}`;
-  return request(url, getAPICallObject('GET'));
-};
-
 export const getAllTemplates = async ({channel, queryParams = {}}) => {
   const url = getUrlWithQueryParams({
     url: `${API_ENDPOINT}/templates/v1/${channel}?`,
@@ -391,12 +386,13 @@ export const uploadFile = ({
     data.append('appSecret', wechatParams.appSecret);
   }
   if (whatsappParams) {
-    const { source, wabaId, accessToken, access_token, phoneId, hostName } = whatsappParams;
+    const { source, wabaId, accessToken, access_token, phoneId, hostName, baseUrl } = whatsappParams;
     data.append('source', source);
     data.append('wabaId', wabaId);
     data.append('accessToken', accessToken || access_token);
     data.append('phoneId', phoneId);
     data.append('hostName', hostName);
+    data.append('baseUrl', baseUrl);
   }
   const url = `${API_ENDPOINT}/assets/${assetType}`;
   // return API.post(url, data, true);

package/services/tests/api.test.js

@@ -24,7 +24,6 @@ import {
   createTestMessageMeta,
   updateTestMessageMeta,
   updateMetaConfig,
-  getMediaDetails,
 } from '../api';
 import { mockData } from './mockData';
 import getSchema from '../getSchema';
@@ -70,6 +69,7 @@ describe('uploadFile -- whatsapp image upload', () => {
           wabaId: '107499611940863',
           accessToken: 'Bearer gDwEuRIm9icV6phixociSw==',
           hostName: 'karixwhatsappbulk',
+          baseUrl: 'https://api.whatsapp.com/v1',
         },
       }),
     ).toEqual(Promise.resolve()));
@@ -823,28 +823,3 @@ describe('updateMetaConfig', () => {
     });
   });
 });
-
-describe('getMediaDetails', () => {
-  it('should return correct response on success', async () => {
-    global.fetch.mockReturnValue(Promise.resolve({
-      status: 200,
-      json: () => Promise.resolve({
-        status: 200,
-        response: 'test media details',
-      }),
-    }));
-    const result = await getMediaDetails({ id: 'testId' });
-    expect(result).toEqual({
-      status: 200,
-      response: 'test media details',
-    });
-  });
-
-  it('should handle fetch failure', async () => {
-    global.fetch.mockRejectedValue({ error: 'Network error' });
-    const result = await getMediaDetails({ id: 'testId' });
-    expect(result).toEqual({
-      error: 'Network error',
-    });
-  });
-});

package/services/tests/haptic-api.test.js

@@ -18,6 +18,7 @@ describe('HAPTIC API Integration Tests', () => {
         access_token: 'haptic-token',
         phoneId: 'phone-456',
         hostName: 'hapticwhatsappbulk',
+        baseUrl: 'https://api.whatsapp.com/v1',
       };
 
       // Mock successful response
@@ -55,6 +56,7 @@ describe('HAPTIC API Integration Tests', () => {
       expect(formData.get('accessToken')).toBe('haptic-token'); // Note: API converts access_token to accessToken
       expect(formData.get('phoneId')).toBe('phone-456');
       expect(formData.get('hostName')).toBe('hapticwhatsappbulk');
+      expect(formData.get('baseUrl')).toBe('https://api.whatsapp.com/v1');
     });
 
     it('should handle missing HAPTIC parameters gracefully', () => {
@@ -83,6 +85,7 @@ describe('HAPTIC API Integration Tests', () => {
       expect(formData.get('accessToken')).toBe('undefined');
       expect(formData.get('phoneId')).toBe('undefined');
       expect(formData.get('hostName')).toBe('undefined');
+      expect(formData.get('baseUrl')).toBe('undefined');
     });
 
     it('should handle undefined whatsappParams', () => {
@@ -109,6 +112,7 @@ describe('HAPTIC API Integration Tests', () => {
       expect(formData.get('accessToken')).toBeNull();
       expect(formData.get('phoneId')).toBeNull();
       expect(formData.get('hostName')).toBeNull();
+      expect(formData.get('baseUrl')).toBeNull();
     });
 
     it('should handle empty string parameters', () => {
@@ -119,6 +123,7 @@ describe('HAPTIC API Integration Tests', () => {
         access_token: '',
         phoneId: '',
         hostName: '',
+        baseUrl: '',
       };
 
       fetch.mockResolvedValueOnce({
@@ -139,6 +144,7 @@ describe('HAPTIC API Integration Tests', () => {
       expect(formData.get('accessToken')).toBe('');
       expect(formData.get('phoneId')).toBe('');
       expect(formData.get('hostName')).toBe('');
+      expect(formData.get('baseUrl')).toBe('');
     });
 
     it('should handle null parameters', () => {
@@ -149,6 +155,7 @@ describe('HAPTIC API Integration Tests', () => {
         access_token: null,
         phoneId: null,
         hostName: null,
+        baseUrl: null,
       };
 
       fetch.mockResolvedValueOnce({

package/services/tests/mockData.js

@@ -37,6 +37,7 @@ export const mockData = {
             accountId: '2000222347',
             accessToken: 'DTpZEh4VK',
             hostName: 'gupshupwhatsappbulk',
+            baseUrl: 'https://api.gupshup.io/whatsapp/v1',
           },
         },
       },

package/v2Containers/CreativesContainer/index.js

@@ -81,7 +81,7 @@ const SlideBoxWrapper = styled.div`
 export class Creatives extends React.Component {
   constructor(props) {
     super(props);
-
+    
     const initialSlidBoxContent = this.getSlideBoxContent({ mode: props.creativesMode, templateData: props.templateData, isFullMode: props.isFullMode });
 
     this.state = {
@@ -954,7 +954,6 @@ export class Creatives extends React.Component {
             default:
               break;
           }
-
           templateData = {
             channel,
             accountId,
@@ -962,7 +961,7 @@ export class Creatives extends React.Component {
             accountName: accountDetails?.name || '',
             messageBody: languages[0].content,
             templateConfigs: {
-              id: template?._id,
+              id: template?.value?.name,
               name: template?.value?.name,
               template: templateEditor,
               varMapped,

package/v2Containers/Templates/tests/mockData.js

@@ -81,6 +81,7 @@ export const senderDetailsWhatsapp = {
       wabaId: "testSourceAccount",
       userid: "testSourceAccount",
       sourceAccountIdentifier: "testSourceAccount",
+      baseUrl: "https://api.whatsapp.com/v1",
     },
     hostname: "testWhatsappHost",
   },

package/v2Containers/Whatsapp/index.js

@@ -39,6 +39,7 @@ import {
   CAP_WHITE,
 } from '@capillarytech/cap-ui-library/styled/variables';
 import { makeSelectWhatsapp, makeSelectAccount } from './selectors';
+import { makeSelectTemplates } from '../Templates/selectors';
 import {
   isLoadingMetaEntities,
   makeSelectMetaEntities,
@@ -135,6 +136,23 @@ let editContent = {};
 let tagValidationResponse = {};
 let headerTagValidationResponse = {};
 
+// Function to extract baseUrl from domainProperties
+export const extractBaseUrlFromDomainProperties = (selectedSourceAccountIdentifier, domainPropertiesData = []) => {
+  if (!selectedSourceAccountIdentifier || isEmpty(domainPropertiesData)) {
+    return '';
+  }
+
+  // Handle both API response structure and processed Redux state
+  const whatsappDomainProperties = domainPropertiesData?.entity?.WHATSAPP || domainPropertiesData;
+
+  const domainProperty = whatsappDomainProperties?.find(({ domainProperties }) => {
+    const { connectionProperties: { sourceAccountIdentifier } = {} } = domainProperties || {};
+    return sourceAccountIdentifier === selectedSourceAccountIdentifier;
+  });
+
+  return domainProperty?.domainProperties?.connectionProperties?.baseUrl || '';
+};
+
 export const Whatsapp = (props) => {
   const {
     intl,
@@ -184,6 +202,7 @@ export const Whatsapp = (props) => {
   const [accessToken, setAccessToken] = useState('');
   const [accountName, setAccountName] = useState('');
   const [host, setHost] = useState('');
+  const [baseUrl, setBaseUrl] = useState('');
   const [spin, setSpin] = useState(false);
   const [unsubscribeRequired, setUnsubscribeRequired] = useState(false);
   const [securityWarningReqd, setSecurityWarningReqd] = useState(false);
@@ -276,8 +295,14 @@ export const Whatsapp = (props) => {
       setAccessToken(configs.accessToken || '');
       setAccountName(name);
       setHost(hostName);
+
+      // Extract baseUrl from domainProperties
+      const { senderDetails = {} } = props.Templates || {};
+      const { domainProperties = [] } = senderDetails;
+      const extractedBaseUrl = extractBaseUrlFromDomainProperties(sourceAccountIdentifier, domainProperties);
+      setBaseUrl(extractedBaseUrl);
     }
-  }, [accountData.selectedWhatsappAccount]);
+  }, [accountData.selectedWhatsappAccount, props.Templates?.senderDetails]);
 
   //gets template details
   const paramObj = params || {};
@@ -1073,6 +1098,7 @@ const isAuthenticationTemplate = isEqual(templateCategory, WHATSAPP_CATEGORIES.a
       wabaId: accountId,
       phoneId,
       hostName: host,
+      baseUrl: baseUrl,
     };
 
     // Add the correct access token field based on host
@@ -1613,6 +1639,7 @@ const isAuthenticationTemplate = isEqual(templateCategory, WHATSAPP_CATEGORIES.a
                     accessToken,
                   }),
               hostName: host,
+              baseUrl: baseUrl,
               ...(isBtnTypeQuickReply && {
                 buttonType,
                 buttons: getQuickReplyData(),
@@ -2981,6 +3008,7 @@ const isAuthenticationTemplate = isEqual(templateCategory, WHATSAPP_CATEGORIES.a
 const mapStateToProps = createStructuredSelector({
   editData: makeSelectWhatsapp(),
   accountData: makeSelectAccount(),
+  Templates: makeSelectTemplates(),
   metaEntities: makeSelectMetaEntities(),
   loadingTags: isLoadingMetaEntities(),
   injectedTags: setInjectedTags(),