@capillarytech/creatives-library 7.17.13 → 7.17.14

package/containers/TagList/constants.js

@@ -17,14 +17,3 @@ export const GET_TRANSLATION_MAPPED = {
   'en-US': 'en-US',
   'ja-JP': 'ja-JP',
 };
-
-export const JAPANESE_HIDE_DATE_ARRAY = [
-  "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.13",
+  "version": "7.17.14",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

package/utils/common.js

@@ -262,3 +262,11 @@ 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/utils/commonUtils.js

@@ -0,0 +1,6 @@
+import React from 'react';
+import { FormattedMessage } from 'react-intl';
+
+export const apiMessageFormatHandler = (id, fallback) => (
+    <FormattedMessage id={id} defaultMessage={fallback} />
+);

package/v2Components/CapTagList/index.js

@@ -19,14 +19,7 @@ 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 { HIDE_ENGAGEMENT_CHANNELS } from '../../v2Containers/App/constants';
-import { hideDateLocale } from '../../v2Containers/TagList/utils';
-
+import { GET_TRANSLATION_MAPPED, JAPANESE_HELP_TEXT, TAG_TRANSLATION_DOC } from '../../containers/TagList/constants';
 
 const {Search} = CapInput;
 const {CapTreeNode} = CapTree;
@@ -162,9 +155,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
   };
 
   renderTags(tags, searchString = '') {
-    const { disableRelatedTags, childTagsToDisable, parentTagstoDisable, showCardsRelatedTags } = this?.props?.disableTagsDetails;
-    const { accessibleFeatures = [] } = this?.props?.currentOrgDetails || {};
-    const hideDateTagsForJpLocale = accessibleFeatures.includes(HIDE_ENGAGEMENT_CHANNELS);
+    const { disableRelatedTags, childTagsToDisable, parentTagstoDisable, showCardsRelatedTags} = this.props.disableTagsDetails;
     const list = [];
     const loyaltyAttrDisableText = <FormattedMessage {...messages.loyaltyAttributeDisable} />;
     let clonedTags = _.cloneDeep(tags);
@@ -180,7 +171,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);
-        const tagValue = (
+        list.push((
           <CapTreeNode
             title={disabled ? <CapTooltip title={loyaltyAttrDisableText}>{val.name}</CapTooltip> : val.name}
             tag={val}
@@ -189,8 +180,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
           >
             {temp}
           </CapTreeNode>
-        );
-        hideDateLocale(hideDateTagsForJpLocale, val, list, tagValue);
+        ));
       } else if (searchString === '' || !searchString || ((val.name || '').toLowerCase().indexOf(searchString.toLowerCase()) !== -1)) {
         const childDisabled = disableRelatedTags ? childTagsToDisable.includes(key) : false;
         const tempNode = (
@@ -202,7 +192,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
             disabled={childDisabled}
           >
           </CapTreeNode>);
-        hideDateLocale(hideDateTagsForJpLocale, val, list, tempNode);
+        list.push(tempNode);
       }
     });
     return list;
@@ -253,7 +243,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" &&
@@ -261,7 +251,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">
@@ -274,8 +264,8 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
                 </div>
               </CapButton>
             </CapLink>
-          </div>
-        }
+            </div>
+            }
 
       </CapSpin>
     </div>);
@@ -285,7 +275,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
           visible={this.props.visibleTaglist}
           footer={[]}
           {...modalProps}
-        >
+          >
           {contentSection}
         </CapModal> :
         <CapPopover
@@ -330,7 +320,6 @@ CapTagList.propTypes = {
   hidePopover: PropTypes.bool,
   modalProps: PropTypes.any,
   disableTagsDetails: PropTypes.object,
-  currentOrgDetails: PropTypes.object,
 };
 
 CapTagList.defaultValue = {
@@ -348,3 +337,4 @@ const mapStateToProps = createStructuredSelector({
 
 
 export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(CapTagList));
+

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';
-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 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 CLEAR_META_ENTITIES = 'cap/CLEAR_META_ENTITIES';
 export const HIDE_TAGS = 'cap/HIDE_TAGS';
 

package/v2Containers/LanguageProvider/reducer.js

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

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

@@ -3,6 +3,7 @@ import { fromJS } from 'immutable';
 import languageProviderReducer from '../reducer';
 import {
   CHANGE_LOCALE,
+  GET_LOCIZ_MESSAGE_REQUEST,
 } from '../constants';
 
 describe('languageProviderReducer', () => {
@@ -21,4 +22,12 @@ 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,8 +16,6 @@ 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;
@@ -56,7 +54,6 @@ 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;
@@ -74,18 +71,6 @@ 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({
@@ -275,7 +260,7 @@ export const LineText = ({
                     injectedTags={injectedTags || {}}
                     // className={val.className ? val.className : ''}
                     id={`${id}_tags`}
-                    userLocale={translationLang}
+                    userLocale={localStorage.getItem('jlocale') || 'en'}
                     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(TagList)))
+                                <Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))
                                   id="undefined_tags"
                                   injectedTags={Object {}}
                                   key="undefined_tags"
@@ -23077,9 +23077,9 @@ new message content.",
                                   onContextChange={[Function]}
                                   onTagSelect={[Function]}
                                   tags={Array []}
-                                  userLocale="en-US"
+                                  userLocale="en"
                                 >
-                                  <UserIsAuthenticated(Connect(TagList))
+                                  <UserIsAuthenticated(Connect(InjectIntl(TagList)))
                                     authData={
                                       Object {
                                         "app": Object {},
@@ -23123,9 +23123,9 @@ new message content.",
                                     onTagSelect={[Function]}
                                     redirect={[Function]}
                                     tags={Array []}
-                                    userLocale="en-US"
+                                    userLocale="en"
                                   />
-                                </Connect(UserIsAuthenticated(Connect(TagList)))>
+                                </Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))>
                                 <CapDrawer
                                   content={
                                     <React.Fragment>