@capillarytech/creatives-library 7.17.12 → 7.17.13

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_test/ckeditor4/ckeditor.js";
+const defaultScriptUrl = "https://storage.crm.n.content-cdn.io/ckeditor_full/ckeditor/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',
+  skin: 'moono-lisa',
   toolbar: [
     { name: 'document', items: ['Source', '-'] },
     { name: 'clipboard', items: ['Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo'] },

package/containers/TagList/constants.js

@@ -18,4 +18,13 @@ export const GET_TRANSLATION_MAPPED = {
   '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'];
+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.12",
+  "version": "7.17.13",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

package/v2Components/CapTagList/index.js

@@ -19,8 +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, JAPANESE_HIDE_DATE_ARRAY, 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;
@@ -156,9 +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 { accessibleFeatures = [] } = this.props.currentOrgDetails || {};
-    const hideDefaultJpTranslation = accessibleFeatures.includes(HIDE_ENGAGEMENT_CHANNELS);
+    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);
@@ -174,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);
-        const tempNode = (
+        const tagValue = (
           <CapTreeNode
             title={disabled ? <CapTooltip title={loyaltyAttrDisableText}>{val.name}</CapTooltip> : val.name}
             tag={val}
@@ -184,13 +190,7 @@ 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);
-        }
+        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,13 +202,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
             disabled={childDisabled}
           >
           </CapTreeNode>);
-        if (hideDefaultJpTranslation) {
-          if (!JAPANESE_HIDE_DATE_ARRAY.includes(val.name)) {
-            list.push(tempNode);
-          }
-        } else {
-          list.push(tempNode);
-        }
+        hideDateLocale(hideDateTagsForJpLocale, val, list, tempNode);
       }
     });
     return list;
@@ -294,15 +288,15 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
         >
           {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}

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_test/ckeditor4/ckeditor.js";
+const defaultScriptUrl = "https://storage.crm.n.content-cdn.io/ckeditor_full/ckeditor/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',
+  skin: 'moono-lisa',
   toolbar: [
     { name: 'document', items: ['Source', '-'] },
     { name: 'clipboard', items: ['Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo'] },

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

@@ -0,0 +1,44 @@
+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();
+  });
+});

package/v2Containers/Email/initialSchema.js

@@ -351,7 +351,7 @@ export const response = {
                             fontFamily: "open-sans, sans-serif",
                             fontStyle: "normal",
                             fontWeight: "600",
-                            justifyContent: "flex-end",
+                            marginLeft: "0.313rem",
                           },
                           customComponent: true,
                           width: 2,

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

@@ -56,7 +56,7 @@ export const LineText = ({
     const [messageTitle, updateTextMessageTitle] = useState('');
     const [isDrawerRequired, updateDrawerRequirement] = useState(false);
     const [selectedTemplate, updateSelectedTemplate] = useState();
-    const [translationLang, updateTranslationLang] = useState('');
+    const [translationLang, updateTranslationLang] = useState('en');
 
     useEffect(() => {
         const { messageTitle = '', messageContent = '', type, isInit } = content;
@@ -73,19 +73,17 @@ export const LineText = ({
             }
         }
     }, [content]);
-        const getTranslationMappedLocale = (locale) => {
-            return GET_TRANSLATION_MAPPED?.[locale];
-        }
-    
+
+    //To Find from which locale user is loggedin
     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);
+      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(() => {

package/v2Containers/TagList/index.js

@@ -77,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[userLocale],
+          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);
@@ -86,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[userLocale],
+          "desc": tag.label[userLocale] ? tag.label[userLocale] : tag.label.en,
           "subtags": tag.subtags,
         };
       }

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;
+};