@capillarytech/creatives-library 7.17.14-alpha.0 → 7.17.15

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "7.17.14-alpha.0",
+  "version": "7.17.15",
   "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 = "";
@@ -263,61 +262,3 @@ export const isTraiDLTEnable = (isFullMode, smsRegister) => {
   const isTraiDltFeature = isTraiDltFeatureForOrg && isTraiEnableforLib;
   return isTraiDltFeature;
 };
-
-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);
-            }
-          }
-        }
-      }
-    }
-  }
-  return data;
-};

package/v2Components/CapTagList/index.js

@@ -293,7 +293,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
           onVisibleChange={this.togglePopoverVisibility}
           content={contentSection}
           trigger="click"
-          placement="rightTop"
+          placement="bottom"
           >
           <CapButton isAddBtn type="flat">{label || ''}</CapButton>
         </CapPopover>

package/v2Components/FormBuilder/index.js

@@ -52,6 +52,8 @@ import { validateIfTagClosed } from '../../utils/tagValidations';
 import globalMessages from '../../v2Containers/Cap/messages';
 import { convert } from 'html-to-text';
 import { AI_SUGGESTION_API_URL } from './constants';
+import { GET_TRANSLATION_MAPPED } from '../../containers/TagList/constants';
+import moment from 'moment';
 const TabPane = Tabs.TabPane;
 const {Column} = Table;
 const {TextArea} = CapInput;
@@ -94,6 +96,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
       popoverVisible: false,
       customPopoverVisible: false,
       isDrawerVisible: false,
+      translationLang: ''
     };
     this.renderForm = this.renderForm.bind(this);
     this.updateFormData = this.updateFormData.bind(this);
@@ -3427,6 +3430,23 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
     return fields;
   }
 
+  //To Find from which locale user is loggedin
+  getTranslationMappedLocale(locale) {
+    return GET_TRANSLATION_MAPPED?.[locale];
+  }
+  componentDidMount() {
+    const user = localStorage.getItem('user');
+    let locale = 'en';
+    moment.locale(locale);
+    if (user) {
+      locale = JSON.parse(user).lang || locale;
+    }
+    locale = this.getTranslationMappedLocale(locale);
+    this.setState({
+      translationLang: locale,
+    });
+  }
+
   renderContainer(container) {
     const containerType = container.type;
     const renderedPanes = [];
@@ -3473,13 +3493,13 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                 forceRender
                 tab={
                   <div className="form-tab-header" onInput={(e) => e.stopPropagation()}>
-                    {
+                    { this.state.translationLang !== 'ja-JP' && (
                     _.forEach(renderedContentSections, (value) => {
                       if (value) {
                         return value;
                       }
                       return value;
-                    })
+                    }))
                     }
                   </div>
                 }

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

package/v2Containers/CreativesContainer/SlideBoxHeader.js

@@ -56,7 +56,7 @@ export function SlideBoxHeader(props) {
   const getChannelLabel = (currentChannel = '') => {
     const labels = {
       sms: 'SMS',
-      email: 'Email',
+      email: <FormattedMessage {...messages.emailHeader} />,
       mobilepush: 'Push notification',
       wechat: 'Wechat',
       no_communication: 'NO_COMMUNICATION',

package/v2Containers/LanguageProvider/reducer.js

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

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

@@ -3,7 +3,6 @@ import { fromJS } from 'immutable';
 import languageProviderReducer from '../reducer';
 import {
   CHANGE_LOCALE,
-  GET_LOCIZ_MESSAGE_REQUEST,
 } from '../constants';
 
 describe('languageProviderReducer', () => {
@@ -22,12 +21,4 @@ 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/Wrapper/tests/__snapshots__/index.test.js.snap

@@ -23058,7 +23058,7 @@ new message content.",
                                     </div>
                                   </ComponentWithLabelHOC__CapComponentStyled>
                                 </_class>
-                                <Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))
+                                <Connect(UserIsAuthenticated(Connect(TagList)))
                                   id="undefined_tags"
                                   injectedTags={Object {}}
                                   key="undefined_tags"
@@ -23079,7 +23079,7 @@ new message content.",
                                   tags={Array []}
                                   userLocale="en-US"
                                 >
-                                  <UserIsAuthenticated(Connect(InjectIntl(TagList)))
+                                  <UserIsAuthenticated(Connect(TagList))
                                     authData={
                                       Object {
                                         "app": Object {},
@@ -23125,7 +23125,7 @@ new message content.",
                                     tags={Array []}
                                     userLocale="en-US"
                                   />
-                                </Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))>
+                                </Connect(UserIsAuthenticated(Connect(TagList)))>
                                 <CapDrawer
                                   content={
                                     <React.Fragment>