@capillarytech/creatives-library 7.13.7 → 7.13.9

package/package.json

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

package/utils/cdnTransformation.js

@@ -2,8 +2,11 @@ import cloneDeep from "lodash/cloneDeep";
 import isEmpty from "lodash/isEmpty";
 import forOwn from "lodash/forOwn";
 import isNumber from "lodash/isNumber";
+import Bugsnag from '@bugsnag/js';
+
 /* eslint-disable no-unused-expressions */
 import { parse } from "node-html-parser";
+import { EMAIL } from '../v2Containers/CreativesContainer/constants';
 
 // example cdn url
 // https://storage.crm.n.content-cdn.io/cdn-cgi/image/width=100,height=100,quality=75,format=auto/intouch_creative_assets/005710a7-6412-44fe-a19f-e72456b1.jpg
@@ -12,8 +15,6 @@ import { parse } from "node-html-parser";
  * regex tests presence of intouch_creative_assets in the url.
  * We are not testing for extensions such as jpg/png because some channels like LINE - IMAGEMAP url doesn't contain extension.
  */
-const regex = /https:\/\/.*intouch_creative_assets.*$/;
-const INTOUCH_CREATIVE_ASSETS = "intouch_creative_assets";
 const SPECIFIED = "specified";
 const FORMAT_TYPES = { AUTO: "auto" };
 const QUALITY_TYPE = {
@@ -21,9 +22,13 @@ const QUALITY_TYPE = {
   PRESERVE: "preserve",
 };
 const CREATIVES_CDN_BASE_URL_KEY = 'CREATIVES_CDN_BASE_URL';
+const CREATIVES_S3_BUCKET_PATH_KEY = 'CREATIVES_S3_BUCKET_PATH';
 const CREATIVES_CDN_QUALITY_CONFIG_KEY = 'CREATIVES_CDN_QUALITY_CONFIG';
 const CREATIVES_CDN_TRANSFORMATION_URL_SUFFIX_KEY = 'CREATIVES_CDN_TRANSFORMATION_URL_SUFFIX';
 
+const HTTPS_STR = "https://"
+const ALLOWED_EXTENSIONS_STR = ".*(?:jpg|png|jpeg)$"
+const ANY_STR = ".*"
 
 /**
  * CHANNEL_CONFIGS maintains the transformation details for each channel (and optionally subchannel ex. FACEBOOK/LINE)
@@ -141,21 +146,31 @@ export const getCdnUrl = ({
     const CREATIVES_CDN_BASE_URL = getLocalStorageItem(CREATIVES_CDN_BASE_URL_KEY);
     const CREATIVES_CDN_QUALITY_CONFIG = getLocalStorageItem(CREATIVES_CDN_QUALITY_CONFIG_KEY, true);
     const CREATIVES_CDN_TRANSFORMATION_URL_SUFFIX = getLocalStorageItem(CREATIVES_CDN_TRANSFORMATION_URL_SUFFIX_KEY);
-  
+    let CREATIVES_S3_BUCKET_PATH = getLocalStorageItem(CREATIVES_S3_BUCKET_PATH_KEY);
+    
+    //remove all leading and trailing forward slash with empty string, if leading/trailing forward slash is present in node env by mistake then url will not be correct hence removing them.
+    CREATIVES_S3_BUCKET_PATH = CREATIVES_S3_BUCKET_PATH?.replace(/^\/|\/$/g, '');
+
     //Basic validations on data stored in local storage.
     if (
       typeof CREATIVES_CDN_QUALITY_CONFIG !== "object" ||
       Array.isArray(CREATIVES_CDN_QUALITY_CONFIG) ||
       CREATIVES_CDN_QUALITY_CONFIG === null ||
       typeof CREATIVES_CDN_BASE_URL !== "string" || 
-      typeof CREATIVES_CDN_TRANSFORMATION_URL_SUFFIX !== "string"
+      typeof CREATIVES_CDN_TRANSFORMATION_URL_SUFFIX !== "string" || 
+      typeof CREATIVES_S3_BUCKET_PATH !== 'string'
     )
       return url;
   
     const QUALITY = CREATIVES_CDN_QUALITY_CONFIG?.[channelName] || CREATIVES_CDN_QUALITY_CONFIG?.DEFAULT;
   
+    const regexWithExtension = new RegExp(HTTPS_STR + ANY_STR + CREATIVES_S3_BUCKET_PATH + ANY_STR + ALLOWED_EXTENSIONS_STR)
+    const regexWithoutExtension = new RegExp(HTTPS_STR + ANY_STR + CREATIVES_S3_BUCKET_PATH + ANY_STR);
+
+    let skipTransformations = true;
+
     if (
-      !regex.test(url) ||
+      !regexWithoutExtension.test(url) ||
       !CHANNEL_CONFIGS?.[channelName] ||
       (channelSubType && !CHANNEL_CONFIGS?.[channelName]?.[channelSubType]) ||
       !CREATIVES_CDN_BASE_URL ||
@@ -163,8 +178,13 @@ export const getCdnUrl = ({
       !QUALITY
     )
       return url;
-  
-    const [, assetKey] = url.split(INTOUCH_CREATIVE_ASSETS);
+
+    //Skip transformations if extensions are not proper. Else consider transformations if available.
+    if(regexWithExtension.test(url)){
+      skipTransformations = false;
+    }
+
+    const [, assetKey] = url.split(CREATIVES_S3_BUCKET_PATH);
   
     let newUrl = `${CREATIVES_CDN_BASE_URL}`;
   
@@ -177,7 +197,7 @@ export const getCdnUrl = ({
       applicableTransformations = CHANNEL_CONFIGS?.[channelName]?.transformations;
     }
   
-    if (!isEmpty(applicableTransformations)) {
+    if (!isEmpty(applicableTransformations) && !skipTransformations) {
   
       newUrl += `/${CREATIVES_CDN_TRANSFORMATION_URL_SUFFIX}/`;
   
@@ -215,15 +235,21 @@ export const getCdnUrl = ({
               break;
           }
         } catch (e) {
-          console.log("some error occured while applying transformation",e);
+          Bugsnag.leaveBreadcrumb("some error occured while applying transformation")
+          Bugsnag.notify(e, (event) => {
+            event.severity = "error";
+          });
         }
       })
     }
-    newUrl += `/${INTOUCH_CREATIVE_ASSETS}${assetKey}`;
+    newUrl += `/${CREATIVES_S3_BUCKET_PATH}${assetKey}`;
     return newUrl;
 
   }catch(e){
-    console.log('Some exception occurred in getCdnUrl',e);
+    Bugsnag.leaveBreadcrumb("Some exception occurred in getCdnUrl");
+    Bugsnag.notify(e, (event) => {
+      event.severity = "error";
+    });
     return url;
   }
 };
@@ -234,27 +260,30 @@ export const getCdnUrl = ({
  * @returns htmlContents with updated urls in image tag
  */
 export const updateImagesInHtml = (htmlContents) => {
+  if(!htmlContents || typeof htmlContents !== "string"){
+    return htmlContents;
+  } 
   const copiedHtmlContents = htmlContents;
   try {
     const root = parse(htmlContents);
-    root.querySelectorAll("img").forEach((element) => {
+    root?.querySelectorAll("img")?.forEach((element) => {
       const imageSrc = element.getAttribute("src");
-      const isAsset = regex.test(imageSrc);
-      if (isAsset) {
-        const height = element.getAttribute("height");
-        const width = element.getAttribute("width");
-        const newUrl = getCdnUrl({
-          url: imageSrc,
-          height,
-          width,
-          channelName: "EMAIL",
-        });
-        element.setAttribute("src", newUrl);
-      }
+      const height = element.getAttribute("height");
+      const width = element.getAttribute("width");
+      const newUrl = getCdnUrl({
+        url: imageSrc,
+        height,
+        width,
+        channelName: EMAIL,
+      });
+      element.setAttribute("src", newUrl);
     });
     return root.toString();
   } catch (e) {
-    console.log("An error occured while updating images in html", e);
+    Bugsnag.leaveBreadcrumb("An error occured while updating images in html")
+    Bugsnag.notify(e, (event) => {
+      event.severity = "error";
+    });
     return copiedHtmlContents; //return received input directly in case an exception is thrown
   }
 };
@@ -277,7 +306,12 @@ export const transformEmailTemplates = (contents) => {
     });
     return contentsCopy;
   } catch (e) {
-    console.log("Some error has occured while transforming email templates", e);
+    Bugsnag.leaveBreadcrumb(
+      "Some error has occured while transforming email templates"
+    );
+    Bugsnag.notify(e, (event) => {
+      event.severity = "error";
+    });
     return contents; //return received input directly in case an exception is thrown
   }
 };
@@ -313,8 +347,12 @@ export function removeAllCdnLocalStorageItems() {
     removeLocalStorageItem(CREATIVES_CDN_BASE_URL_KEY);
     removeLocalStorageItem(CREATIVES_CDN_QUALITY_CONFIG_KEY);
     removeLocalStorageItem(CREATIVES_CDN_TRANSFORMATION_URL_SUFFIX_KEY);
+    removeLocalStorageItem(CREATIVES_S3_BUCKET_PATH_KEY);
   }catch(e){
-    console.log('some error occured while deleting all keys for cdn', e);
+    Bugsnag.leaveBreadcrumb("some error occured while deleting all keys for cdn");
+    Bugsnag.notify(e, (event) => {
+      event.severity = "error";
+    });
   }
 }
 
@@ -348,6 +386,15 @@ export function saveCdnConfigs(configsResponse) {
       removeLocalStorageItem(CREATIVES_CDN_BASE_URL_KEY);
     }
 
+    if (configsResponse?.bucketPath) {
+      localStorage.setItem(
+        CREATIVES_S3_BUCKET_PATH_KEY,
+        configsResponse?.bucketPath
+      );
+    } else {
+      removeLocalStorageItem(CREATIVES_S3_BUCKET_PATH_KEY);
+    }
+
     if (!isEmpty(configsResponse?.qualityCfg)) {
       const qualityString = JSON.stringify(configsResponse?.qualityCfg);
       localStorage.setItem(CREATIVES_CDN_QUALITY_CONFIG_KEY, qualityString);
@@ -364,6 +411,9 @@ export function saveCdnConfigs(configsResponse) {
       removeLocalStorageItem(CREATIVES_CDN_TRANSFORMATION_URL_SUFFIX_KEY);
     }
   } catch (e) {
-    console.log("some error while setting localstorage cdn configs");
+    Bugsnag.leaveBreadcrumb("some error while setting localstorage cdn configs");
+    Bugsnag.notify(e, (event) => {
+      event.severity = "error";
+    });
   }
 }

package/utils/tests/cdnTransformation.test.js

@@ -5,6 +5,7 @@ beforeEach(() => {
   var localStorageMock = (function () {
     var store = {
       CREATIVES_CDN_TRANSFORMATION_URL_SUFFIX: "cdn-cgi/image",
+      CREATIVES_S3_BUCKET_PATH: "intouch_creative_assets",
       CREATIVES_CDN_BASE_URL: "https://storage.crm.n.content-cdn.io",
       CREATIVES_CDN_QUALITY_CONFIG:
         '{"EMAIL":75,"RCS":75,"VIBER":75,"WHATSAPP":75,"MOBILE_PUSH":75,"FACEBOOK":75,"LINE":75,"DEFAULT":75}',
@@ -32,6 +33,9 @@ afterEach(() => {
     "CREATIVES_CDN_QUALITY_CONFIG",
     '{"EMAIL":75,"RCS":75,"VIBER":75,"WHATSAPP":75,"MOBILE_PUSH":75,"FACEBOOK":75,"LINE":75,"DEFAULT":75}'
   );
+  localStorage.setItem(
+    "CREATIVES_S3_BUCKET_PATH", "intouch_creative_assets"
+  );
 });
 
 describe("cdnTransformationTests", () => {
@@ -83,6 +87,44 @@ describe("cdnTransformationTests", () => {
       expect(GENERATED_CDN_URL).toEqual(EXPECTED_CDN_URL);
     });
 
+    it("Should replace s3 url with cdn url for email when bucket name is other than intouch_creatives_assets in case of prod.", () => {
+      localStorage.setItem("CREATIVES_S3_BUCKET_PATH", "fileservice.in/intouch_creative_assets");
+      const TEST_S3_URL = `https://crm-nightly-new-fileservice.s3.amazonaws.com/fileservice.in/intouch_creative_assets/2c9233ed-0959-4aff-b749-9171b5c8.jpg`;
+      const GENERATED_CDN_URL = cdnUtils.getCdnUrl({
+        url: TEST_S3_URL,
+        channelName: "EMAIL",
+        height: 100,
+        width: 200,
+      });
+      const EXPECTED_CDN_URL = `https://storage.crm.n.content-cdn.io/cdn-cgi/image/width=200,height=100,format=auto,quality=75,/fileservice.in/intouch_creative_assets/2c9233ed-0959-4aff-b749-9171b5c8.jpg`;
+      expect(GENERATED_CDN_URL).toEqual(EXPECTED_CDN_URL);
+    });
+
+    it("Should replace s3 url with cdn url for email when bucket name is other than intouch_creatives_assets in case of prod. It should remove leading/trailing forward slashes from bucket path", () => {
+      localStorage.setItem("CREATIVES_S3_BUCKET_PATH", "/fileservice.in/intouch_creative_assets/");
+      const TEST_S3_URL = `https://crm-nightly-new-fileservice.s3.amazonaws.com/fileservice.in/intouch_creative_assets/2c9233ed-0959-4aff-b749-9171b5c8.jpg`;
+      const GENERATED_CDN_URL = cdnUtils.getCdnUrl({
+        url: TEST_S3_URL,
+        channelName: "EMAIL",
+        height: 100,
+        width: 200,
+      });
+      const EXPECTED_CDN_URL = `https://storage.crm.n.content-cdn.io/cdn-cgi/image/width=200,height=100,format=auto,quality=75,/fileservice.in/intouch_creative_assets/2c9233ed-0959-4aff-b749-9171b5c8.jpg`;
+      expect(GENERATED_CDN_URL).toEqual(EXPECTED_CDN_URL);
+    });
+
+    it("Should replace s3 url with cdn url for email without transformation for formats other than jpg/png/jpeg", () => {
+      const TEST_S3_URL = `https://crm-nightly-new-fileservice.s3.amazonaws.com/intouch_creative_assets/2c9233ed-0959-4aff-b749-9171b5c8.avif`; //this is random url
+      const GENERATED_CDN_URL = cdnUtils.getCdnUrl({
+        url: TEST_S3_URL,
+        channelName: "EMAIL",
+        height: 100,
+        width: 200,
+      });
+      const EXPECTED_CDN_URL = `https://storage.crm.n.content-cdn.io/intouch_creative_assets/2c9233ed-0959-4aff-b749-9171b5c8.avif`;
+      expect(GENERATED_CDN_URL).toEqual(EXPECTED_CDN_URL);
+    });
+
     it("should replace cdn url with new cdn url for email incase h/w etc changed", () => {
       const TEST_S3_URL = `https://storage.crm.n.content-cdn.io/cdn-cgi/image/width=200,height=100,format=auto,quality=75,/intouch_creative_assets/2c9233ed-0959-4aff-b749-9171b5c8.jpg`;
       const GENERATED_CDN_URL = cdnUtils.getCdnUrl({
@@ -95,14 +137,14 @@ describe("cdnTransformationTests", () => {
       expect(GENERATED_CDN_URL).toEqual(EXPECTED_CDN_URL);
     });
 
-    it("should replace cdn url with new cdn url incase channelName is LINE and channelSubType is RICH_MESSAGE ", () => {
+    it("should replace cdn url with new cdn url incase channelName is LINE and channelSubType is RICH_MESSAGE without transformation", () => {
       const TEST_S3_URL = `https://crm-nightly-new-fileservice.s3.amazonaws.com/intouch_creative_assets/2c9233ed-0959-4aff-b749-9171b5c8`;
       const GENERATED_CDN_URL = cdnUtils.getCdnUrl({
         url: TEST_S3_URL,
         channelName: "LINE",
         channelSubType: "RICH_MESSAGE",
       });
-      const EXPECTED_CDN_URL = `https://storage.crm.n.content-cdn.io/cdn-cgi/image/width=1040,quality=75,/intouch_creative_assets/2c9233ed-0959-4aff-b749-9171b5c8`;
+      const EXPECTED_CDN_URL = `https://storage.crm.n.content-cdn.io/intouch_creative_assets/2c9233ed-0959-4aff-b749-9171b5c8`;
       expect(GENERATED_CDN_URL).toEqual(EXPECTED_CDN_URL);
     });
 
@@ -152,6 +194,12 @@ describe("cdnTransformationTests", () => {
       const expected = mockdata.emailRawTransformed;
       expect(htmlContentsOutput).toEqual(expected);
     });
+
+    it("should return input itself if input is either among undefined/null/empty string", () => {
+      expect(cdnUtils.updateImagesInHtml(undefined)).toEqual(undefined);
+      expect(cdnUtils.updateImagesInHtml(null)).toEqual(null);
+      expect(cdnUtils.updateImagesInHtml("")).toEqual("");
+    });
   });
 
   describe("transformEmailTemplate()", () => {

package/v2Components/FormBuilder/index.js

@@ -11,7 +11,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import _ from 'lodash';
 import { Tabs, Table, Modal} from 'antd';
-import { CapSpin, CapDrawer, CapButton, CapInput, CapPopover, CapImage, CapCheckbox, CapRadio, CapSelect, CapTable, CapRow, CapColumn, CapNotification, CapUploader, CapHeading, CapIcon} from '@capillarytech/cap-ui-library';
+import { CapSpin, CapDrawer, CapButton, CapInput, CapPopover, CapImage, CapCheckbox, CapRadio, CapSelect, CapTable, CapRow, CapColumn, CapNotification, CapUploader, CapHeading, CapIcon, CapTooltip} from '@capillarytech/cap-ui-library';
 import { injectIntl, intlShape, FormattedMessage } from 'react-intl';
 import LabelHOC from '@capillarytech/cap-ui-library/assets/HOCs/ComponentWithLabelHOC';
 import { CAP_SPACE_12, CAP_SPACE_08, FONT_COLOR_05, FONT_COLOR_04 } from '@capillarytech/cap-ui-library/styled/variables';
@@ -2800,22 +2800,28 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
             break;
           case "checkbox":
             ifError = this.state.checkValidation && (isVersionEnable ? this.state.errorData[`${this.state.currentTab - 1}`][val.id] : this.state.errorData[val.id]);
+            const { disabled , hoverText } = val || {};
             if (styling === 'semantic') {
               columns.push(
                 <CapColumn key="input" span={val.width} offset={val.offset}>
-                  <CapCheckbox
-                    key={val.id}
-                    className={`${ifError ? 'error' : ''}`}
-                    errorMessage={val.errorMessage && ifError ? val.errorMessage : ''}
-                    onChange={(e) => this.updateFormData(e.target.checked, val, val.submitAction)}
-                    checked={isVersionEnable ? this.state.formData[`${this.state.currentTab - 1}`][val.id] : this.state.formData[val.id]}
-                    defaultChecked={isVersionEnable ? this.state.formData[`${this.state.currentTab - 1}`][val.id] : this.state.formData[val.id]}
-                    style={val.style ? val.style : {}}
-                    disabled={val.disabled}
-                    inductiveText={val.inductiveText}
+                  <CapTooltip
+                    title={ disabled && hoverText ? hoverText : '' }
+                    placement="topLeft"
                   >
+                    <CapCheckbox
+                      key={val.id}
+                      className={`${ifError ? 'error' : ''}`}
+                      errorMessage={val.errorMessage && ifError ? val.errorMessage : ''}
+                      onChange={(e) => this.updateFormData(e.target.checked, val, val.submitAction)}
+                      checked={isVersionEnable ? this.state.formData[`${this.state.currentTab - 1}`][val.id] : this.state.formData[val.id]}
+                      defaultChecked={isVersionEnable ? this.state.formData[`${this.state.currentTab - 1}`][val.id] : this.state.formData[val.id]}
+                      style={val.style ? val.style : {}}
+                      disabled={val.disabled}
+                      inductiveText={val.inductiveText}
+                    >
                     {val.label}
-                  </CapCheckbox>
+                    </CapCheckbox>
+                  </CapTooltip>
                 </CapColumn>
               );
             }

package/v2Components/FormBuilder/tests/index.test.js

@@ -0,0 +1,41 @@
+import React from "react";
+import { injectIntl } from 'react-intl';
+import '@testing-library/jest-dom';
+import FormBuilder from '../index';
+import { Provider } from 'react-redux';
+import configureStore from '../../../store';
+import {
+    render,
+    screen,
+    fireEvent,
+    waitFor
+  } from '../../../utils/test-utils';
+import { mockData } from './mockData';
+
+
+const ComponentToRender = injectIntl(FormBuilder);
+const renderComponent = props => {
+  const store = configureStore({}, null);
+  return render(
+    <Provider store={store}>
+      <ComponentToRender {...props} />
+    </Provider>,
+  );
+};
+
+describe("test for checkbox form builder",() => {
+  const onFormValidityChange=jest.fn();
+    const props={
+      ...mockData,
+      onFormValidityChange
+    }
+    renderComponent(props);
+    it("add action button to notification disabled in ios", async () => {
+      const addNotifBtn=screen.getByLabelText("Add action buttons to notification")
+      expect(addNotifBtn).toBeDisabled();
+      fireEvent.mouseOver(addNotifBtn);
+      await waitFor(() => {
+        expect(screen.getByText("This section is being revamped. Till then it will remain disabled.")).toBeInTheDocument();
+      })
+    })
+})

package/v2Components/FormBuilder/tests/mockData.js

@@ -0,0 +1,120 @@
+export const mockData = {
+    schema:{
+        "containers": [
+            {
+                "id": "pane",
+                "supportedEvents": [
+                    "onTabChange"
+                ],
+                "panes": [
+                    {
+                        "isSupported": true,
+                        "sectionsHeaders": [
+                            {
+                                "type": "multicols",
+                                "inputFields": [
+                                    {
+                                        "rowStyle": {
+                                            "display": "flex",
+                                            "flex": 1
+                                        },
+                                        "cols": [
+                                            {
+                                                "id": "tab-header",
+                                                "metaType": "label",
+                                                "value": "iOS",
+                                                "primitive": true,
+                                                "dynamicTab": false,
+                                                "type": "div",
+                                                "width": 5,
+                                                "offset": 0,
+                                                "onlyDisplay": true,
+                                                "colStyle": {
+                                                    "flex": 1
+                                                },
+                                                "injectedEvents": {}
+                                            }
+                                        ]
+                                    }
+                                ],
+                                "actionFields": []
+                            }
+                        ],
+                        "sections": [
+                            {
+                                "type": "parent",
+                                "width": 16,
+                                "rowStyle": {
+                                    "height": "100%"
+                                },
+                                "childSections": [
+                                    {
+                                        "colStyle": {
+                                            "paddingTop": "16px",
+                                            "paddingLeft": "16px",
+                                            "borderRight": "1px solid #d9d9d9",
+                                            "height": "70vh",
+                                            "overflowY": "auto"
+                                        },
+                                        "width": 16,
+                                        "type": "parent",
+                                        "childSections": [
+                                            {
+                                                "type": "multicols",
+                                                "inputFields": [
+                                                    {
+                                                        "identifier": "add-sec-cta-ios",
+                                                        "cols": [
+                                                            {
+                                                                "id": "add-sec-cta-ios",
+                                                                "metaType": "label",
+                                                                "dynamicTab": false,
+                                                                "label": "Add action buttons to notification",
+                                                                "styling": "semantic",
+                                                                "type": "checkbox",
+                                                                "customComponent": false,
+                                                                "datatype": "boolean",
+                                                                "fluid": true,
+                                                                "onlyDisplay": false,
+                                                                "offset": 0,
+                                                                "colStyle": {
+                                                                    "flex": 1
+                                                                },
+                                                                "submitAction": "addSecondaryCtaIos",
+                                                                "supportedEvents": [
+                                                                    "addSecondaryCtaIos"
+                                                                ],
+                                                                "disabled": true,
+                                                                "hoverText": "This section is being revamped. Till then it will remain disabled.",
+                                                                "injectedEvents": {}
+                                                            }
+                                                        ]
+                                                    }
+                                                ],
+                                                "actionFields": []
+                                            }
+                                        ]
+                                    },
+                                ]
+                            }
+                        ]
+                    }
+                ],
+                "type": "tabs",
+                "defaultPanes": 1,
+                "additionalPanes": 0,
+                "injectedEvents": {}
+            }
+        ],
+        "channel": "MOBILEPUSH",
+        "module": "Campaigns",
+        "type": "LAYOUT"
+    },
+    location:{
+        "pathname": "/mobilepush/create/image",
+        "query": {
+            "type": false,
+            "module": "default"
+        }
+    }
+}

package/v2Components/NewCallTask/index.js

@@ -99,7 +99,7 @@ class NewCallTask extends React.Component { // eslint-disable-line react/prefer-
   };
 
   render() {
-    const { intl, isLoading, metaEntities, selectedOfferDetails } = this.props;
+    const { intl, isLoading, metaEntities, selectedOfferDetails , injectedTags} = this.props;
     const { formatMessage } = intl;
     const { subject, messageBody, description, callTaskActionType } = this.state;
     const tags = metaEntities && metaEntities.tags ? metaEntities.tags.standard : [];
@@ -125,6 +125,7 @@ class NewCallTask extends React.Component { // eslint-disable-line react/prefer-
                   tags={tags}
                   onTagSelect={this.onTagSelect}
                   selectedOfferDetails={selectedOfferDetails}
+                  injectedTags={injectedTags}
                 />
                 <CapInput.TextArea
                   setInputRef={this.setInputRef}
@@ -177,6 +178,7 @@ NewCallTask.propTypes = {
   selectedOfferDetails: PropTypes.array,
   messageDetails: PropTypes.object,
   mode: PropTypes.string,
+  injectedTags: PropTypes.object,
 };
 
 export default injectIntl(NewCallTask);

package/v2Components/NewCallTask/tests/index.test.js

@@ -0,0 +1,36 @@
+import React from "react";
+import { injectIntl } from 'react-intl';
+import '@testing-library/jest-dom';
+import { Provider } from 'react-redux';
+import { browserHistory } from 'react-router';
+import NewCallTask from '../index';
+import configureStore from '../../../store';
+import mockData from './mockData'
+import {
+    render,
+  } from '../../../utils/test-utils';
+import { Router } from "express";
+const ComponentToRender = injectIntl(NewCallTask);
+
+const renderComponent = (props) => {
+  const store = configureStore({}, browserHistory);
+  return render(
+    <Router>
+      <Provider store={store}>
+        <ComponentToRender {...props} />
+      </Provider>
+    </Router>,
+  );
+};
+
+describe("test for NewCallTask", () => {
+  const onCallTaskSubmit = jest.fn();
+  const props = {
+    ...mockData,
+    onCallTaskSubmit,
+  };
+ 
+  it("New call task", async () => {
+    renderComponent(props);
+  });
+});

package/v2Components/NewCallTask/tests/mockData.js

@@ -0,0 +1,20 @@
+const mockData= {
+    injectedTags: {},
+    templateData: {},
+    messageDetails: {},
+    isLoading: true,
+    selectedOfferDetails: [],
+    location: {
+      pathname: "/NewCallTask",
+      query: {
+        type: false,
+        module: "default",
+      },
+    },
+    match: {
+      path: '/NewCallTask',
+      url: '/creatives/ui/v2',
+      isExact: true,
+      params: {},
+    }
+}

package/v2Containers/CallTask/index.js

@@ -16,7 +16,7 @@ import {
 } from '@capillarytech/cap-ui-library';
 import { injectIntl, intlShape } from 'react-intl';
 import { createStructuredSelector } from 'reselect';
-import { makeSelectMetaEntities, isLoadingMetaEntities } from '../Cap/selectors';
+import { makeSelectMetaEntities, isLoadingMetaEntities, setInjectedTags } from '../Cap/selectors';
 import * as globalActions from '../Cap/actions';
 import * as actions from "./actions";
 import makeSelectCallTask from './selectors';
@@ -71,7 +71,7 @@ export class CallTask extends React.Component { // eslint-disable-line react/pre
     };
   }
   render() {
-    const { intl, onCallTaskSubmit, templateData, loadingMetaEntities, metaEntities, selectedOfferDetails, messageDetails } = this.props;
+    const { intl, onCallTaskSubmit, templateData, loadingMetaEntities, metaEntities, selectedOfferDetails, messageDetails, injectedTags } = this.props;
     const { formatMessage } = intl;
     const { mode } = this.state;
     return (
@@ -85,6 +85,7 @@ export class CallTask extends React.Component { // eslint-disable-line react/pre
             onCallTaskSubmit={onCallTaskSubmit}
             selectedOfferDetails={selectedOfferDetails}
             messageDetails={messageDetails}
+            injectedTags={injectedTags || {}}
           />
           :
             <div>
@@ -144,6 +145,7 @@ const mapStateToProps = createStructuredSelector({
   CallTask: makeSelectCallTask(),
   metaEntities: makeSelectMetaEntities(),
   loadingMetaEntities: isLoadingMetaEntities(),
+  injectedTags: setInjectedTags(),
 });
 
 function mapDispatchToProps(dispatch) {

package/v2Containers/MobilePush/initialSchema.js

@@ -782,6 +782,8 @@ export const response = {
                                       supportedEvents: [
                                         "addSecondaryCtaIos",
                                       ],
+                                      disabled: true,
+                                      hoverText: "This section is being revamped. Till then it will remain disabled.",
                                     },
                                   ],
                                 },
@@ -1690,6 +1692,8 @@ export const response = {
                                       supportedEvents: [
                                         "addSecondaryCtaIos",
                                       ],
+                                      disabled: true,
+                                      hoverText: "This section is being revamped. Till then it will remain disabled.",
                                     },
                                   ],
                                 },

package/v2Containers/Templates/sagas.js

@@ -93,6 +93,8 @@ function* getCdnTransformationConfig() {
     if (res?.success && res?.status?.code === 200) {
       const cdnConfigs = res?.response;
       saveCdnConfigs(cdnConfigs);
+    } else {
+      removeAllCdnLocalStorageItems();
     }
   } catch (error) {
     console.log("some error occured during getCdnTransformationConfig call");