@capillarytech/creatives-library 7.17.10 → 7.17.12

package/components/Ckeditor/index.js

@@ -13,14 +13,14 @@ 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 = "https://storage.crm.n.content-cdn.io/ckeditor_test/ckeditor4/ckeditor.js";
 const user = localStorage.getItem('user');
 let locale = 'en';
 if (user && JSON.parse(user).lang) {
   locale = JSON.parse(user).lang;
 }
 const CKEditorConfig = {
-  skin: 'moono-lisa',
+  skin: 'moono',
   toolbar: [
     { name: 'document', items: ['Source', '-'] },
     { name: 'clipboard', items: ['Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo'] },

package/containers/TagList/constants.js

@@ -17,3 +17,5 @@ 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.10",
+  "version": "7.17.12",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

package/v2Components/CapTagList/index.js

@@ -19,7 +19,8 @@ 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, JAPANESE_HIDE_DATE_ARRAY, TAG_TRANSLATION_DOC } from '../../containers/TagList/constants';
+import { HIDE_ENGAGEMENT_CHANNELS } from '../../v2Containers/App/constants';
 
 const {Search} = CapInput;
 const {CapTreeNode} = CapTree;
@@ -155,7 +156,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 hideDefaultJpTranslation = accessibleFeatures.includes(HIDE_ENGAGEMENT_CHANNELS);
     const list = [];
     const loyaltyAttrDisableText = <FormattedMessage {...messages.loyaltyAttributeDisable} />;
     let clonedTags = _.cloneDeep(tags);
@@ -171,7 +174,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 tempNode = (
           <CapTreeNode
             title={disabled ? <CapTooltip title={loyaltyAttrDisableText}>{val.name}</CapTooltip> : val.name}
             tag={val}
@@ -180,7 +183,14 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
           >
             {temp}
           </CapTreeNode>
-        ));
+        );
+        if (hideDefaultJpTranslation) {
+          if (!JAPANESE_HIDE_DATE_ARRAY.includes(val.name)) {
+            list.push(tempNode);
+          }
+        } else {
+          list.push(tempNode);
+        }
       } else if (searchString === '' || !searchString || ((val.name || '').toLowerCase().indexOf(searchString.toLowerCase()) !== -1)) {
         const childDisabled = disableRelatedTags ? childTagsToDisable.includes(key) : false;
         const tempNode = (
@@ -192,7 +202,13 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
             disabled={childDisabled}
           >
           </CapTreeNode>);
-        list.push(tempNode);
+        if (hideDefaultJpTranslation) {
+          if (!JAPANESE_HIDE_DATE_ARRAY.includes(val.name)) {
+            list.push(tempNode);
+          }
+        } else {
+          list.push(tempNode);
+        }
       }
     });
     return list;
@@ -243,7 +259,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 +267,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 +280,8 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
                 </div>
               </CapButton>
             </CapLink>
-            </div>
-            }
+          </div>
+        }
 
       </CapSpin>
     </div>);
@@ -275,18 +291,18 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
           visible={this.props.visibleTaglist}
           footer={[]}
           {...modalProps}
-          >
+        >
           {contentSection}
         </CapModal> :
-        <CapPopover
-          visible={visible}
-          onVisibleChange={this.togglePopoverVisibility}
-          content={contentSection}
-          trigger="click"
-          placement="rightTop"
+          <CapPopover
+            visible={visible}
+            onVisibleChange={this.togglePopoverVisibility}
+            content={contentSection}
+            trigger="click"
+            placement="rightTop"
           >
-          <CapButton isAddBtn type="flat">{label || ''}</CapButton>
-        </CapPopover>
+            <CapButton isAddBtn type="flat">{label || ''}</CapButton>
+          </CapPopover>
         }
         <CapModal
           visible={this.state.showModal}
@@ -320,6 +336,7 @@ CapTagList.propTypes = {
   hidePopover: PropTypes.bool,
   modalProps: PropTypes.any,
   disableTagsDetails: PropTypes.object,
+  currentOrgDetails: PropTypes.object,
 };
 
 CapTagList.defaultValue = {
@@ -337,4 +354,3 @@ const mapStateToProps = createStructuredSelector({
 
 
 export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(CapTagList));
-

package/v2Components/Ckeditor/index.js

@@ -13,14 +13,14 @@ 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 = "https://storage.crm.n.content-cdn.io/ckeditor_test/ckeditor4/ckeditor.js";
 const user = localStorage.getItem('user');
 let locale = 'en';
 if (user && JSON.parse(user).lang) {
   locale = JSON.parse(user).lang;
 }
 const CKEditorConfig = {
-  skin: 'moono-lisa',
+  skin: 'moono',
   toolbar: [
     { name: 'document', items: ['Source', '-'] },
     { name: 'clipboard', items: ['Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo'] },

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('');
 
     useEffect(() => {
         const { messageTitle = '', messageContent = '', type, isInit } = content;
@@ -70,7 +73,21 @@ export const LineText = ({
             }
         }
     }, [content]);
-
+        const getTranslationMappedLocale = (locale) => {
+            return GET_TRANSLATION_MAPPED?.[locale];
+        }
+    
+    useEffect(() => {
+        const user = localStorage.getItem('user');
+        let locale = 'en';
+        moment.locale(locale);
+        if (user) {
+          locale = JSON.parse(user).lang || locale;
+        }
+        locale = getTranslationMappedLocale(locale);
+        updateTranslationLang(locale);
+    }, []);
+     
     useEffect(() => {
         if (messageContent && (isFullMode ? messageTitle : true)) {
             updateMessageState({
@@ -260,7 +277,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.desc ? tag.desc : tag.label[userLocale],
         };
       } 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.desc ? tag.desc : tag.label[userLocale],
           "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/.npmrc copy

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

package/v2Components/Ckeditor/tests/index.test.js

@@ -1,44 +0,0 @@
-import React, { Component } from "react";
-import { injectIntl } from "react-intl";
-import "@testing-library/jest-dom";
-import { render, getByText, screen } from "../../../utils/test-utils";
-import Ckeditor from "../index";
-
-const initializeComponent = () => {
-  const Component = injectIntl(Ckeditor);
-
-  //const originalComponentDidMount = Ckeditor.prototype.componentDidMount;
-  Ckeditor.prototype.componentDidMount = jest.fn();
-  Ckeditor.prototype.handleContentChange = jest.fn();
-
-  //Render with default props.
-  return render(<Component />);
-};
-
-describe("Load Ckeditor", () => {
-  it("Test if Ckeditor Mounts", () => {
-    initializeComponent();
-
-    expect(Ckeditor.prototype.componentDidMount).toHaveBeenCalled();
-  });
-
-  it("Test if Ckeditor un-Mounts", () => {
-    // Spy on the componentWillUnmount method
-    const componentWillUnmountSpy = jest.spyOn(
-      Ckeditor.prototype,
-      "componentWillUnmount"
-    );
-
-    // Render the component
-    const { unmount } = initializeComponent();
-
-    // Manually unmount the component (simulate unmounting)
-    unmount();
-
-    // Assert that componentWillUnmount has been called
-    expect(componentWillUnmountSpy).toHaveBeenCalled();
-
-    // Clean up the spy
-    componentWillUnmountSpy.mockRestore();
-  });
-});