@capillarytech/creatives-library 7.17.31 → 7.17.33-alpha.1

package/components/Ckeditor/index.js

@@ -13,7 +13,7 @@ import React from 'react';
 import _ from 'lodash';
 // import messages from './messages';
 const loadScript = require('load-script');
-const defaultScriptUrl = "https://storage.crm.n.content-cdn.io/ckeditor_full/ckeditor/ckeditor.js";
+const defaultScriptUrl = `${window.location.origin}/arya/ui/library/ckeditor/ckeditor.js`; 
 const user = localStorage.getItem('user');
 let locale = 'en';
 if (user && JSON.parse(user).lang) {

package/containers/App/constants.js

@@ -42,3 +42,5 @@ export const HOSPITALITY_RELATED_TAGS = [
   "email",
   "resID_Source",
 ];
+
+const CUSTOMER_BARCODE_TAG = "customer_barcode";

package/package.json

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

package/v2Components/CapTagList/index.js

@@ -17,7 +17,7 @@ import { FormattedMessage, injectIntl, intlShape } from 'react-intl';
 import { createStructuredSelector } from 'reselect';
 import messages from './messages';
 import { makeSelectLoyaltyPromotionDisplay } from '../../v2Containers/Cap/selectors';
-import { CARD_RELATED_TAGS, HOSPITALITY_RELATED_TAGS } from '../../containers/App/constants';
+import { CARD_RELATED_TAGS, HOSPITALITY_RELATED_TAGS, CUSTOMER_BARCODE_TAG } from '../../containers/App/constants';
 import { hasCardBasedScope, hasHospitalityBasedScope } from '../../utils/common';
 
 import {
@@ -25,7 +25,7 @@ import {
   JAPANESE_HELP_TEXT,
   TAG_TRANSLATION_DOC,
 } from "../../containers/TagList/constants";
-import { JP_LOCALE_HIDE_FEATURE } from '../../v2Containers/App/constants';
+import { ENABLE_CUSTOMER_BARCODE_TAG, JP_LOCALE_HIDE_FEATURE } from '../../v2Containers/App/constants';
 import { hidingDateTagsForJpLocale } from '../../v2Containers/TagList/utils';
 
 
@@ -176,12 +176,18 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
     const { disableRelatedTags, childTagsToDisable, parentTagstoDisable, showCardsRelatedTags } = this?.props?.disableTagsDetails;
     const { accessibleFeatures = [] } = this?.props?.currentOrgDetails || {};
     const hideDateTagsForJpLocale = accessibleFeatures.includes(JP_LOCALE_HIDE_FEATURE);
+    const enabledCustomerBarcode = accessibleFeatures.includes(ENABLE_CUSTOMER_BARCODE_TAG);
     const list = [];
     const loyaltyAttrDisableText = <FormattedMessage {...messages.loyaltyAttributeDisable} />;
+    const customerBarcodeDisableText = <FormattedMessage {...messages.customerBarcodeDisable} />;
     let clonedTags = _.cloneDeep(tags);
     if (!hasCardBasedScope()) {
       clonedTags = _.omit(clonedTags, CARD_RELATED_TAGS);
     }
+    //code to remove until barcode tag is not supported by BE
+    // if (!hasCardBasedScope()) {
+    //   clonedTags = _.omit(clonedTags, CUSTOMER_BARCODE_TAG );
+    // }
     if (!hasHospitalityBasedScope()) {
       //filtering HOSPITALITY_RELATED_TAGS if org does not have HOSPITALITY_BASED_SCOPE feature enabled
       clonedTags = _.omit(clonedTags, HOSPITALITY_RELATED_TAGS);
@@ -207,10 +213,14 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
         );
         hidingDateTagsForJpLocale(hideDateTagsForJpLocale, val, list, tagValue);
       } else if (searchString === '' || !searchString || ((val.name || '').toLowerCase().indexOf(searchString.toLowerCase()) !== -1)) {
-        const childDisabled = disableRelatedTags ? childTagsToDisable.includes(key) : false;
+        let childDisabled = true;
+        if (key === "customer_barcode" && !enabledCustomerBarcode) {
+          childDisabled = true;
+        } 
+        else childDisabled = disableRelatedTags ? childTagsToDisable.includes(key) : false;
         const tempNode = (
           <CapTreeNode
-            title={childDisabled ? <CapTooltip title={loyaltyAttrDisableText}>{val.desc || val.name}</CapTooltip> : (val.desc || val.name)}
+            title={childDisabled ? <CapTooltip title={key === "customer_barcode" ? customerBarcodeDisableText : loyaltyAttrDisableText}>{val.desc || val.name}</CapTooltip> : (val.desc || val.name)} //need to add key name to get tooltip
             tag={val}
             isLeaf
             key={val.couponSeriesId ? `${key}(${val.couponSeriesId})` : `${key}`}

package/v2Components/CapTagList/messages.js

@@ -46,4 +46,8 @@ export default defineMessages({
     id: `creatives.componentsV2.CapTagList.loyaltyAttributeDisable`,
     defaultMessage: 'You won’t be able to add loyalty related attributes since the loyalty program/ card series is None.',
   },
+  "customerBarcodeDisable": {
+    id: `creatives.componentsV2.CapTagList.customerBarcodeDisable`,
+    defaultMessage: 'This label is not enabled for your organization. Please connect with your Capillary POC',
+  },
 });

package/v2Components/Ckeditor/index.js

@@ -13,7 +13,8 @@ import React from 'react';
 import _ from 'lodash';
 // import messages from './messages';
 const loadScript = require('load-script');
-const defaultScriptUrl = "https://storage.crm.n.content-cdn.io/ckeditor_full/ckeditor/ckeditor.js";
+const defaultScriptUrl = `${window.location.origin}/arya/ui/library/ckeditor/ckeditor.js`;
+//const defaultScriptUrl = '{hostName}/arya/ui/library/ckeditor/ckeditor.js'; uncomment for local testing
 const user = localStorage.getItem('user');
 let locale = 'en';
 if (user && JSON.parse(user).lang) {

package/v2Containers/App/constants.js

@@ -118,3 +118,4 @@ export const LOYALTY = 'loyalty';
 export const FAILURE = 'FAILURE';
 export const DATE_DISPLAY_FORMAT = 'D MMM YYYY';
 export const TIME_DISPLAY_FORMAT = 'hh:mm A';
+export const ENABLE_CUSTOMER_BARCODE_TAG = 'ENABLE_CUSTOMER_BARCODE_TAG';

package/v2Containers/Email/index.js

@@ -643,7 +643,9 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
     } else if (data === "unsubscribe" && this.state.editorInstanse) {
       const anchor = `<a href='{{${data}}}'>${data}</a>`;
       this.state.editorInstanse.insertHtml(`${anchor}`);
-    } else if (this.state.editorInstanse) {
+    } else if (data === "customer_barcode" && this.state.editorInstanse) {
+      this.state.editorInstanse.insertHtml(`<img src="https://crm-nightly-new-fileservice.s3.amazonaws.com/intouch_creative_assets/8ebc8301-e262-45a6-bdab-ff0de91a.png?code={{${data}}}" />`);
+    } else if (this.state.editorInstanse){
       this.state.editorInstanse.insertHtml(`{{${data}}}`);
     }
       //this.resetCkEditorInstance(currentTab, formData, true, data);

package/v2Containers/Whatsapp/index.js

@@ -838,6 +838,8 @@ export const Whatsapp = (props) => {
       errorMessage = formatMessage(
         globalMessages.emptyTemplateNameErrorMessage,
       );
+    } else if (value.length < 3 && host === HOST_GUPSHUP) {
+      errorMessage = formatMessage(messages.templateNameMinCharacters);
     } else if (!templateNameRegex.test(value)) {
       errorMessage = formatMessage(messages.templateNameRegexErrorMessage);
     }
@@ -872,6 +874,7 @@ export const Whatsapp = (props) => {
 
   const templateMessageErrorHandler = (value) => {
     let errorMessage = false;
+    const percentSignRegex = /%/;
     if (value === '') {
       errorMessage = formatMessage(messages.emptyTemplateMessageErrorMessage);
     } else if (
@@ -879,6 +882,9 @@ export const Whatsapp = (props) => {
       TEMPLATE_MESSAGE_MAX_LENGTH
     ) {
       errorMessage = formatMessage(messages.templateMessageLengthError);
+    } else if ( host === HOST_GUPSHUP && percentSignRegex.test(value)
+    ) {
+      errorMessage = formatMessage(messages.noPercentSign);
     } else {
       const validVarArr = value.match(validVarRegex) || [];
       const validVarSet = [...new Set(validVarArr)];

package/v2Containers/Whatsapp/messages.js

@@ -15,6 +15,10 @@ export default defineMessages({
     defaultMessage:
       'Template name can only contain lowercase alphanumeric characters and underscores',
   },
+  templateNameMinCharacters: {
+    id: `${prefix}.templateNameMinCharacters`,
+    defaultMessage: 'Template name should contain atleast 3 characters',
+  },
   templateCategoryLabel: {
     id: `${prefix}.templateCategoryLabel`,
     defaultMessage: 'Template category',
@@ -189,6 +193,10 @@ export default defineMessages({
     id: `${prefix}.noContentBetweenVars`,
     defaultMessage: 'Add atleast 1 character between 2 variables',
   },
+  noPercentSign: {
+    id: `${prefix}.noPercentSign`,
+    defaultMessage: 'Please remove % sign from the message content',
+  },
   sequenceVars: {
     id: `${prefix}.sequenceVars`,
     defaultMessage:

package/v2Containers/ChannelTemplates/actions.js

@@ -1,20 +0,0 @@
-/*
- *
- * ChannelTemplates actions
- *
- */
-
-import * as types from './constants';
-
-export function defaultAction() {
-  return {
-    type: types.DEFAULT_ACTION,
-  };
-}
-
-export function getTemplates(channel) {
-  return {
-    type: types.GET_TEMPLATES_REQUEST,
-    channel,
-  };
-}

package/v2Containers/ChannelTemplates/constants.js

@@ -1,8 +0,0 @@
-/*
- *
- * ChannelTemplates constants
- *
- */
-
-export const DEFAULT_ACTION = 'app/ChannelTemplates/DEFAULT_ACTION';
-

package/v2Containers/ChannelTemplates/index.js

@@ -1,47 +0,0 @@
-/*
- *
- * ChannelTemplates
- *
- */
-
-import PropTypes from 'prop-types';
-
-import React from 'react';
-import { connect } from 'react-redux';
-import { FormattedMessage } from 'react-intl';
-import { bindActionCreators } from 'redux';
-import { createStructuredSelector } from 'reselect';
-import makeSelectChannelTemplates from './selectors';
-import * as actions from './actions';
-import messages from './messages';
-
-
-export class ChannelTemplates extends React.Component { // eslint-disable-line react/prefer-stateless-function
-  componentDidMount() {
-    this.props.actions.getTemplates(this.props.channel);
-  }
-  render() {
-    return (
-      <CardGrid
-        cardDataList={[]}
-      />
-    );
-  }
-}
-
-ChannelTemplates.propTypes = {
-  actions: PropTypes.object.isRequired,
-  channel: PropTypes.string,
-};
-
-const mapStateToProps = createStructuredSelector({
-  ChannelTemplates: makeSelectChannelTemplates(),
-});
-
-function mapDispatchToProps(dispatch) {
-  return {
-    actions: bindActionCreators(actions, dispatch),
-  };
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(ChannelTemplates);

package/v2Containers/ChannelTemplates/messages.js

@@ -1,13 +0,0 @@
-/*
- * ChannelTemplates Messages
- *
- * This contains all the text for the ChannelTemplates component.
- */
-import { defineMessages } from 'react-intl';
-
-export default defineMessages({
-  header: {
-    id: 'creatives.containersV2.ChannelTemplates.header',
-    defaultMessage: 'This is ChannelTemplates container !',
-  },
-});

package/v2Containers/ChannelTemplates/reducer.js

@@ -1,34 +0,0 @@
-/*
- *
- * ChannelTemplates reducer
- *
- */
-
-import { fromJS } from 'immutable';
-import * as types from './constants';
-
-const initialState = fromJS({
-  loadingTemplates: true,
-  smsTemplates: [],
-  emailTemplates: [],
-  wechatTemplates: [],
-  mobilepushTemplates: [],
-});
-
-function channelTemplatesReducer(state = initialState, action) {
-  const channelTemplates = `${action.channel}Templates`;
-  switch (action.type) {
-    case types.DEFAULT_ACTION:
-      return state;
-    case types.GET_TEMPLATES_REQUEST:
-      return state.set('loadingTemplates', true);
-    case types.GET_TEMPLATES_SUCESS:
-      return state.set('loadingTemplates', false).set(channelTemplates, action.templates);
-    case types.GET_TEMPLATES_FAILURE:
-      return state.set('loadingTemplates', false).set('error', action.error);
-    default:
-      return state;
-  }
-}
-
-export default channelTemplatesReducer;

package/v2Containers/ChannelTemplates/sagas.js

@@ -1,32 +0,0 @@
-import { take, takeLatest, call, put, cancel } from 'redux-saga/effects';
-import { LOCATION_CHANGE } from 'react-router-redux';
-import * as Api from '../../services/api';
-
-
-import * as types from './constants';
-// Individual exports for testing
-export function* defaultSaga() {
-  // See example in v2Containers/HomePage/sagas.js
-}
-function* getTemplates(action) {
-  try {
-    const req = {
-      channel: action.channel,
-      queryParams: action.query,
-    };
-    const res = call(Api.getAllTemplates, req);
-    put({type: types.GET_TEMPLATES_SUCESS, templates: res.response, channel: action.channel});
-  } catch (error) {
-    put({type: types.GET_TEMPLATES_FAILURE, error});
-  }
-}
-function* getTemplatesWatcher() {
-  const watcher = yield takeLatest(types.GET_TEMPLATES_REQUEST, getTemplates);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
-}
-// All sagas to be loaded
-export default [
-  defaultSaga,
-  getTemplatesWatcher,
-];

package/v2Containers/ChannelTemplates/selectors.js

@@ -1,25 +0,0 @@
-import { createSelector } from 'reselect';
-
-/**
- * Direct selector to the channelTemplates state domain
- */
-const selectChannelTemplatesDomain = () => (state) => state.get('templates');
-
-/**
- * Other specific selectors
- */
-
-
-/**
- * Default selector used by ChannelTemplates
- */
-
-const makeSelectChannelTemplates = () => createSelector(
-  selectChannelTemplatesDomain(),
-  (substate) => substate.toJS()
-);
-
-export default makeSelectChannelTemplates;
-export {
-  selectChannelTemplatesDomain,
-};

package/v2Containers/Sms/Create/tests/sagas.test.js

@@ -1,82 +0,0 @@
-import { expectSaga } from "redux-saga-test-plan";
-import { take, cancel, takeLatest } from "redux-saga/effects";
-import * as matchers from "redux-saga-test-plan/matchers";
-import { LOCATION_CHANGE } from "react-router-redux";
-import { throwError } from "redux-saga-test-plan/providers";
-import { createMockTask } from "redux-saga/utils";
-import * as types from "../constants";
-import { watchAiSuggestions, getAiSuggestions } from "../sagas";
-import * as Api from "../../../../services/api";
-
-describe("getAiSuggestions saga", () => {
-  it("Should handle valid response from api", () => {
-    const successCallback = () => {};
-    const failureCallback = () => {};
-    const action = {
-      type: types.GET_AI_SUGGESTIONS,
-      prompt: {},
-      successCallback,
-      failureCallback,
-    };
-    expectSaga(getAiSuggestions, action)
-      .provide([
-        [
-          matchers.call.fn(Api.getAiSuggestions),
-          {
-            success: true,
-            status: {
-              isError: false,
-              code: 200,
-              message: "success",
-            },
-            message: "Meta data fetched successfully",
-            response: {
-              "https://response.com": 1400,
-            },
-          },
-        ],
-        [matchers.call.fn(successCallback)],
-      ])
-      .run();
-  });
-
-  it("Should handles error thrown from api", () => {
-    const successCallback = () => {};
-    const failureCallback = () => {};
-    const action = {
-      type: types.GET_AI_SUGGESTIONS,
-      prompt: {},
-      successCallback,
-      failureCallback,
-    };
-    expectSaga(getAiSuggestions, action)
-      .provide([[matchers.call.fn(Api.getAiSuggestions), throwError()]])
-      .run();
-  });
-});
-
-describe("watchAiSuggestions saga", () => {
-  let generator = null;
-  beforeEach(() => {
-    generator = watchAiSuggestions();
-  });
-  it("Should handle valid response from api", () => {
-    const progress1 = generator.next();
-    const mockTask = takeLatest(types.GET_AI_SUGGESTIONS, getAiSuggestions);
-    expect(progress1.value).toEqual(mockTask);
-    const progress2 = generator.next();
-    expect(progress2.value).toEqual(take(LOCATION_CHANGE));
-  });
-
-  it("Should handle LOCATION_CHANGE action and cancel the watcher", () => {
-    generator = watchAiSuggestions();
-    const mockTask = createMockTask();
-
-    expect(generator.next().value).toEqual(
-      takeLatest(types.GET_AI_SUGGESTIONS, getAiSuggestions)
-    );
-    expect(generator.next(mockTask).value).toEqual(take(LOCATION_CHANGE));
-    expect(generator.next().value).toEqual(cancel(mockTask));
-    expect(generator.next().done).toEqual(true);
-  });
-});