@capillarytech/creatives-library 7.17.14 → 7.17.16

package/containers/TagList/constants.js

@@ -17,3 +17,14 @@ export const GET_TRANSLATION_MAPPED = {
   'en-US': 'en-US',
   'ja-JP': 'ja-JP',
 };
+
+export const JAPANESE_HIDE_DATE_TAGS = [
+  "mm/dd/yyyy",
+  "dd/mm/yyyy",
+  "mm/dd/yy",
+  "dd Mon yyyy",
+  "Day, Mon dd, yy",
+  "dd.mm.yy",
+  "dd Mon",
+  "dd/m/yyyy",
+];

package/package.json

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

package/utils/common.js

@@ -262,11 +262,3 @@ export const isTraiDLTEnable = (isFullMode, smsRegister) => {
   const isTraiDltFeature = isTraiDltFeatureForOrg && isTraiEnableforLib;
   return isTraiDltFeature;
 };
-
-export const intlKeyGenerator = (value = "") => {
-  if (value && value.typeOf === "string") {
-    const key = value.replace(/[^a-zA-Z0-9_]/g, "");
-    return key;
-  }
-  return value;
-}

package/v2Components/CapTagList/index.js

@@ -19,7 +19,14 @@ import { CARD_RELATED_TAGS } from '../../containers/App/constants';
 import { hasCardBasedScope } from '../../utils/common';
 import moment from 'moment';
 import { FONT_COLOR_05 } from '@capillarytech/cap-ui-library/styled/variables';
-import { GET_TRANSLATION_MAPPED, JAPANESE_HELP_TEXT, TAG_TRANSLATION_DOC } from '../../containers/TagList/constants';
+import {
+  GET_TRANSLATION_MAPPED,
+  JAPANESE_HELP_TEXT,
+  TAG_TRANSLATION_DOC,
+} from "../../containers/TagList/constants";
+import { HIDE_ENGAGEMENT_CHANNELS } from '../../v2Containers/App/constants';
+import { hidingDateTagsForJpLocale } from '../../v2Containers/TagList/utils';
+
 
 const {Search} = CapInput;
 const {CapTreeNode} = CapTree;
@@ -155,7 +162,9 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
   };
 
   renderTags(tags, searchString = '') {
-    const { disableRelatedTags, childTagsToDisable, parentTagstoDisable, showCardsRelatedTags} = this.props.disableTagsDetails;
+    const { disableRelatedTags, childTagsToDisable, parentTagstoDisable, showCardsRelatedTags } = this?.props?.disableTagsDetails;
+    const { accessibleFeatures = [] } = this?.props?.currentOrgDetails || {};
+    const hideDateTagsForJpLocale = accessibleFeatures.includes(HIDE_ENGAGEMENT_CHANNELS);
     const list = [];
     const loyaltyAttrDisableText = <FormattedMessage {...messages.loyaltyAttributeDisable} />;
     let clonedTags = _.cloneDeep(tags);
@@ -171,7 +180,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
       if (_.has(val, 'subtags')) {
         const disabled = disableRelatedTags ? parentTagstoDisable.includes(key) : false;
         const temp = this.renderTags(val.subtags, '', disabled);
-        list.push((
+        const tagValue = (
           <CapTreeNode
             title={disabled ? <CapTooltip title={loyaltyAttrDisableText}>{val.name}</CapTooltip> : val.name}
             tag={val}
@@ -180,7 +189,8 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
           >
             {temp}
           </CapTreeNode>
-        ));
+        );
+        hidingDateTagsForJpLocale(hideDateTagsForJpLocale, val, list, tagValue);
       } else if (searchString === '' || !searchString || ((val.name || '').toLowerCase().indexOf(searchString.toLowerCase()) !== -1)) {
         const childDisabled = disableRelatedTags ? childTagsToDisable.includes(key) : false;
         const tempNode = (
@@ -192,7 +202,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
             disabled={childDisabled}
           >
           </CapTreeNode>);
-        list.push(tempNode);
+        hidingDateTagsForJpLocale(hideDateTagsForJpLocale, val, list, tempNode);
       }
     });
     return list;
@@ -201,7 +211,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
     window.open(TAG_TRANSLATION_DOC, '_blank');
   }
   render() {
-    const { hidePopover = false, tags = {}, intl = {}, moduleFilterEnabled, label, modalProps } = this.props;
+    const { hidePopover = false, tags = {}, intl = {}, moduleFilterEnabled, label, modalProps, channel } = this.props;
     const tg = tags;
     const {formatMessage} = intl;
     const { tagValue, expandedKeys, autoExpandParent, searchValue, visible, translationLang } = this.state;
@@ -243,7 +253,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
           expandedKeys={expandedKeys}
           autoExpandParent={autoExpandParent}
           onExpand={this.onExpand}
-      >
+        >
           {this.renderTags(tg, searchValue)}
         </CapTree>
         {translationLang === "ja-JP" &&
@@ -251,7 +261,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
             <CapIcon
               type="help"
               size="s"
-            />  
+            />
             <CapLink>
               <CapButton id="translationtagfooter" type="flat" onClick={this.openTranslationLink} >
                 <div className="tag-list-footer-icon">
@@ -264,8 +274,8 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
                 </div>
               </CapButton>
             </CapLink>
-            </div>
-            }
+          </div>
+        }
 
       </CapSpin>
     </div>);
@@ -275,7 +285,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
           visible={this.props.visibleTaglist}
           footer={[]}
           {...modalProps}
-          >
+        >
           {contentSection}
         </CapModal> :
         <CapPopover
@@ -283,7 +293,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
           onVisibleChange={this.togglePopoverVisibility}
           content={contentSection}
           trigger="click"
-          placement="rightTop"
+          placement={channel === 'EMAIL' ? "bottom" : "rightTop"}
           >
           <CapButton isAddBtn type="flat">{label || ''}</CapButton>
         </CapPopover>
@@ -320,6 +330,8 @@ CapTagList.propTypes = {
   hidePopover: PropTypes.bool,
   modalProps: PropTypes.any,
   disableTagsDetails: PropTypes.object,
+  currentOrgDetails: PropTypes.object,
+  channel: PropTypes.string,
 };
 
 CapTagList.defaultValue = {
@@ -337,4 +349,3 @@ const mapStateToProps = createStructuredSelector({
 
 
 export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(CapTagList));
-

package/v2Components/FormBuilder/index.js

@@ -52,6 +52,8 @@ import { validateIfTagClosed } from '../../utils/tagValidations';
 import globalMessages from '../../v2Containers/Cap/messages';
 import { convert } from 'html-to-text';
 import { AI_SUGGESTION_API_URL } from './constants';
+import { GET_TRANSLATION_MAPPED } from '../../containers/TagList/constants';
+import moment from 'moment';
 const TabPane = Tabs.TabPane;
 const {Column} = Table;
 const {TextArea} = CapInput;
@@ -94,6 +96,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
       popoverVisible: false,
       customPopoverVisible: false,
       isDrawerVisible: false,
+      translationLang: 'en',
     };
     this.renderForm = this.renderForm.bind(this);
     this.updateFormData = this.updateFormData.bind(this);
@@ -3063,6 +3066,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                     id={val.id}
                     userLocale={this.props.userLocale}
                     selectedOfferDetails={this.props.selectedOfferDetails}
+                    channel={this.props.schema.channel}
                   />
                 </CapColumn>
               );
@@ -3427,6 +3431,23 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
     return fields;
   }
 
+  //To Find from which locale user is loggedin
+  getTranslationMappedLocale(locale) {
+    return GET_TRANSLATION_MAPPED?.[locale];
+  }
+  componentDidMount() {
+    const user = localStorage.getItem('user');
+    let locale = 'en';
+    if (user) {
+      locale = JSON.parse(user).lang || locale;
+    }
+    locale = this.getTranslationMappedLocale(locale);
+    moment.locale(locale);
+    this.setState({
+      translationLang: locale,
+    });
+  }
+
   renderContainer(container) {
     const containerType = container.type;
     const renderedPanes = [];
@@ -3473,13 +3494,13 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                 forceRender
                 tab={
                   <div className="form-tab-header" onInput={(e) => e.stopPropagation()}>
-                    {
+                    { this.state.translationLang !== 'ja-JP' && (
                     _.forEach(renderedContentSections, (value) => {
                       if (value) {
                         return value;
                       }
                       return value;
-                    })
+                    }))
                     }
                   </div>
                 }

package/v2Containers/Cap/constants.js

@@ -15,9 +15,9 @@ export const GET_USER_DATA_REQUEST = 'cap/GET_USER_DATA_REQUEST_V2';
 export const GET_USER_DATA_SUCCESS = 'cap/GET_USER_DATA_SUCCESS_V2';
 export const GET_USER_DATA_FAILURE = 'cap/GET_USER_DATA_FAILURE_V2';
 
-export const GET_SCHEMA_FOR_ENTITY_FAILURE = 'cap/GET_SCHEMA_FOR_ENTITY_FAILURE_V2';
-export const GET_SCHEMA_FOR_ENTITY_REQUEST = 'cap/GET_SCHEMA_FOR_ENTITY_REQUEST_V2';
-export const GET_SCHEMA_FOR_ENTITY_SUCCESS = 'cap/GET_SCHEMA_FOR_ENTITY_SUCCESS_V2';
+export const GET_SCHEMA_FOR_ENTITY_FAILURE = 'cap/GET_SCHEMA_FOR_ENTITY_FAILURE';
+export const GET_SCHEMA_FOR_ENTITY_REQUEST = 'cap/GET_SCHEMA_FOR_ENTITY_REQUEST';
+export const GET_SCHEMA_FOR_ENTITY_SUCCESS = 'cap/GET_SCHEMA_FOR_ENTITY_SUCCESS';
 export const CLEAR_META_ENTITIES = 'cap/CLEAR_META_ENTITIES';
 export const HIDE_TAGS = 'cap/HIDE_TAGS';
 

package/v2Containers/CreativesContainer/SlideBoxHeader.js

@@ -56,7 +56,7 @@ export function SlideBoxHeader(props) {
   const getChannelLabel = (currentChannel = '') => {
     const labels = {
       sms: 'SMS',
-      email: 'Email',
+      email: <FormattedMessage {...messages.emailHeader} />,
       mobilepush: 'Push notification',
       wechat: 'Wechat',
       no_communication: 'NO_COMMUNICATION',

package/v2Containers/LanguageProvider/reducer.js

@@ -17,9 +17,7 @@ const initialState = fromJS({
 function languageProviderReducer(state = initialState, action) {
   switch (action.type) {
     case types.GET_LOCIZ_MESSAGE_REQUEST:
-      return state
-        .set('localeLoading', true)
-        .set('locale', action.locale);
+      return state.set('localeLoading', true);
     case types.GET_LOCIZ_MESSAGE_SUCCESS:
       return state
         .set('localeLoading', false)

package/v2Containers/LanguageProvider/tests/reducer.test.js

@@ -3,7 +3,6 @@ import { fromJS } from 'immutable';
 import languageProviderReducer from '../reducer';
 import {
   CHANGE_LOCALE,
-  GET_LOCIZ_MESSAGE_REQUEST,
 } from '../constants';
 
 describe('languageProviderReducer', () => {
@@ -22,12 +21,4 @@ describe('languageProviderReducer', () => {
       messages: {},
     });
   });
-
-  it('make locize message request', () => {
-    expect(languageProviderReducer(undefined, { type: GET_LOCIZ_MESSAGE_REQUEST, locale: 'de' }).toJS()).toEqual({
-      locale: "de",
-      localeLoading: true,
-      messages: {},
-    });
-  });
 });

package/v2Containers/Line/Container/Text/index.js

@@ -16,6 +16,8 @@ import style from './style';
 import withStyles from '../../../../hoc/withStyles';
 import globalMessages from '../../../Cap/messages';
 import { validateTags } from '../../../../utils/tagValidations';
+import moment from 'moment';
+import { GET_TRANSLATION_MAPPED } from '../../../../containers/TagList/constants';
 
 const { TextArea } = CapInput;
 const {CapCustomCardList} = CapCustomCard;
@@ -54,6 +56,7 @@ export const LineText = ({
     const [messageTitle, updateTextMessageTitle] = useState('');
     const [isDrawerRequired, updateDrawerRequirement] = useState(false);
     const [selectedTemplate, updateSelectedTemplate] = useState();
+    const [translationLang, updateTranslationLang] = useState('en');
 
     useEffect(() => {
         const { messageTitle = '', messageContent = '', type, isInit } = content;
@@ -71,6 +74,18 @@ export const LineText = ({
         }
     }, [content]);
 
+    //To Find from which locale user is loggedin
+    useEffect(() => {
+      const user = localStorage.getItem("user");
+      let locale = "en";
+      if (user) {
+        locale = JSON.parse(user)?.lang || locale;
+      }
+      locale = GET_TRANSLATION_MAPPED?.[locale];
+      moment.locale(locale);
+      updateTranslationLang(locale);
+    }, []);
+     
     useEffect(() => {
         if (messageContent && (isFullMode ? messageTitle : true)) {
             updateMessageState({
@@ -260,7 +275,7 @@ export const LineText = ({
                     injectedTags={injectedTags || {}}
                     // className={val.className ? val.className : ''}
                     id={`${id}_tags`}
-                    userLocale={localStorage.getItem('jlocale') || 'en'}
+                    userLocale={translationLang}
                     selectedOfferDetails={selectedOfferDetails}
                 />
             </>

package/v2Containers/Line/Container/Wrapper/tests/__snapshots__/index.test.js.snap

@@ -23058,7 +23058,7 @@ new message content.",
                                     </div>
                                   </ComponentWithLabelHOC__CapComponentStyled>
                                 </_class>
-                                <Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))
+                                <Connect(UserIsAuthenticated(Connect(TagList)))
                                   id="undefined_tags"
                                   injectedTags={Object {}}
                                   key="undefined_tags"
@@ -23077,9 +23077,9 @@ new message content.",
                                   onContextChange={[Function]}
                                   onTagSelect={[Function]}
                                   tags={Array []}
-                                  userLocale="en"
+                                  userLocale="en-US"
                                 >
-                                  <UserIsAuthenticated(Connect(InjectIntl(TagList)))
+                                  <UserIsAuthenticated(Connect(TagList))
                                     authData={
                                       Object {
                                         "app": Object {},
@@ -23123,9 +23123,9 @@ new message content.",
                                     onTagSelect={[Function]}
                                     redirect={[Function]}
                                     tags={Array []}
-                                    userLocale="en"
+                                    userLocale="en-US"
                                   />
-                                </Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))>
+                                </Connect(UserIsAuthenticated(Connect(TagList)))>
                                 <CapDrawer
                                   content={
                                     <React.Fragment>