@capillarytech/creatives-library 7.17.14-alpha.0 → 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_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-alpha.0",
+  "version": "7.17.14",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

package/utils/common.js

@@ -6,7 +6,6 @@ import {
   CARD_RELATED_TAGS,
   CARD_BASED_SCOPE,
 } from '../containers/App/constants';
-import { apiMessageFormatHandler } from './commonUtils';
 
 export function getUserNameById(userId, allUserList) {
   let userName = "";
@@ -265,59 +264,9 @@ export const isTraiDLTEnable = (isFullMode, smsRegister) => {
 };
 
 export const intlKeyGenerator = (value = "") => {
-  if (value && typeof value === "string")
-    return value.replace(/[^a-zA-Z0-9_]/g, "");
-  return value.props.defaultMessage.replace(/[^a-zA-Z0-9_]/g, "");
-};
-
-export const handleInjectedData = (data, scope) => {
-  let tagType;
-  for (const tagKey in data) {
-    if (data.hasOwnProperty(tagKey)) {
-      const tag = data[tagKey];
-
-      if (tag?.name === "Registration custom fields") {
-        tagType = "CustomTagMessage";
-      } else if (tag?.name === "Customer extended fields") {
-        tagType = "ExtendedTagMessage";
-      }
-
-      if (tag?.name) {
-        const name = tag?.name;
-        const key = intlKeyGenerator(name);
-        const id = tagType
-          ? `${scope}.${key}_name.${tagType}`
-          : `${scope}.${key}`;
-
-        tag["name"] = apiMessageFormatHandler(id, name);
-      }
-
-      if (tag["subtags"]) {
-        for (const subtagKey in tag["subtags"]) {
-          if (tag["subtags"].hasOwnProperty(subtagKey)) {
-            const subtag = tag["subtags"][subtagKey];
-            if (subtag?.name) {
-              const name = subtag?.name;
-              const key = intlKeyGenerator(name);
-              const id = tagType
-                ? `${scope}.${key}_name.${tagType}`
-                : `${scope}.${key}`;
-
-              subtag["name"] = apiMessageFormatHandler(id, name);
-            }
-            if (subtag?.desc) {
-              const desc = subtag?.desc;
-              const key = intlKeyGenerator(desc);
-              const id = tagType
-                ? `${scope}.${key}_desc.${tagType}`
-                : `${scope}.${key}`;
-
-              subtag["desc"] = apiMessageFormatHandler(id, desc);
-            }
-          }
-        }
-      }
-    }
+  if (value && value.typeOf === "string") {
+    const key = value.replace(/[^a-zA-Z0-9_]/g, "");
+    return key;
   }
-  return data;
-};
+  return value;
+}

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 { hidingDateTagsForJpLocale } 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>
-        );
-        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 = (
@@ -202,7 +192,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
             disabled={childDisabled}
           >
           </CapTreeNode>);
-        hidingDateTagsForJpLocale(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/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

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

package/v2Containers/TagList/index.js

@@ -19,11 +19,11 @@ 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;
 import { injectIntl } from 'react-intl';
+import { apiMessageFormatHandler } from '../../utils/commonUtils';
 import { scope } from './messages';
-import { handleInjectedData } from '../../utils/common';
+import { intlKeyGenerator } from '../../utils/common';
 
 export class TagList extends React.Component { // eslint-disable-line react/prefer-stateless-function
   constructor(props) {
@@ -184,14 +184,38 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
     allTags.coupon.subtags = couponTags;
   }
 
-  transformInjectedTags(tags) {
+  transformInjectedTags(tags, tagType = "") {
     _.forEach(tags, (tag) => {
       const temp = tag;
       let subKey = '';
+      if (tag?.name === 'Registration custom fields') {
+        tagType = 'CustomTagMessage';
+      }
+      else if (tag?.name === 'Customer extended fields') {
+        tagType = 'ExtendedTagMessage';
+      }      
       Object.keys(tag).map( (k) => {
         if (k.indexOf("subtags") !== -1) {
           subKey = k;
         }
+        if (k.indexOf("name") !== -1) {
+          const name = tag?.name;
+          const key = intlKeyGenerator(temp?.name);
+          const id = tagType.length > 0
+          ? `${scope}.${key}_name.${tagType}`
+          : `${scope}.${key}`;
+          
+          temp["name"]=apiMessageFormatHandler(id, name);
+        }
+        if (k.indexOf("desc") !== -1) {
+          const desc = tag?.desc;
+          const key = intlKeyGenerator(temp?.desc);
+          const id = tagType.length > 0
+          ? `${scope}.${key}_desc.${tagType}`
+          : `${scope}.${key}`;
+          
+          temp["desc"]=apiMessageFormatHandler(id, desc);
+        }
         return true;
       });
       if (subKey !== '') {
@@ -200,7 +224,7 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
           temp.subtags = _.cloneDeep(temp[subKey]);
           delete temp[subKey];
         }
-        temp.subtags = this.transformInjectedTags(temp.subtags);
+        temp.subtags = this.transformInjectedTags(temp.subtags, tagType);
       }
     });
     return tags;
@@ -228,11 +252,7 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
     let tags = {};
     let injectedTags = {};
     if (this.props.injectedTags && !_.isEmpty(this.props.injectedTags)) {
-      const formattedInjectedTags = handleInjectedData(
-        this.props.injectedTags,
-        scope
-      );
-      injectedTags = this.transformInjectedTags(formattedInjectedTags);
+      injectedTags = this.transformInjectedTags(this.props.injectedTags);
     }
     if (this.props.tags && this.props.tags.length > 0) {
       tags = this.populateTags(this.props.tags);
@@ -255,7 +275,6 @@ 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>
     );
@@ -280,12 +299,10 @@ 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/mockdata.js

@@ -88,16 +88,6 @@ export const TagListData = {
         },
     ],
     injectedTags : {
-        "dummys": {
-            "name": "dummys",
-            "subtags": {
-                "custom_field.age_group": {
-                    "name": "age_group",
-                    "desc": "age_group"
-                },
-            },
-            "tag-header": true
-        },
         "Registration custom fields": {
             "name": "Registration custom fields",
             "subtags": {
@@ -117,11 +107,7 @@ export const TagListData = {
                 },
                 "extended_field.marital_status": {
                     "name": "marital_status",
-                    "desc": {
-                        props: {
-                            defaultMessage : "Marital Status",
-                        },
-                    },
+                    "desc": "Marital Status"
                 },
             },
             "tag-header": true

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

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

package/v2Containers/TagList/utils.js

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