@capillarytech/creatives-library 7.17.21-alpha.2 → 7.17.21

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "7.17.21-alpha.2",
+  "version": "7.17.21",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

package/utils/common.js

@@ -8,7 +8,6 @@ import {
   HOSPITALITY_RELATED_TAGS,
   HOSPITALITY_BASED_SCOPE,
 } from '../containers/App/constants';
-import { apiMessageFormatHandler } from './commonUtils';
 
 export function getUserNameById(userId, allUserList) {
   let userName = "";
@@ -277,61 +276,3 @@ export const isTraiDLTEnable = (isFullMode, smsRegister) => {
   const isTraiDltFeature = isTraiDltFeatureForOrg && isTraiEnableforLib;
   return isTraiDltFeature;
 };
-
-export const intlKeyGenerator = (value = "") => {
-  return value.replace(/[^a-zA-Z0-9_]/g, "");
-};
-
-export const handleInjectedData = (data, scope) => {
-  let temp = _.cloneDeep(data);
-  let tagType;
-  for (const tagKey in temp) {
-    if (temp.hasOwnProperty(tagKey)) {
-      const tag = temp[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);
-            }
-          }
-        }
-      }
-      tagType="";
-    }
-  }
-  return temp;
-};

package/utils/tests/common.test.js

@@ -1,7 +1,5 @@
-import React from 'react';
-import { FormattedMessage } from 'react-intl';
 import "@testing-library/jest-dom";
-import { filterTags, getTreeStructuredTags, handleInjectedData } from "../common";
+import { filterTags, getTreeStructuredTags } from "../common";
 import * as mockdata from "./common.mockdata";
 
 describe("getTreeStructuredTags test", () => {
@@ -18,81 +16,3 @@ describe("getTreeStructuredTags test", () => {
     expect(filterTags([], [])).toEqual([]);
   });
 });
-
-describe("handleInjectedData", () => {
-  it("replaces name with intl key for top level tag", () => {
-    const data = {
-      tag1: {
-        name: "Registration Fields",
-      },
-    };
-
-    const result = handleInjectedData(data, "scope");
-
-    expect(result.tag1.name).toEqual(<FormattedMessage defaultMessage="Registration Fields" id="scope.RegistrationFields" values={{}} />);
-  });
-
-  it("adds tagType for Registration custom fields", () => {
-    const data = {
-      tag1: {
-        name: "Registration custom fields",
-      },
-    };
-
-    const result = handleInjectedData(data, "scope");
-
-    expect(result.tag1.name).toEqual(
-      <FormattedMessage defaultMessage="Registration custom fields" id="scope.Registrationcustomfields_name.CustomTagMessage" values={{}} />
-    );
-  });
-
-  it("adds tagType for Customer extended fields fields", () => {
-    const data = {
-      tag1: {
-        name: "Customer extended fields",
-      },
-    };
-
-    const result = handleInjectedData(data, "scope");
-
-    expect(result.tag1.name).toEqual(
-      <FormattedMessage defaultMessage="Customer extended fields" id="scope.Customerextendedfields_name.ExtendedTagMessage" values={{}} />
-    );
-  });
-
-
-  it("replaces subtag name with intl key", () => {
-    const data = {
-      tag1: {
-        subtags: {
-          subtag1: {
-            name: "First Name",
-          },
-        },
-      },
-    };
-
-    const result = handleInjectedData(data, "scope");
-
-    expect(result.tag1.subtags.subtag1.name).toEqual(<FormattedMessage defaultMessage="First Name" id="scope.FirstName" values={{}} />);
-  });
-
-  it("replaces subtag desc with intl key", () => {
-    const data = {
-      tag1: {
-        subtags: {
-          subtag1: {
-            desc: "Enter your first name",
-          },
-        },
-      },
-    };
-
-    const result = handleInjectedData(data, "scope");
-
-    expect(result.tag1.subtags.subtag1.desc).toEqual(
-      <FormattedMessage defaultMessage="Enter your first name" id="scope.Enteryourfirstname" values={{}} />
-    );
-  });
-});
-

package/v2Components/CapTagList/index.js

@@ -44,7 +44,6 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
       dynamicDateValue: '',
       showModal: false,
       translationLang: '',
-      tagsList: []
     };
     this.renderTags = this.renderTags.bind(this);
     this.getSearchedExpandedKeys = this.getSearchedExpandedKeys.bind(this);
@@ -65,15 +64,6 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
     });
   }
 
-  componentDidUpdate(prevProps, prevState){
-    if (this.props.tags !== prevProps.tags || this.state.searchValue !== prevState.searchValue) {
-      let temp = this.renderTags(this.props.tags, this.state.searchValue);
-      this.setState({
-        tagsList: temp
-      });
-    }
-  }
-
   onChange = (e) => {
     const value = e.target.value;
     let expandedKeys = this.getSearchedExpandedKeys(this.props.tags, value);
@@ -94,12 +84,12 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
     let list = [];
     _.forEach(tags, (val = {}, key) => {
       if (_.has(val, 'subtags')) {
-        if (val.name && typeof val.name === 'string' && (val.name || '').toLowerCase().indexOf(value.toLowerCase()) !== -1) {
+        if ((val.name || '').toLowerCase().indexOf(value.toLowerCase()) !== -1) {
           list.push(key);
         }
         const temp = this.getSearchedExpandedKeys(val.subtags, value);
         list = list.concat(temp);
-      } else if (val.name && typeof val.name === 'string' && (val.name || '').toLowerCase().indexOf(value.toLowerCase()) !== -1) {
+      } else if ((val.name || '').toLowerCase().indexOf(value.toLowerCase()) !== -1) {
         list.push(key);
       }
     });
@@ -269,8 +259,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
           autoExpandParent={autoExpandParent}
           onExpand={this.onExpand}
         >
-          {/* {this.renderTags(tg, searchValue)} */}
-          {this.state.tagsList}
+          {this.renderTags(tg, searchValue)}
         </CapTree>
         {translationLang === "ja-JP" &&
           <div className="tag-list-footer">

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/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>