@capillarytech/creatives-library 7.8.1 → 7.9.1

package/utils/gtmTrackers/index.js

@@ -5,13 +5,17 @@ const gtmEvents = require.context('./gtmEvents', true, /\.js$/, 'lazy');
 export const gtmPush = (eventType, eventObject) => {
   try {
     gtmEvents(`./${eventType}.js`)
-      .then(event => {
+      .then((event) => {
         event.default(eventObject);
       })
-      .catch(err => {
-        Bugsnag.notify(err);
+      .catch((err) => {
+        if (err) {
+          Bugsnag.notify(err);
+        }
       });
   } catch (e) {
-    Bugsnag.notify(e);
+    if (e) {
+      Bugsnag.notify(e);
+    }
   }
 };

package/v2Components/CapImageUpload/index.js

@@ -85,6 +85,12 @@ function CapImageUpload(props) {
       };
       submitAction({file, type: 'image', fileParams}, incorrectFile);
     };
+    img.onerror = () => {
+      const fileParams = {
+        error: true,
+      };
+      submitAction({fileParams}, incorrectFile);
+    }
     if (e) {
       const event = e;
       event.target.value = null;
@@ -93,13 +99,12 @@ function CapImageUpload(props) {
 
   const submitAction = useCallback((data, incorrectFile) => {
     const {
-      file: {size},
-      fileParams: {
-          height,
-          width,
-      },
-    } = data;
-    if (incorrectFile || size > imgSize || height > imgHeight || width > imgWidth) {
+      file,
+      fileParams
+    } = data || {};
+    const { size } = file || {};
+    const { height, width, error } = fileParams || {}; 
+    if (incorrectFile || size > imgSize || height > imgHeight || width > imgWidth || error) {
       updateImageErrorMessage(formatMessage(messages.imageIncorrectSize));
     } else {
       updateImageErrorMessage('');
@@ -166,6 +171,7 @@ function CapImageUpload(props) {
         <CapUploader.CapDragger
           customRequest={capUploaderCustomRequest}
           className="form-builder-dragger"
+          showUploadList={!isImageError}
         >
           <CapHeading className="dragger-title" type="h7">
             <FormattedMessage {...messages.dragAndDrop} />
@@ -198,7 +204,7 @@ function CapImageUpload(props) {
         <FormattedMessage {...messages.imageReUpload} />
       </CapButton>
     );
-  }, []);
+  }, [isImageError]);
 
   return (
     <div style={style} className="cap-custom-image-upload">

package/v2Components/FormBuilder/index.js

@@ -2854,7 +2854,16 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                     name={val.name ? val.name : `${val.id}-name`}
                     disabled={val.disabled}
                   >
-                    {val.options.map((option, index) => <CapRadio value={option} inductiveText={val.inductiveText && val.inductiveText[index]}>{option}</CapRadio>) }
+                    {val.options.map((option, index) => {
+                      const isMappedTemplateWechat = val.id === "template-redirect-options-radio";
+                      return (
+                        <CapRadio
+                          value={ isMappedTemplateWechat ? option.value : option } 
+                          inductiveText={val.inductiveText && val.inductiveText[index]}>{ isMappedTemplateWechat ? option.label : option } 
+                        </CapRadio>
+                      )
+                    }
+                    )}
 
                   </CapRadioGroup>
                   {/*{ifError ?*/}

package/v2Components/NavigationBar/index.js

@@ -10,11 +10,23 @@ import styled from 'styled-components';
 import { isEmpty, forEach } from 'lodash';
 import { loadItem } from 'services/localStorageApi';
 import { intlShape, injectIntl } from 'react-intl';
+import { FONT_COLOR_04 } from '@capillarytech/cap-ui-library/styled/variables';
 import TopBar from '../TopBar';
 import messages from './messages';
+import { LOYALTY } from '../../v2Containers/App/constants';
+import {
+  HELP_URL,
+  LOYALTY_HELP_URL,
+} from '../../v2Containers/Cap/constants';
 const PRODUCT_MASTERS = 'masters';
 const EMBEDDED = 'embedded';
 
+const AppWrapper = styled.div`
+  .navigation-setting-icon {
+    color: ${FONT_COLOR_04};
+  }
+`;
+
 const CapWrapper = styled.div`
   position: absolute;
   padding: 0;
@@ -34,9 +46,37 @@ const ComponentWrapper = styled.div`
 class NavigationBar extends React.Component {
   constructor(props) {
     super(props);
-    this.state = {
-      selectedProduct: '',
-    };
+    this.state = this.initializeSelectedProduct();
+  }
+
+  initializeSelectedProduct = () => {
+    const {location, intl: {formatMessage}} = this.props;
+    const { pathname } = location;
+    const parentModule = pathname.substring(pathname.lastIndexOf('/') + 1);
+    switch (parentModule) {
+      case LOYALTY:
+        return {
+          selectedProduct: formatMessage(messages.loyaltyProgram),
+          helpUrl: LOYALTY_HELP_URL,
+          settingsIcon: {
+            iconType: 'settings',
+            key: 'settings',
+            placement: 'bottomRight',
+            className: 'navigation-setting-icon',
+            toolTip: formatMessage(messages.noProductSetting),
+          },
+        };
+      default:
+        return {
+          selectedProduct: formatMessage(messages.selectedProductDefault),
+          helpUrl: HELP_URL,
+          settingsIcon: {
+            iconType: 'settings',
+            key: 'settings',
+            onClickHandler: this.onSettingsIconClick,
+          },
+        };
+    }
   }
 
   onOrgSettingsClick = () => {
@@ -57,7 +97,7 @@ class NavigationBar extends React.Component {
   };
 
   onHelpIconClick = () => {
-    const { helpUrl } = this.props;
+    const {helpUrl} = this.state;
     if (helpUrl) {
       window.open(helpUrl, '_blank');
     }
@@ -113,18 +153,17 @@ class NavigationBar extends React.Component {
     return productsList;
   };
 
-  getTopbarIcons = () => [
-    {
-      iconType: 'help',
-      key: 'help',
-      onClickHandler: this.onHelpIconClick,
-    },
-    {
-      iconType: 'settings',
-      key: 'settings',
-      onClickHandler: this.onSettingsIconClick,
-    },
-  ];
+  getTopbarIcons = () => {
+    const {settingsIcon} = this.state;
+    return [
+      {
+        iconType: 'help',
+        key: 'help',
+        onClickHandler: this.onHelpIconClick,
+      },
+      settingsIcon,
+    ];
+  }
 
   getDropdownMenu = () => {
     const { formatMessage } = this.props.intl;
@@ -168,7 +207,6 @@ class NavigationBar extends React.Component {
       topbarMenuData,
       loggedIn,
       type,
-      intl,
     } = this.props;
     const productsList = this.getProductsList();
     const proxyOrgList = this.getProxyOrgList();
@@ -178,14 +216,11 @@ class NavigationBar extends React.Component {
     const { selectedProduct } = this.state;
     const customTopBarProps = {};
     return (
-      <div>
+      <AppWrapper>
         {loggedIn && type !== EMBEDDED &&
           <TopBar
             productsList={productsList}
-            selectedProduct={
-              selectedProduct ||
-              intl.formatMessage(messages.selectedProductDefault)
-            }
+            selectedProduct={selectedProduct}
             handleProductChange={this.handleProductChange}
             proxyOrgList={proxyOrgList}
             selectedOrg={selectedOrg}
@@ -197,12 +232,12 @@ class NavigationBar extends React.Component {
             {...customTopBarProps}
           />
         }
-          <CapWrapper isEmbedded={type === EMBEDDED}>
-            <ComponentWrapper>
-              {React.Children.toArray(this.props.children)}
-            </ComponentWrapper>
-          </CapWrapper>
-      </div>
+        <CapWrapper isEmbedded={type === EMBEDDED}>
+          <ComponentWrapper>
+            {React.Children.toArray(this.props.children)}
+          </ComponentWrapper>
+        </CapWrapper>
+      </AppWrapper>
     );
   }
 }
@@ -214,7 +249,6 @@ NavigationBar.propTypes = {
   changeOrg: PropTypes.func,
   settingsUrl: PropTypes.string,
   children: PropTypes.node,
-  helpUrl: PropTypes.string,
   orgSettingsUrl: PropTypes.string,
   loggedIn: PropTypes.bool,
   intl: intlShape.isRequired,

package/v2Components/NavigationBar/messages.js

@@ -57,4 +57,9 @@ export default defineMessages({
     id: `${scope}.storeCare`,
     defaultMessage: 'Store Care',
   },
+  "noProductSetting": {
+    id: `${scope}.noProductSetting`,
+    defaultMessage:
+      'There are no product settings. Organisation settings are available under profile on the right.',
+  },
 });

package/v2Containers/App/constants.js

@@ -13,6 +13,25 @@ export const getTopbarMenuDataValue = () => ([
       { label: <FormattedMessage {...globalMessages.creatives} />, link: '/creatives/ui/v2', key: 'creatives' },
 ]);
 
+export const getLoyaltyTopbarMenuDataValue = () => [
+  {
+    label: <FormattedMessage {...globalMessages.programs} />,
+    link: 'loyalty/ui/',
+    key: 'programs',
+  },
+  //commented as promotions are not supported in loyalty v2 flow
+  // {
+  //   label: <FormattedMessage {...globalMessages.promotions} />,
+  //   link: 'loyalty/ui/promotions/',
+  //   key: 'promotions',
+  // },
+  {
+    label: <FormattedMessage {...globalMessages.creatives} />,
+    link: '/creatives/ui/v2/loyalty',
+    key: 'creatives',
+  },
+];
+
 export const TRACK_CREATE_SMS = 'createSms';
 export const TRACK_CREATE_EMAIL = 'createEmail';
 export const TRACK_CREATE_MPUSH = 'createMpush';
@@ -46,7 +65,7 @@ export const CHANNEL_CREATE_TRACK_MAPPING = {
   gallery: TRACK_CREATE_IMAGE,
   line: TRACK_CREATE_LINE,
   viber: TRACK_CREATE_VIBER,
-  facebook: TRACK_CREATE_FACEBOOK
+  facebook: TRACK_CREATE_FACEBOOK,
 };
 
 export const CHANNEL_EDIT_TRACK_MAPPING = {
@@ -57,7 +76,7 @@ export const CHANNEL_EDIT_TRACK_MAPPING = {
   gallery: TRACK_EDIT_IMAGE,
   line: TRACK_EDIT_LINE,
   viber: TRACK_EDIT_VIBER,
-  facebook: TRACK_EDIT_FACEBOOK
+  facebook: TRACK_EDIT_FACEBOOK,
 };
 export const GTM_TRACKING_ID = 'UA-110024621-2';
 export const BEE_PLUGIN = 'BEE_PLUGIN';
@@ -85,4 +104,5 @@ export const FB_AD_CALL_TO_ACTION = {
 };
 
 
-export const CREATIVES = 'creatives';
+export const CREATIVES = 'creatives';
+export const LOYALTY = 'loyalty';

package/v2Containers/Cap/actions.js

@@ -45,7 +45,6 @@ export function getUserData(callback) {
 }
 
 export function fetchSchemaForEntity(queryParams) {
-  
   return {
     type: types.GET_SCHEMA_FOR_ENTITY_REQUEST, queryParams,
   };
@@ -62,8 +61,9 @@ export function setInjectedTags(injectedTags) {
   };
 }
 
-export function getTopbarMenuData() {
+export function getTopbarMenuData(parentModule) {
   return {
+    parentModule,
     type: types.GET_TOPBAR_MENU_DATA_REQUEST,
   };
 }

package/v2Containers/Cap/constants.js

@@ -31,7 +31,8 @@ export const CLEAR_TOPBAR_MENU_DATA = 'creatives/cap/CLEAR_TOPBAR_MENU_DATA';
 export const CAMPAIGN_SETTINGS_URL = '/creatives/settings/message';
 export const ORG_SETTINGS_URL = '/org/index';
 export const HELP_URL = 'https://support.capillarytech.com/en/support/solutions/4000007853';
+export const LOYALTY_HELP_URL = 'https://support.capillarytech.com/en/support/solutions/97443';
 
-export const ORG_REFRESH_SEC = 10; 
-export const ORG_CHANGED = 'ORG_CHANGED'; 
+export const ORG_REFRESH_SEC = 10;
+export const ORG_CHANGED = 'ORG_CHANGED';
 

package/v2Containers/Cap/index.js

@@ -22,11 +22,10 @@ import { engagePlusPublicPath } from '../../config/path';
 import { GTM_TRACKING_ID, CREATIVES_UI_VIEW } from '../App/constants';
 import { makeSelectLocale } from '../../v2Containers/LanguageProvider/selectors';
 import {
-  HELP_URL,
   ORG_SETTINGS_URL,
   CAMPAIGN_SETTINGS_URL,
   ORG_REFRESH_SEC,
-  ORG_CHANGED
+  ORG_CHANGED,
 } from './constants';
 import './_cap.scss';
 
@@ -73,6 +72,8 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
   }
 
   componentWillMount() {
+    const { pathname } = this.props.location;
+    const parentModule = pathname.substring(pathname.lastIndexOf('/') + 1);
     this.props.actions.getUserData((userData) => {
       if (!userData.accessiblePermissions.includes(CREATIVES_UI_VIEW)) {
         this.setState({ isCreativesAccessible: false });
@@ -81,7 +82,7 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
       this.setDimensionData(userGtmData);
       gtm.push({...userGtmData, event: 'userAuthenticated'});
     });
-    this.props.actions.getTopbarMenuData();
+    this.props.actions.getTopbarMenuData(parentModule);
     if (this.props.Global.orgID !== undefined) {
       gtm.push({orgId: this.props.Global.orgID});
     }
@@ -101,7 +102,7 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
     }
     locale = this.getMappedLocale(locale);
     //locale = 'zh';
-    
+
     moment.locale(locale);
     window.addEventListener('storage', this.handleStorageChange, false);
     document.addEventListener(
@@ -167,7 +168,7 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
   tabOnloadEventHandler = () => {
     logNewTab();
   }
-  
+
   setDimensionData(userGtmData) {
     Object.values(userGtmData).forEach((value, index) => {
       GA.setCustomDimension({ [`dimension${index + 1}`]: value });
@@ -175,28 +176,41 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
   }
   getUserGtmData(props) {
     const selectedProps = props || this.props;
-    const { user: userData,  orgID} = selectedProps?.Global || {};
+    const { user: userData, orgID, currentOrgDetails} = selectedProps?.Global || {};
+    const {
+      basic_details: {
+        base_country: orgBaseCountry = '',
+        base_currency: orgBaseCurrency = '',
+        base_language: orgBaseLanguage = '',
+      } = {},
+    } = currentOrgDetails || {};
     if (userData) {
       const {
         attributes: {
-          USERNAME : userName,
-          EMAIL : userEmail
+          USERNAME: userName,
+          EMAIL: userEmail,
         } = {},
-        proxyOrgList =[],
+        proxyOrgList = [],
         isCapUser,
         refID,
+        type: userRole = '',
         orgName: userOrgName,
       } = userData;
-      const { orgName } = _.find(proxyOrgList, { orgID: orgID }) || {
+      const { orgName } = _.find(proxyOrgList, { orgID }) || {
         orgName: userOrgName,
       };
       const gtmData = {
-        isCapUser: isCapUser,
+        isCapUser,
         orgId: orgID,
         orgName,
         userId: refID,
         userName: userName?.value,
         userEmail: userEmail?.value,
+        userRole,
+        orgBaseCountry,
+        orgBaseCurrency,
+        orgBaseLanguage,
+        domainName: userEmail?.value?.split('@').pop(),
       };
       return gtmData;
     }
@@ -272,7 +286,7 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
       refreshSeconds === ORG_REFRESH_SEC
     ) {
       const timer = setInterval(() => {
-        this.setState(prevState => ({
+        this.setState((prevState) => ({
           refreshSeconds: prevState.refreshSeconds - 1,
         }));
       }, 1000);
@@ -286,13 +300,13 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
 
   handleStorageChange = (e) => {
     const { oldValue, newValue } = e;
-     if (utilsHandleStorageChange(e, 'orgID')) {
+    if (utilsHandleStorageChange(e, 'orgID')) {
       const localStorageOrgInfo = { oldValue, newValue };
       this.setState({ showRefreshModal: true, localStorageOrgInfo });
     }
   };
 
-  getOrgNameFromId = orgId => {
+  getOrgNameFromId = (orgId) => {
     const {
       Global: {
         user: {
@@ -352,11 +366,11 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
   renderOrgChangeModal = () => {
     const { selectedOrgId, showOrgChangeModal } = this.state;
     const {
-      Global: { 
+      Global: {
       currentOrgDetails: { basic_details: { name: oldOrgName } = {} } = {},
       },
       intl: { formatMessage } = {},
-    } = this.props; 
+    } = this.props;
     const newOrgName = this.getOrgNameFromId(selectedOrgId);
     // some users do not have entry for their default org in proxyOrgList.
     // getOrgNameFromId returns back orgID if no matching entry is present in proxyOrgList
@@ -399,7 +413,7 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
     const type = this.props.location.query.type;
     const toastMessages = this.props.Global.messages;
     const { isCreativesAccessible, showOrgChangeModal, showRefreshModal } = this.state;
-    
+
     return (
       <CapWrapper>
         { this.props.loader.localeLoading || this.props.Global.fetching_userdata ?
@@ -425,7 +439,6 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
                   logout={this.logout}
                   settingsUrl={`${engagePlusPublicPath}${CAMPAIGN_SETTINGS_URL}`}
                   orgSettingsUrl={ORG_SETTINGS_URL}
-                  helpUrl={HELP_URL}
                   loggedIn={isLoggedIn}
                   topbarMenuData={topbarMenuDataOptions}
                   location={location}

package/v2Containers/Cap/messages.js

@@ -72,6 +72,14 @@ export default defineMessages({
     id: 'creatives.containersV2.incentive',
     defaultMessage: 'Incentive',
   },
+  "programs": {
+    id: `creatives.containersV2.programs`,
+    defaultMessage: 'Programs',
+  },
+  "promotions": {
+    id: `creatives.containersV2.promotions`,
+    defaultMessage: 'Promotions',
+  },
 
     //refresh due to org change messages
 

package/v2Containers/Cap/sagas.js

@@ -6,7 +6,11 @@ import * as LocalStorage from '../../services/localStorageApi';
 import * as types from './constants';
 import config from '../../config/app';
 //import pathConfig from '../../config/path';
-import { getTopbarMenuDataValue } from '../../v2Containers/App/constants';
+import {
+  getTopbarMenuDataValue,
+  getLoyaltyTopbarMenuDataValue,
+  LOYALTY,
+} from '../../v2Containers/App/constants';
 // import {makeSelectOrgId} from './selectors';
 
 function* authorize(user) {
@@ -106,9 +110,8 @@ export function* fetchUserInfo(option) {
 
 export function* fetchSchemaForEntity(queryParams) {
   try {
-    
     const result = yield call(Api.fetchSchemaForEntity, queryParams);
-    
+
     // const sidebar = result.response.sidebar;
     yield put({ type: types.GET_SCHEMA_FOR_ENTITY_SUCCESS, data: result.response, statusCode: result.status ? result.status.code : '', entityType: queryParams.queryParams.type });
   } catch (error) {
@@ -116,11 +119,21 @@ export function* fetchSchemaForEntity(queryParams) {
   }
 }
 
-function* getTopbarMenuData() {
+const getTopbarData = (parentModule) => {
+  switch (parentModule) {
+    case LOYALTY:
+      return getLoyaltyTopbarMenuDataValue();
+    default:
+      return getTopbarMenuDataValue();
+  }
+};
+
+function* getTopbarMenuData(params) {
+  const {parentModule} = params;
   try {
     yield put({
       type: types.GET_TOPBAR_MENU_DATA_SUCCESS,
-      data: getTopbarMenuDataValue(),
+      data: getTopbarData(parentModule),
     });
   } catch (error) {
     yield put({ type: types.GET_TOPBAR_MENU_DATA_FAILURE, error });
@@ -129,7 +142,6 @@ function* getTopbarMenuData() {
 
 
 function* watchFetchSchemaForEntity() {
-  
   const watcher = yield takeLatest(types.GET_SCHEMA_FOR_ENTITY_REQUEST, fetchSchemaForEntity);
   yield take(LOCATION_CHANGE);
   yield cancel(watcher);

package/v2Containers/CapFacebookPreview/constants.js

@@ -11,3 +11,7 @@ export const GENERATE_PREVIEW_FAILURE = 'app/CapFacebookPreview/GET_PREVIEW_FAIL
 
 export const CLEAR_PREVIEW = 'app/CapFacebookPreview/CLEAR_PREVIEW';
 
+export const PREVIEW_NOT_REQUESTED = "PreviewNotRequested";
+export const FETCH_PREVIEW_REQUESTED = "PreviewRequested";
+export const FETCH_PREVIEW_SUCCESS = "PreviewRequestSuccess";
+export const FETCH_PREVIEW_FAILURE = "PreviewRequestFailure";