@capillarytech/creatives-library 8.0.82 → 8.0.85-alpha.0

package/components/TemplatePreview/_templatePreview.scss

@@ -636,4 +636,7 @@
   span {
     font-size: $FONT_SIZE_VS;
   }
+}
+.line-image-preview{
+  max-width: 8.57rem;;
 }

package/components/TemplatePreview/index.js

@@ -464,6 +464,7 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
                               >
                                 <CapImage
                                   src={previewImageUrl}
+                                  className="line-image-preview"
                                   alt="brand-name"
                                   rest={{
                                     style: {
@@ -495,6 +496,7 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
                               >
                                 <CapImage
                                   src={baseUrl ? `${baseUrl}/1040` : lineImgPlaceholder}
+                                  className="line-image-preview"
                                   alt="brand-name"
                                   rest={{
                                     style: {

package/containers/Assets/Gallery/sagas.js

@@ -2,9 +2,9 @@ import { call, put, takeLatest, all } from 'redux-saga/effects';
 import * as Api from '../../../services/api';
 import * as types from './constants';
 
-export function* getAllAssets(assetType, queryParams) {
+export function* getAllAssets({assetType , queryParams}) {
   try {
-    const result = yield call(Api.getAllAssets, assetType, queryParams);
+    const result = yield call(Api.getAllAssets, {assetType, queryParams});
     yield put({ type: types.GET_ALL_ASSETS_SUCCESS, data: result?.response, isReset: queryParams.page === 1 });
   } catch (error) {
     yield put({ type: types.GET_ALL_ASSETS_FAILURE, error });

package/containers/Assets/Gallery/tests/saga.test.js

@@ -1,46 +1,44 @@
 import { expectSaga } from 'redux-saga-test-plan';
-import { call, put } from 'redux-saga/effects';
+import { call } from 'redux-saga/effects';
 import { throwError } from 'redux-saga-test-plan/providers';
-import * as Api from '../../../../services/api'; 
-import * as types from '../constants'; 
-import * as sagas from '../sagas'; 
-import {gallerySaga} from '../sagas';
+import * as Api from '../../../../services/api';
+import * as types from '../constants';
+import * as sagas from '../sagas';
 
 describe('Asset and User Management Sagas', () => {
+  jest.setTimeout(1000);
+
   describe('getAllAssets Saga', () => {
+    const mockAssets = [{ id: 1, url: 'http://example.com/asset.jpg' }];
+    const mockError = new Error('Fetch failed');
     const assetType = 'image';
     const queryParams = { page: 1 };
 
     it('handles fetching all assets successfully', () => {
-      const fakeResponse = {
-        response: [{ id: 1, url: 'http://example.com/asset.jpg' }],
+      const result = {
+        response: { data: { data: mockAssets } },
       };
-
-      return expectSaga(sagas.getAllAssets, assetType, queryParams)
+      return expectSaga(sagas.getAllAssets, { assetType, queryParams })
         .provide([
-          [call(Api.getAllAssets, assetType, queryParams), fakeResponse]
+          [call(Api.getAllAssets, { assetType, queryParams }), result],
         ])
         .put({
-          type: types.GET_ALL_ASSETS_SUCCESS,
-          data: fakeResponse.response,
-          isReset: true
+          type: 'app/Gallery/GET_ALL_ASSETS_SUCCESS',
+          data: { data: { data: mockAssets } },
+          isReset: true,
         })
-        .run();
+        .run(500);
     });
 
-    it('handles failure in fetching all assets', () => {
-      const error = new Error('Fetch failed');
-
-      return expectSaga(sagas.getAllAssets, assetType, queryParams)
-        .provide([
-          [call(Api.getAllAssets, assetType, queryParams), throwError(error)]
-        ])
-        .put({
-          type: types.GET_ALL_ASSETS_FAILURE,
-          error
-        })
-        .run();
-    });
+    it('handles failure in fetching all assets', () => expectSaga(sagas.getAllAssets, { assetType, queryParams })
+      .provide([
+        [call(Api.getAllAssets, { assetType, queryParams }), throwError(mockError)],
+      ])
+      .put({
+        type: 'app/Gallery/GET_ALL_ASSETS_FAILURE',
+        error: mockError,
+      })
+      .run(500));
   });
 
   describe('uploadAsset Saga', () => {
@@ -51,17 +49,17 @@ describe('Asset and User Management Sagas', () => {
     it('handles successful asset upload', () => {
       const fakeResponse = {
         response: { asset: { id: 1, url: 'http://example.com/asset.jpg' } },
-        status: { code: 200 }
+        status: { code: 200 },
       };
 
       return expectSaga(sagas.uploadAsset, file, assetType, fileParams)
         .provide([
-          [call(Api.uploadFile, file, assetType, fileParams), fakeResponse]
+          [call(Api.uploadFile, file, assetType, fileParams), fakeResponse],
         ])
         .put({
           type: types.UPLOAD_ASSET_SUCCESS,
           data: fakeResponse.response.asset,
-          statusCode: 200
+          statusCode: 200,
         })
         .run();
     });
@@ -71,11 +69,11 @@ describe('Asset and User Management Sagas', () => {
 
       return expectSaga(sagas.uploadAsset, file, assetType, fileParams)
         .provide([
-          [call(Api.uploadFile, file, assetType, fileParams), throwError(error)]
+          [call(Api.uploadFile, file, assetType, fileParams), throwError(error)],
         ])
         .put({
           type: types.UPLOAD_ASSET_FAILURE,
-          error
+          error,
         })
         .run();
     });
@@ -87,16 +85,16 @@ describe('Asset and User Management Sagas', () => {
 
     it('handles deleting an asset successfully', () => {
       const fakeResponse = {
-        response: 'Asset deleted successfully'
+        response: 'Asset deleted successfully',
       };
 
       return expectSaga(sagas.deleteAssetById, assetId, assetType)
         .provide([
-          [call(Api.deleteAssetById, assetId, assetType), fakeResponse]
+          [call(Api.deleteAssetById, assetId, assetType), fakeResponse],
         ])
         .put({
           type: types.DELETE_ASSET_SUCCESS,
-          data: fakeResponse.response
+          data: fakeResponse.response,
         })
         .run();
     });
@@ -110,7 +108,7 @@ describe('Asset and User Management Sagas', () => {
         ])
         .put({
           type: types.DELETE_ASSET_FAILURE,
-          error
+          error,
         })
         .run();
     });
@@ -120,17 +118,17 @@ describe('Asset and User Management Sagas', () => {
     it('handles fetching user list successfully', () => {
       const fakeResponse = {
         data: {
-          result: [{ id: 1, name: 'User One' }]
-        }
+          result: [{ id: 1, name: 'User One' }],
+        },
       };
 
       return expectSaga(sagas.fetchUserList)
         .provide([
-          [call(Api.getUserList), fakeResponse]
+          [call(Api.getUserList), fakeResponse],
         ])
         .put({
           type: types.GET_USER_LIST_SUCCESS,
-          data: fakeResponse.data.result
+          data: fakeResponse.data.result,
         })
         .run();
     });
@@ -140,11 +138,11 @@ describe('Asset and User Management Sagas', () => {
 
       return expectSaga(sagas.fetchUserList)
         .provide([
-          [call(Api.getUserList), throwError(error)]
+          [call(Api.getUserList), throwError(error)],
         ])
         .put({
           type: types.GET_USER_LIST_FAILURE,
-          data: error
+          data: error,
         })
         .run();
     });
@@ -153,9 +151,7 @@ describe('Asset and User Management Sagas', () => {
 
   // Test combined saga
   describe('Combined gallerySaga', () => {
-    it('should initialize all gallery-related watcher sagas without error', () => {
-      return expectSaga(gallerySaga)
-        .run();
-    });
+    it('should initialize all gallery-related watcher sagas without error', () => expectSaga(sagas.gallerySaga)
+      .run());
   });
-});
+});

package/containers/Email/sagas.js

@@ -12,7 +12,9 @@ export function* createTemplate(template) {
     if (result.message || result.status.code === 500) {
       errorMsg = result.message;
     }
-    yield put({ type: types.CREATE_TEMPLATE_SUCCESS, data: result.response, statusCode: result.status ? result.status.code : '', errorMsg });
+    yield put({
+      type: types.CREATE_TEMPLATE_SUCCESS, data: result.response, statusCode: result.status ? result.status.code : '', errorMsg,
+    });
   } catch (error) {
     yield put({ type: types.CREATE_TEMPLATE_FAILURE, error, errorMsg });
   }
@@ -21,12 +23,13 @@ export function* createTemplate(template) {
 export function* duplicateTemplate(id, channel) {
   let errorMsg;
   try {
-    
-    const result = yield call(Api.duplicateTemplate, id, channel );
+    const result = yield call(Api.duplicateTemplate, id, channel);
     if (result.message || result.status.code === 500) {
       errorMsg = result.message;
     }
-    yield put({ type: types.DUPLICATE_TEMPLATE_SUCCESS, data: result.response, statusCode: result.status ? result.status.code : '', errorMsg });
+    yield put({
+      type: types.DUPLICATE_TEMPLATE_SUCCESS, data: result.response, statusCode: result.status ? result.status.code : '', errorMsg,
+    });
   } catch (error) {
     yield put({ type: types.DUPLICATE_TEMPLATE_FAILURE, error, errorMsg });
   }
@@ -34,7 +37,6 @@ export function* duplicateTemplate(id, channel) {
 
 export function* getTemplateDetails(id) {
   try {
-    
     const result = yield call(Api.getTemplateDetails, id);
     // const sidebar = result.response.sidebar;
     yield put({ type: types.GET_TEMPLATE_DETAILS_SUCCESS, data: result.response });
@@ -43,16 +45,18 @@ export function* getTemplateDetails(id) {
   }
 }
 
-export function* getAllAssets(assetType, queryParams) {
+export function* getAllAssets({ assetType, queryParams }) {
   try {
-    const result = yield call(Api.getAllAssets, assetType, queryParams);
+    const result = yield call(Api.getAllAssets, { assetType, queryParams });
     yield put({ type: types.GET_ALL_ASSETS_SUCCESS, data: result?.response, isReset: queryParams.page === 1 });
   } catch (error) {
     yield put({ type: types.GET_ALL_ASSETS_FAILURE, error });
   }
 }
 
-export function* getCmsSetting({cmsType, projectId, cmsMode, langId, isEdmSupport}) {
+export function* getCmsSetting({
+  cmsType, projectId, cmsMode, langId, isEdmSupport,
+}) {
   try {
     const result = yield call(Api.getCmsTemplateSettings, cmsType, projectId, cmsMode, langId, isEdmSupport);
     yield put({ type: types.GET_CMS_EDITOR_DETAILS_SUCCESS, settings: result.data.response.cmsDetails });
@@ -61,7 +65,7 @@ export function* getCmsSetting({cmsType, projectId, cmsMode, langId, isEdmSuppor
   }
 }
 
-export function* getCmsData({cmsType, projectId, langId}) {
+export function* getCmsData({ cmsType, projectId, langId }) {
   try {
     const result = yield call(Api.getCmsTemplateData, cmsType, projectId, langId);
     yield put({ type: types.GET_CMS_EDITOR_DATA_SUCCESS, data: result.data.response.data, langId: result.data.response.langId });

package/containers/Email/test/saga.test.js

@@ -1,29 +1,32 @@
 import { expectSaga } from 'redux-saga-test-plan';
-import { call, put } from 'redux-saga/effects';
+import { call } from 'redux-saga/effects';
 import { throwError } from 'redux-saga-test-plan/providers';
-import * as Api from '../../../services/api'; 
-import * as types from '../constants'; 
-import * as sagas from '../sagas'; 
+import * as Api from '../../../services/api';
+import * as types from '../constants';
+import * as sagas from '../sagas';
 
 describe('Email Template Sagas', () => {
+  // Increase timeout to prevent timeout warnings
+  jest.setTimeout(1000);
+
   describe('createTemplate Saga', () => {
     const template = { name: 'New Template' };
 
     it('handles creating a template successfully', () => {
       const fakeResponse = {
         response: { id: 1, name: 'New Template' },
-        status: { code: 200 }
+        status: { code: 200 },
       };
 
       return expectSaga(sagas.createTemplate, template)
         .provide([
-          [call(Api.createEmailTemplate, template), fakeResponse]
+          [call(Api.createEmailTemplate, template), fakeResponse],
         ])
         .put({
           type: types.CREATE_TEMPLATE_SUCCESS,
           data: fakeResponse.response,
           statusCode: 200,
-          errorMsg: undefined
+          errorMsg: undefined,
         })
         .run();
     });
@@ -33,12 +36,12 @@ describe('Email Template Sagas', () => {
 
       return expectSaga(sagas.createTemplate, template)
         .provide([
-          [call(Api.createEmailTemplate, template), throwError(error)]
+          [call(Api.createEmailTemplate, template), throwError(error)],
         ])
         .put({
           type: types.CREATE_TEMPLATE_FAILURE,
           error,
-          errorMsg: undefined
+          errorMsg: undefined,
         })
         .run();
     });
@@ -51,18 +54,18 @@ describe('Email Template Sagas', () => {
     it('handles duplicating a template successfully', () => {
       const fakeResponse = {
         response: { id: 2, name: 'Duplicated Template' },
-        status: { code: 200 }
+        status: { code: 200 },
       };
 
       return expectSaga(sagas.duplicateTemplate, id, channel)
         .provide([
-          [call(Api.duplicateTemplate, id, channel), fakeResponse]
+          [call(Api.duplicateTemplate, id, channel), fakeResponse],
         ])
         .put({
           type: types.DUPLICATE_TEMPLATE_SUCCESS,
           data: fakeResponse.response,
           statusCode: 200,
-          errorMsg: undefined
+          errorMsg: undefined,
         })
         .run();
     });
@@ -72,12 +75,12 @@ describe('Email Template Sagas', () => {
 
       return expectSaga(sagas.duplicateTemplate, id, channel)
         .provide([
-          [call(Api.duplicateTemplate, id, channel), throwError(error)]
+          [call(Api.duplicateTemplate, id, channel), throwError(error)],
         ])
         .put({
           type: types.DUPLICATE_TEMPLATE_FAILURE,
           error,
-          errorMsg: undefined
+          errorMsg: undefined,
         })
         .run();
     });
@@ -88,16 +91,16 @@ describe('Email Template Sagas', () => {
 
     it('handles fetching template details successfully', () => {
       const fakeResponse = {
-        response: { id: 123, name: 'Detailed Template' }
+        response: { id: 123, name: 'Detailed Template' },
       };
 
       return expectSaga(sagas.getTemplateDetails, id)
         .provide([
-          [call(Api.getTemplateDetails, id), fakeResponse]
+          [call(Api.getTemplateDetails, id), fakeResponse],
         ])
         .put({
           type: types.GET_TEMPLATE_DETAILS_SUCCESS,
-          data: fakeResponse.response
+          data: fakeResponse.response,
         })
         .run();
     });
@@ -107,71 +110,70 @@ describe('Email Template Sagas', () => {
 
       return expectSaga(sagas.getTemplateDetails, id)
         .provide([
-          [call(Api.getTemplateDetails, id), throwError(error)]
+          [call(Api.getTemplateDetails, id), throwError(error)],
         ])
         .put({
           type: types.GET_TEMPLATE_DETAILS_FAILURE,
-          error
+          error,
         })
         .run();
     });
   });
 
   describe('getAllAssets Saga', () => {
+    const mockAssets = [{ id: 1, url: 'http://example.com/asset.jpg' }];
+    const mockError = new Error('Fetch failed');
     const assetType = 'image';
     const queryParams = { page: 1 };
 
     it('handles fetching all assets successfully', () => {
-      const fakeResponse = {
-        response: [{ id: 1, url: 'http://example.com/asset.jpg' }],
+      const result = {
+        response: { data: { data: mockAssets } },
       };
-
-      return expectSaga(sagas.getAllAssets, assetType, queryParams)
+      return expectSaga(sagas.getAllAssets, { assetType, queryParams })
         .provide([
-          [call(Api.getAllAssets, assetType, queryParams), fakeResponse]
+          [call(Api.getAllAssets, { assetType, queryParams }), result],
         ])
         .put({
           type: types.GET_ALL_ASSETS_SUCCESS,
-          data: fakeResponse.response,
-          isReset: true
+          data: { data: { data: mockAssets } }, // Match the exact nested structure
+          isReset: true,
         })
-        .run();
+        .run(500);
     });
 
-    it('handles failure in fetching all assets', () => {
-      const error = new Error('Fetch failed');
-
-      return expectSaga(sagas.getAllAssets, assetType, queryParams)
-        .provide([
-          [call(Api.getAllAssets, assetType, queryParams), throwError(error)]
-        ])
-        .put({
-          type: types.GET_ALL_ASSETS_FAILURE,
-          error
-        })
-        .run();
-    });
+    it('handles failure in fetching all assets', () => expectSaga(sagas.getAllAssets, { assetType, queryParams })
+      .provide([
+        [call(Api.getAllAssets, { assetType, queryParams }), throwError(mockError)],
+      ])
+      .put({
+        type: types.GET_ALL_ASSETS_FAILURE,
+        error: mockError,
+      })
+      .run(500));
   });
 
   describe('getCmsSetting Saga', () => {
-    const params = { cmsType: 'email', projectId: '123', cmsMode: 'edit', langId: 'en', isEdmSupport: true };
+    const params = {
+      cmsType: 'email', projectId: '123', cmsMode: 'edit', langId: 'en', isEdmSupport: true,
+    };
 
     it('handles fetching CMS settings successfully', () => {
       const fakeResponse = {
         data: {
           response: {
-            cmsDetails: { id: 1, name: 'CMS Config' }
-          }
-        }
+            cmsDetails: { id: 1, name: 'CMS Config' },
+          },
+        },
       };
 
       return expectSaga(sagas.getCmsSetting, params)
         .provide([
-          [call(Api.getCmsTemplateSettings, params.cmsType, params.projectId, params.cmsMode, params.langId, params.isEdmSupport), fakeResponse]
+          [call(Api.getCmsTemplateSettings, params.cmsType, params.projectId, params.cmsMode, params.langId, params.isEdmSupport), fakeResponse],
         ])
         .put({
           type: types.GET_CMS_EDITOR_DETAILS_SUCCESS,
-          settings: fakeResponse.data.response.cmsDetails
+          settings: fakeResponse.data.response.cmsDetails,
         })
         .run();
     });
@@ -181,11 +183,11 @@ describe('Email Template Sagas', () => {
 
       return expectSaga(sagas.getCmsSetting, params)
         .provide([
-          [call(Api.getCmsTemplateSettings, params.cmsType, params.projectId, params.cmsMode, params.langId, params.isEdmSupport), throwError(error)]
+          [call(Api.getCmsTemplateSettings, params.cmsType, params.projectId, params.cmsMode, params.langId, params.isEdmSupport), throwError(error)],
         ])
         .put({
           type: types.GET_CMS_EDITOR_DETAILS_FAILURE,
-          error
+          error,
         })
         .run();
     });
@@ -199,19 +201,19 @@ describe('Email Template Sagas', () => {
         data: {
           response: {
             data: { id: 1, content: 'Content here' },
-            langId: 'en'
-          }
-        }
+            langId: 'en',
+          },
+        },
       };
 
       return expectSaga(sagas.getCmsData, params)
         .provide([
-          [call(Api.getCmsTemplateData, params.cmsType, params.projectId, params.langId), fakeResponse]
+          [call(Api.getCmsTemplateData, params.cmsType, params.projectId, params.langId), fakeResponse],
         ])
         .put({
           type: types.GET_CMS_EDITOR_DATA_SUCCESS,
           data: fakeResponse.data.response.data,
-          langId: fakeResponse.data.response.langId
+          langId: fakeResponse.data.response.langId,
         })
         .run();
     });
@@ -221,11 +223,11 @@ describe('Email Template Sagas', () => {
 
       return expectSaga(sagas.getCmsData, params)
         .provide([
-          [call(Api.getCmsTemplateData, params.cmsType, params.projectId, params.langId), throwError(error)]
+          [call(Api.getCmsTemplateData, params.cmsType, params.projectId, params.langId), throwError(error)],
         ])
         .put({
           type: types.GET_CMS_EDITOR_DATA_FAILURE,
-          error
+          error,
         })
         .run();
     });
@@ -239,17 +241,17 @@ describe('Email Template Sagas', () => {
     it('handles successful asset upload', () => {
       const fakeResponse = {
         response: { asset: { id: 1, url: 'http://example.com/asset.jpg' } },
-        status: { code: '200' }
+        status: { code: '200' },
       };
 
       return expectSaga(sagas.uploadAsset, file, assetType, fileParams)
         .provide([
-          [call(Api.uploadFile, file, assetType, fileParams), fakeResponse]
+          [call(Api.uploadFile, file, assetType, fileParams), fakeResponse],
         ])
         .put({
           type: types.UPLOAD_ASSET_SUCCESS,
           data: fakeResponse.response.asset,
-          statusCode: '200'
+          statusCode: '200',
         })
         .run();
     });
@@ -259,20 +261,18 @@ describe('Email Template Sagas', () => {
 
       return expectSaga(sagas.uploadAsset, file, assetType, fileParams)
         .provide([
-          [call(Api.uploadFile, file, assetType, fileParams), throwError(error)]
+          [call(Api.uploadFile, file, assetType, fileParams), throwError(error)],
         ])
         .put({
           type: types.UPLOAD_ASSET_FAILURE,
-          error
+          error,
         })
         .run();
     });
   });
 
   describe('Combined emailSaga', () => {
-    it('should initialize all email-related watcher sagas without error', () => {
-      return expectSaga(sagas.emailSaga)
-        .run();
-    });
+    it('should initialize all email-related watcher sagas without error', () => expectSaga(sagas.emailSaga)
+      .run());
   });
-});
+});

package/package.json

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

package/v2Components/TemplatePreview/_templatePreview.scss

@@ -1013,4 +1013,7 @@
 }
 .viber-image-preview {
   width: 9.75rem;
+}
+.line-image-preview{
+  max-width: 8.57rem;;
 }

package/v2Components/TemplatePreview/index.js

@@ -758,6 +758,7 @@ export class TemplatePreview extends React.Component { // eslint-disable-line re
                             <CapImage
                               src={previewImageUrl}
                               alt="brand-name"
+                              className="line-image-preview"
                               rest={{
                                 style: {
                                   maxWidth: "100%",
@@ -799,6 +800,7 @@ export class TemplatePreview extends React.Component { // eslint-disable-line re
                                 baseUrl ? `${baseUrl}/1040` : lineImgPlaceholder
                               }
                               alt="brand-name"
+                              className="line-image-preview"
                               rest={{
                                 style: {
                                   maxWidth: "100%",

package/v2Containers/MobilePush/Edit/actions.js

@@ -5,7 +5,7 @@
  */
 
 
-import * as types from "../../MobilePush/Edit/constants";
+import * as types from "./constants";
 
 export function defaultAction() {
   return {
@@ -14,23 +14,23 @@ export function defaultAction() {
 }
 
 export function editTemplate(template, callback) {
-  
   return {
     type: types.EDIT_TEMPLATE_REQUEST, template, callback,
   };
 }
 
 export function getTemplateDetails(id) {
-  
   return {
     type: types.GET_TEMPLATE_DETAILS_REQUEST, id,
   };
 }
+
 export function getIosCtas(licenseCode) {
   return {
     type: types.GET_IOS_CTAS, licenseCode,
   };
 }
+
 export function uploadAsset(file, assetType, fileParams, mode) {
   return {
     type: types.UPLOAD_ASSET_REQUEST,
@@ -41,16 +41,17 @@ export function uploadAsset(file, assetType, fileParams, mode) {
   };
 }
 export function clearEditResponse() {
-  
   return {
     type: types.CLEAR_EDIT_RESPONSE_REQUEST,
   };
 }
+
 export function clearData() {
   return {
     type: types.CLEAR_DATA,
   };
 }
+
 export function clearAsset() {
   return {
     type: types.CLEAR_ASSET,
@@ -69,6 +70,7 @@ export function setWeChatAccount(weChatAccount) {
     weChatAccount,
   };
 }
+
 export function getMobilepushTemplatesList(channel, queryParams) {
   return {
     type: types.GET_MOBILEPUSH_TEMPLATES_LIST_REQUEST,
@@ -76,6 +78,7 @@ export function getMobilepushTemplatesList(channel, queryParams) {
     queryParams,
   };
 }
+
 export function setSelectedTemplate(templateData) {
   return {
     type: types.SET_SELECTED_TEMPLATE,

package/v2Containers/MobilePush/Edit/index.js

@@ -1,4 +1,3 @@
-
 /*
  *
  * Create
@@ -525,8 +524,16 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
           }
           return actionLink;
         }).filter((actionLink) => actionLink);
+        // Check if base URL already has query parameters
+        const baseUrl = obj.versions.base.ANDROID.cta.actionLink;
         if (params.length) {
-          obj.versions.base.ANDROID.cta.actionLink = `${obj.versions.base.ANDROID.cta.actionLink}?${params.join('&')}`;
+          // Only append parameters if the URL doesn't already have them
+          if (baseUrl.indexOf('?') === -1) {
+            obj.versions.base.ANDROID.cta.actionLink = `${baseUrl}?${params.join('&')}`;
+          } else {
+            // URL already has parameters, don't append them again
+            obj.versions.base.ANDROID.cta.actionLink = baseUrl;
+          }
         }
       }
     }
@@ -596,8 +603,16 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
           }
           return actionLink;
         }).filter((actionLink) => actionLink);
+        // Check if base URL already has query parameters
+        const baseUrl = obj.versions.base.IOS.cta.actionLink;
         if (params.length) {
-          obj.versions.base.IOS.cta.actionLink = `${obj.versions.base.IOS.cta.actionLink}?${params.join('&')}`;
+          // Only append parameters if the URL doesn't already have them
+          if (baseUrl.indexOf('?') === -1) {
+            obj.versions.base.IOS.cta.actionLink = `${baseUrl}?${params.join('&')}`;
+          } else {
+            // URL already has parameters, don't append them again
+            obj.versions.base.IOS.cta.actionLink = baseUrl;
+          }
         }
       }
     }
@@ -743,14 +758,6 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
         } else {
           android['cta-deeplink-text'] = androidData ? androidData.cta.actionLink : '';
         }
-        if (androidData.cta.type === "DEEP_LINK" ) {
-          const link = android['cta-deeplink-select'].split('?')[0];
-          const params = android['cta-deeplink-select'].split('?')[1] && android['cta-deeplink-select'].split('?')[1].split('&');
-          android['cta-deeplink-select'] = link;
-          _.forEach(params, (param) => {
-            android[`custom-value-${param.split('=')[0]}-cta-deeplink-select`] = param.split('=')[1];
-          });
-        }
       }
       if (androidData.expandableDetails && androidData.expandableDetails.image) {
         android.image = androidData.expandableDetails.image;
@@ -765,30 +772,59 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
         }
         android['secondary-cta-0-label'] = androidData.expandableDetails.ctas[0].actionText;
         if (androidData.expandableDetails.ctas[0].type === "DEEP_LINK") {
-          const link = android['cta-deeplink-secondary-cta-0-select'].split('?')[0];
-          const params = android['cta-deeplink-secondary-cta-0-select'].split('?')[1] && android['cta-deeplink-secondary-cta-0-select'].split('?')[1].split('&');
-          android['cta-deeplink-secondary-cta-0-select'] = link;
-          _.forEach(params, (param) => {
-            android[`custom-value-${param.split('=')[0]}-cta-deeplink-secondary-cta-0-select`] = param.split('=')[1];
-          });
-        }
-      }
-      if (androidData.expandableDetails && androidData.expandableDetails.ctas && androidData.expandableDetails.ctas.length > 1) {
-        android['add-sec-cta-2'] = true;
-        android['cta-deeplink-secondary-cta-1'] = androidData.expandableDetails.ctas[1].type === "DEEP_LINK" ? "Deeplink" : "External Link";
-        if (androidData.expandableDetails.ctas[1].type === "DEEP_LINK") {
-          android['cta-deeplink-secondary-cta-1-select'] = androidData.expandableDetails.ctas[1].actionLink;
-        } else {
-          android['cta-deeplink-secondary-cta-1-text'] = androidData.expandableDetails.ctas[1].actionLink;
+          const originalUrl = android['cta-deeplink-secondary-cta-0-select'];
+          
+          // Check if URL contains custom parameters that need extraction
+          if (originalUrl.includes('custom_param=')) {
+            const link = originalUrl.split('?')[0];
+            const params = originalUrl.split('?')[1] && originalUrl.split('?')[1].split('&');
+            
+            // Only process and extract custom parameters
+            const customParams = params?.filter(param => param.startsWith('custom_param='));
+            
+            if (customParams?.length) {
+              android['cta-deeplink-secondary-cta-0-select'] = link;
+              _.forEach(customParams, (param) => {
+                android[`custom-value-${param.split('=')[0]}-cta-deeplink-secondary-cta-0-select`] = param.split('=')[1];
+              });
+            }
+          }
+          // If no custom parameters, keep original URL intact
+          // android['cta-deeplink-secondary-cta-0-select'] remains unchanged
         }
-        android['secondary-cta-1-label'] = androidData.expandableDetails.ctas[1].actionText;
-        if (androidData.expandableDetails.ctas[1].type === "DEEP_LINK" && android['cta-deeplink-secondary-cta-1-select']) {
-          const link = android['cta-deeplink-secondary-cta-1-select'].split('?')[0];
-          const params = android['cta-deeplink-secondary-cta-1-select'].split('?')[1] && android['cta-deeplink-secondary-cta-1-select'].split('?')[1].split('&');
-          android['cta-deeplink-secondary-cta-1-select'] = link;
-          _.forEach(params, (param) => {
-            android[`custom-value-${param.split('=')[0]}-cta-deeplink-secondary-cta-1-select`] = param.split('=')[1];
-          });
+        if (androidData.expandableDetails && androidData.expandableDetails.ctas && androidData.expandableDetails.ctas.length > 1) {
+          android['add-sec-cta-2'] = true;
+          android['cta-deeplink-secondary-cta-1'] = androidData.expandableDetails.ctas[1].type === "DEEP_LINK" ? "Deeplink" : "External Link";
+          if (androidData.expandableDetails.ctas[1].type === "DEEP_LINK") {
+            android['cta-deeplink-secondary-cta-1-select'] = androidData.expandableDetails.ctas[1].actionLink;
+          } else {
+            android['cta-deeplink-secondary-cta-1-text'] = androidData.expandableDetails.ctas[1].actionLink;
+          }
+          android['secondary-cta-1-label'] = androidData.expandableDetails.ctas[1].actionText;
+          if (androidData.expandableDetails.ctas[1].type === "DEEP_LINK" && android['cta-deeplink-secondary-cta-1-select']) {
+            const originalUrl = android['cta-deeplink-secondary-cta-1-select'];
+            
+            // Check if URL contains custom parameters that need extraction
+            if (originalUrl.includes('custom_param=')) {
+              const link = originalUrl.split('?')[0];
+              const params = originalUrl.split('?')[1] && originalUrl.split('?')[1].split('&');
+              
+              // Only process and extract custom parameters
+              const customParams = params?.filter(param => param.startsWith('custom_param='));
+              
+              if (customParams?.length) {
+                android['cta-deeplink-secondary-cta-1-select'] = link;
+                _.forEach(customParams, (param) => {
+                  android[`custom-value-${param.split('=')[0]}-cta-deeplink-secondary-cta-1-select`] = param.split('=')[1];
+                });
+              }
+            }
+            // If no custom parameters, keep original URL intact
+            // android['cta-deeplink-secondary-cta-1-select'] remains unchanged
+          }
+          if (androidData.expandableDetails && androidData.expandableDetails.ctas?.[1]?.type === "DEEP_LINK") {
+            android['cta-deeplink-secondary-cta-1-select'] = androidData.expandableDetails.ctas[1].actionLink;
+          }
         }
       }
     }
@@ -809,17 +845,6 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
         } else {
           ios['cta-deeplink2-text'] = iosData ? iosData.cta.actionLink : '';
         }
-        if (iosData.cta.type === "DEEP_LINK") {
-          const link = ios['cta-deeplink2-select'].split('?')[0];
-          let params = ios['cta-deeplink2-select'].split('?');
-          if (params[1]) {
-            params = params[1].split('&');
-            _.forEach(params, (param) => {
-              ios[`custom-value-${param.split('=')[0]}-cta-deeplink2-select`] = param.split('=')[1];
-            });
-          }
-          ios['cta-deeplink2-select'] = link;
-        }
       }
       if (iosData.expandableDetails && iosData.expandableDetails.image) {
         ios.image = iosData.expandableDetails.image;
@@ -836,12 +861,25 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
         }
         ios['secondary-cta-1-label'] = iosData.expandableDetails.ctas[0].actionText;
         if (iosData.expandableDetails.ctas[0].type === "DEEP_LINK" && ios['cta-deeplink-secondary-cta-1-select2']) {
-          const link = ios['cta-deeplink-secondary-cta-1-select2'].split('?')[0];
-          const paramsIos = ios['cta-deeplink-secondary-cta-1-select2'].split('?')[1] && ios['cta-deeplink-secondary-cta-1-select2'].split('?')[1].split('&');
-          ios['cta-deeplink-secondary-cta-1-select2'] = link;
-          _.forEach(paramsIos, (param) => {
-            ios[`custom-value-${param.split('=')[0]}-cta-deeplink-secondary-cta-1-select2`] = param.split('=')[1];
-          });
+          const originalUrl = ios['cta-deeplink-secondary-cta-1-select2'];
+          
+          // Check if URL contains custom parameters that need extraction
+          if (originalUrl.includes('custom_param=')) {
+            const link = originalUrl.split('?')[0];
+            const params = originalUrl.split('?')[1] && originalUrl.split('?')[1].split('&');
+            
+            // Only process and extract custom parameters
+            const customParams = params?.filter(param => param.startsWith('custom_param='));
+            
+            if (customParams?.length) {
+              ios['cta-deeplink-secondary-cta-1-select2'] = link;
+              _.forEach(customParams, (param) => {
+                ios[`custom-value-${param.split('=')[0]}-cta-deeplink-secondary-cta-1-select2`] = param.split('=')[1];
+              });
+            }
+          }
+          // If no custom parameters, keep original URL intact
+          // ios['cta-deeplink-secondary-cta-1-select2'] remains unchanged
         }
         set(templateCta, "ctaTemplateDetails[0].buttonText", iosData.expandableDetails.ctas[0].actionLabel);
         set(templateCta, "name", iosData.expandableDetails.ctas[0].actionText);