@capillarytech/creatives-library 7.17.11 → 7.17.13

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_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.11",
+  "version": "7.17.13",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

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 { hideDateLocale } 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>
-        ));
+        );
+        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 = (
@@ -192,7 +202,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
             disabled={childDisabled}
           >
           </CapTreeNode>);
-        list.push(tempNode);
+        hideDateLocale(hideDateTagsForJpLocale, val, list, tempNode);
       }
     });
     return list;
@@ -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
@@ -320,6 +330,7 @@ CapTagList.propTypes = {
   hidePopover: PropTypes.bool,
   modalProps: PropTypes.any,
   disableTagsDetails: PropTypes.object,
+  currentOrgDetails: PropTypes.object,
 };
 
 CapTagList.defaultValue = {
@@ -337,4 +348,3 @@ const mapStateToProps = createStructuredSelector({
 
 
 export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(CapTagList));
-

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

@@ -23077,7 +23077,7 @@ new message content.",
                                   onContextChange={[Function]}
                                   onTagSelect={[Function]}
                                   tags={Array []}
-                                  userLocale="en"
+                                  userLocale="en-US"
                                 >
                                   <UserIsAuthenticated(Connect(TagList))
                                     authData={
@@ -23123,7 +23123,7 @@ new message content.",
                                     onTagSelect={[Function]}
                                     redirect={[Function]}
                                     tags={Array []}
-                                    userLocale="en"
+                                    userLocale="en-US"
                                   />
                                 </Connect(UserIsAuthenticated(Connect(TagList)))>
                                 <CapDrawer

package/v2Containers/TagList/index.js

@@ -19,6 +19,7 @@ import * as globalActions from '../Cap/actions';
 // import styled from styled-components;
 import CapTagList from '../../v2Components/CapTagList';
 import './_tagList.scss';
+import { selectCurrentOrgDetails } from '../Cap/selectors';
 const TreeNode = Tree.TreeNode;
 
 export class TagList extends React.Component { // eslint-disable-line react/prefer-stateless-function
@@ -76,7 +77,7 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
       if (!tag['tag-header']) {
         mainTags[tag.value] = {
           name: tag.label[userLocale] ? tag.label[userLocale] : tag.label.en,
-          desc: tag.desc ? tag.desc : tag.label.en,
+          desc: tag.label[userLocale] ? tag.label[userLocale] : tag.label.en,
         };
       } else if (tag['tag-header'] && mainTags[tag.value]) {
         mainTags[tag.value].subtags = _.concat(mainTags[tag.value].subtags, tag.subtags);
@@ -85,7 +86,7 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
         mainTags[tag.value] = {
           'tag-header': true,
           "name": tag.label[userLocale] ? tag.label[userLocale] : tag.label.en,
-          "desc": tag.desc ? tag.desc : tag.label.en,
+          "desc": tag.label[userLocale] ? tag.label[userLocale] : tag.label.en,
           "subtags": tag.subtags,
         };
       }
@@ -248,6 +249,7 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
           onContextChange={this.getTagsforContext}
           moduleFilterEnabled={this.props.moduleFilterEnabled}
           modalProps={this.props.modalProps}
+          currentOrgDetails={this.props.currentOrgDetails}
         />
       </div>
     );
@@ -272,10 +274,12 @@ TagList.propTypes = {
   visibleTaglist: PropTypes.bool,
   hidePopover: PropTypes.bool,
   modalProps: PropTypes.any,
+  currentOrgDetails: PropTypes.object,
 };
 
 const mapStateToProps = createStructuredSelector({
   TagList: makeSelectTagList(),
+  currentOrgDetails: selectCurrentOrgDetails(),
 });
 
 function mapDispatchToProps(dispatch) {

package/v2Containers/TagList/tests/utils.test.js

@@ -0,0 +1,17 @@
+import "@testing-library/jest-dom";
+import { hideDateLocale } from "../utils";
+
+describe("Test utils", () => {
+  it("it should test when hideDateTagsForJpLocale is available", () => {
+    const result = hideDateLocale(true, { name: "店舗名" }, [], { name: "店舗名" });
+    expect(result).toEqual([{name: "店舗名"}]);
+  });
+  it("it should test when hideDateTagsForJpLocale is available", () => {
+    const result = hideDateLocale(true, { name: "mm/dd/yyyy" }, [], { name: "mm/dd/yyyy" });
+    expect(result).toEqual([]);
+  });
+  it("it should test when val name is not available", () => {
+    const result = hideDateLocale(false, { name: "店舗名" }, [], { name: "店舗名" });
+    expect(result).toEqual([{name: "店舗名"}]);
+  });
+});

package/v2Containers/TagList/utils.js

@@ -0,0 +1,15 @@
+import { JAPANESE_HIDE_DATE_ARRAY } from "../../containers/TagList/constants";
+
+
+export const hideDateLocale = (hideDateTagsForJpLocale, val, list, value) => {
+
+  if (hideDateTagsForJpLocale) {
+    // hidden date tags from the japanese locale
+    if (!JAPANESE_HIDE_DATE_ARRAY?.includes(val.name)) {
+      list.push(value);
+    }
+  } else {
+    list.push(value);
+  }
+  return list;
+};

package/.npmrc copy

@@ -1,2 +0,0 @@
-npm config set scope capillarytech	
-//registry.npmjs.org/:_authToken=${NPM_TOKEN}