@capillarytech/creatives-library 7.13.32-alpha.1 → 7.13.32

package/config/app.js

@@ -16,8 +16,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',
+    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/package.json

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

package/services/api.js

@@ -489,9 +489,4 @@ export const getSenderDetails = (channel, orgUnitId) => {
 export const getCdnTransformationConfig = () => {
   const url = `${API_ENDPOINT}/common/getCdnTransformationConfig`;
   return request(url, getAPICallObject('GET'));
-}
-
-export const getS3UrlFileSizes = (data) => {
-  const url = `${API_ENDPOINT}/assets/files/metadata`;
-  return request(url, getAPICallObject('POST', data));
 }

package/utils/cdnTransformation.js

@@ -3,7 +3,7 @@ import isEmpty from "lodash/isEmpty";
 import forOwn from "lodash/forOwn";
 import isNumber from "lodash/isNumber";
 import Bugsnag from '@bugsnag/js';
-import * as Api from '../services/api';
+
 /* eslint-disable no-unused-expressions */
 import { parse } from "node-html-parser";
 import { EMAIL } from '../v2Containers/CreativesContainer/constants';
@@ -266,21 +266,16 @@ export const getCdnUrl = ({
 /**
  *
  * @param {string} htmlContents accepts htmlContents - strigified.
- * @returns {Promise} htmlContents with updated urls in image tag
+ * @returns htmlContents with updated urls in image tag
  */
-export const updateImagesInHtml = async (htmlContents) => {
+export const updateImagesInHtml = (htmlContents) => {
   if(!htmlContents || typeof htmlContents !== "string"){
     return htmlContents;
   } 
   const copiedHtmlContents = htmlContents;
   try {
     const root = parse(htmlContents);
-    const isEmailQualityOverridden = getLocalStorageItem(CREATIVES_CDN_OVERRIDE_DEFAULT_EMAIL_QUALITY_KEY);
-    let urlQualityMappings;
-    if(isEmailQualityOverridden){
-      const urlList = root?.querySelectorAll("img")?.map(element=>element.getAttribute("src"));
-      urlQualityMappings = await getUrlsToQualityMapping(urlList);
-    }
+    const isEmailQualityOverridden = getLocalStorageItem(CREATIVES_CDN_OVERRIDE_DEFAULT_EMAIL_QUALITY_KEY)
     root?.querySelectorAll("img")?.forEach((element) => {
       const imageSrc = element.getAttribute("src");
       const height = element.getAttribute("height");
@@ -288,8 +283,8 @@ export const updateImagesInHtml = async (htmlContents) => {
 
       let emailOverrideQuality = null;
       if (isEmailQualityOverridden) {
-        const tempQuality = urlQualityMappings?.[imageSrc];
-        if (tempQuality && tempQuality !== -1) {
+        const tempQuality = overrideEmailQuality(imageSrc);
+        if (tempQuality !== -1) {
           emailOverrideQuality = tempQuality;
         }
       }
@@ -319,21 +314,17 @@ export const updateImagesInHtml = async (htmlContents) => {
  * @returns
  * Transforms the email template's html by images replacing the s3 url / cdn url with cdn url.
  */
-export function transformEmailTemplates(contents){
+export const transformEmailTemplates = (contents) => {
   const contentsCopy = cloneDeep(contents);
   try {
     const base = contentsCopy?.versions?.base;
     const languages = base?.selectedLanguages;
-    let promises = [];
     languages?.forEach((lang) => {
       const htmlContents = base?.[lang]?.["template-content"];
-      promises.push(
-        updateImagesInHtml(htmlContents).then(newHtmlContents=>{
-          base[lang]["template-content"] = newHtmlContents;
-        })
-      )
+      const newHtmlContents = updateImagesInHtml(htmlContents);
+      base[lang]["template-content"] = newHtmlContents;
     });
-    return Promise.all(promises).then(_=>contentsCopy);
+    return contentsCopy;
   } catch (e) {
     Bugsnag.leaveBreadcrumb(
       "Some error has occured while transforming email templates"
@@ -517,12 +508,11 @@ export function checkValidUrl(url){
 
   const isValidUrl = regexWithExtension.test(url);
   const isCdnUrl = url.includes(CREATIVES_CDN_BASE_URL);
-  const isS3Url = isValidUrl && !isCdnUrl;
+
 
   return {
     isValidUrl,
     isCdnUrl,
-    isS3Url,
   }
 }
 
@@ -558,24 +548,23 @@ export function getCdnEmailImageQuality(url) {
  * 1. If it is s3 url, it returns quality inversly proportional to its filesize.
  * 2. If it is cdn url, it extracts quality from url and returns the same.
  */
-export function getS3EmailImageQuality(url){
+export function overrideEmailQuality(url){
   if(!url || typeof url !== "string") return -1;
 
+  const {isValidUrl, isCdnUrl} = checkValidUrl(url);
+
+  if(!isValidUrl) return -1;
+
+  if(isCdnUrl){
+    return getCdnEmailImageQuality(url);
+  }
+
   const fileSize = getFizeSizeFromUrl(url);
 
-  if(!fileSize) return;
+  if(!fileSize) return -1;
 
   return getEmailImageOverrideQuality(fileSize);
-}
-
-export function getS3EmailImageQualityMapping(urlToFileSizeMapping){
-  if(typeof urlToFileSizeMapping !== "object" || !urlToFileSizeMapping) return {};
 
-  const urlToImageQualityMapping = {};
-  for (let url of Object.keys(urlToFileSizeMapping)) {
-    urlToImageQualityMapping[url] = getEmailImageOverrideQuality(urlToFileSizeMapping[url]);
-  }
-  return urlToImageQualityMapping;
 }
 
 /**
@@ -626,65 +615,4 @@ export function getEmailImageOverrideQuality(fileSize) {
   } catch (e) {
     return -1;
   }
-}
-
-/**
- * 
- * @param {array} urlList ex ['1.jpg','2.jpg'] // these can be any urls (s3, cdn or others)
- * 
- */
-export async function getUrlsToQualityMapping(urlList){
-  if(!urlList?.length) return {};
-
-  const urlQualityMapping = {};
-
-  const nonSelectedS3Urls = []; //we do not know file sizes of these s3 urls yet.
-
-  urlList?.forEach(url=>{
-    const {isS3Url, isCdnUrl} = checkValidUrl(url);
-
-    if (isCdnUrl){
-      urlQualityMapping[url] = getCdnEmailImageQuality(url);
-      return;
-    }
-    if(isS3Url){
-      const s3FileQuality = getS3EmailImageQuality(url);
-      if(s3FileQuality){
-        urlQualityMapping[url] = s3FileQuality;
-        return;
-      }
-      if(!s3FileQuality){
-        nonSelectedS3Urls.push(url)
-      }
-    }
-  })
-
-  if(nonSelectedS3Urls?.length){
-    let nonSelectedS3UrlMapping = await getS3FileSizesFromUrl(nonSelectedS3Urls)
-    const nonSelectedS3UrlQualityMapping = getS3EmailImageQualityMapping(nonSelectedS3UrlMapping)
-    let x = {...urlQualityMapping,...nonSelectedS3UrlQualityMapping};
-    return x;
-  }
-  return urlQualityMapping;
-}
-
-export async function getS3FileSizesFromUrl(urlList) {
-  if(!urlList?.length){
-    return {}
-  }
-  try{
-    let data = await Api.getS3UrlFileSizes({ keys: urlList });
-    if (data?.status?.code === 200 && data?.success && data?.response) {
-      const result = data?.response;
-      const urlMapping = {};
-      for (let url of Object.keys(result)) {
-        urlMapping[url] = result[url];
-      }
-      return urlMapping;
-    } else {
-      return {};
-    }
-  }catch(e){
-    return {};
-  }
 }

package/v2Containers/CreativesContainer/index.js

@@ -460,7 +460,7 @@ export class Creatives extends React.Component {
     return templateData || null;
   }
 
-  getCreativesData = async (channel, template, templateRecords) => { //from creatives to consumers
+  getCreativesData = (channel, template, templateRecords) => { //from creatives to consumers
     let templateData = { channel };
     switch (channel) {
       case constants.SMS:
@@ -499,7 +499,7 @@ export class Creatives extends React.Component {
           if (!html_content) {
             emailBase = templateRecords.base;
           }
-          const newHtmlContent = await updateImagesInHtml(html_content);
+          const newHtmlContent = updateImagesInHtml(html_content);
           templateData = {...templateData, ...emailBase, emailBody: newHtmlContent, emailSubject: (emailBase && emailBase.subject) ? emailBase.subject : ''};
           delete templateData.html_content;
           delete templateData.subject;
@@ -821,16 +821,11 @@ export class Creatives extends React.Component {
           isGetFormData: false,
         },
         () => {
-          console.log("hello getFormData")
           const templateData = this.state.templateData ? this.state.templateData : template; //select existing or create new content
           const channel = templateData.type;
-          // this.props.actions.showCreativesContainerLoader();
           const creativesData = this.getCreativesData(channel, template, templateData );// convers data to consumer understandable format
-          creativesData.then(data=>{
-            this.logGTMEvent(channel, data);
-            this.props.getCreativesData(data);// send data to consumer
-            // this.props.actions.hideCreativesContanerLoader();
-          })
+          this.logGTMEvent(channel, creativesData);
+          this.props.getCreativesData(creativesData);// send data to consumer
         },
       );
     }

package/v2Containers/Email/actions.js

@@ -85,11 +85,3 @@ export function resetCmsData() {
     type: types.RESET_CMS_EDITOR_DATA,
   };
 }
-
-export function transformEmailTemplate(template, callback) {
-  return {
-    type: types.TRANSFORM_EMAIL_TEMPLATE_REQUEST,
-    template,
-    callback,
-  };
-}

package/v2Containers/Email/constants.js

@@ -36,4 +36,3 @@ export const DUPLICATE_TEMPLATE_REQUEST = 'app/v2Containers/Email/DUPLICATE_TEMP
 export const DUPLICATE_TEMPLATE_SUCCESS = 'app/v2Containers/Email/DUPLICATE_TEMPLATE_SUCCESS';
 export const DUPLICATE_TEMPLATE_FAILURE = 'app/v2Containers/Email/DUPLICATE_TEMPLATE_FAILURE';
 
-export const TRANSFORM_EMAIL_TEMPLATE_REQUEST = 'app/v2Containers/Email/TRANSFORM_EMAIL_TEMPLATE_REQUEST';

package/v2Containers/Email/index.js

@@ -2403,10 +2403,8 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
 
     // if (saveCount === 0) {
 
-    // const newEmail = transformEmailTemplates(obj);
-    this.props.actions.transformEmailTemplate(obj, (newEmail)=>{
-      this.props.actions.createTemplate(newEmail, this.onUpdateTemplateComplete);
-    });
+    const newEmail = transformEmailTemplates(obj);
+    this.props.actions.createTemplate(newEmail, this.onUpdateTemplateComplete);
     // } else {
     //   this.setState({saveObj: obj, targetSaveCount: saveCount, mode: "save", saveEdmDataMode: 'save'}, () => {
     //     _.forEach(data.selectedLanguages, (language, langIndex) => {

package/v2Containers/Email/reducer.js

@@ -140,8 +140,6 @@ function emailReducer(state = initialState, action) {
         .set('fetchingCmsData', false)
         .set('duplicateResponse', fromJS({}))
         .set('cmsData', '');
-    case types.TRANSFORM_EMAIL_TEMPLATE_REQUEST:
-      return state.set("createTemplateInProgress", true);
     default:
       return state;
   }

package/v2Containers/Email/sagas.js

@@ -2,7 +2,7 @@ import { take, cancel, call, put, takeLatest, takeEvery } from 'redux-saga/effec
 import { LOCATION_CHANGE } from 'react-router-redux';
 import * as Api from '../../services/api';
 import * as types from './constants';
-import { transformEmailTemplates, storeS3FileSizeDetails } from '../../utils/cdnTransformation';
+import { storeS3FileSizeDetails } from '../../utils/cdnTransformation';
 
 export function* createTemplate(template) {
   let errorMsg;
@@ -20,15 +20,6 @@ export function* createTemplate(template) {
   }
 }
 
-export function* transformEmailTemplate({template, callback}) {
-  try {
-    const result = yield call(transformEmailTemplates, template);
-    yield callback(result);
-  } catch (error) {
-    yield callback(template);    
-  }
-}
-
 export function* duplicateTemplate(id, channel) {
   let errorMsg;
   try {
@@ -98,13 +89,6 @@ function* watchCreateTemplate() {
   yield cancel(watcher);
 }
 
-function* watchTransformEmailTemplate() {
-  const watcher = yield takeLatest(types.TRANSFORM_EMAIL_TEMPLATE_REQUEST, transformEmailTemplate);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
-}
-
-
 function* watchGetTemplateDetails() {
   const watcher = yield takeLatest(types.GET_TEMPLATE_DETAILS_REQUEST, getTemplateDetails);
   yield take(LOCATION_CHANGE);
@@ -144,7 +128,6 @@ function* watchDuplicateTemplate() {
 // All sagas to be loaded
 export default [
   watchCreateTemplate,
-  watchTransformEmailTemplate,
   watchGetTemplateDetails,
   watchGetAllAssets,
   watchGetCmsSetting,

package/v2Containers/SmsTrai/Create/selectors.js

@@ -16,7 +16,7 @@ const selectSmsTraiDomain = () => (state) => state.get('smsTrai');
 
 const makeSelectSmsTrai = () => createSelector(
   selectSmsTraiDomain(),
-  (substate) => substate.toJS()
+  (substate) => substate?.toJS()
 );
 
 export default makeSelectSmsTrai;