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

package/containers/App/constants.js

@@ -5,6 +5,7 @@ export const GET_SIDEBAR_FAILURE = 'app/App/GET_SIDEBAR_FAILURE';
 export const STORE2DOOR_PLUS_ENABLED = 'STORE2DOOR_PLUS_ENABLED';
 export const TRAI_DLT = 'TRAI_DLT';
 export const CARD_BASED_SCOPE = 'CARD_BASED_SCOPE';
+export const HOSPITALITY_BASED_SCOPE = 'HOSPITALITY_BASED_SCOPE';
 
 export const CARD_RELATED_TAGS = [
   'card_series',
@@ -14,3 +15,25 @@ export const CARD_RELATED_TAGS = [
   'card_series_name',
   'card_name',
 ];
+
+export const HOSPITALITY_RELATED_TAGS = [
+  "hospitality_series",
+  "tax_Code",
+  "roomTypeCode",
+  "bookingChannel",
+  "hotelReservationID_ResID_Type",
+  "lastModifyDateTime",
+  "guestCounts_IsPerRoom",
+  "ratePlan_RatePlanCode",
+  "resID_Value",
+  "numberOfUnits",
+  "rateTimeUnit",
+  "resStatus",
+  "timeSpan_End",
+  "roomStay_MarketCode",
+  "createDateTime",
+  "amount",
+  "timeSpan_Start",
+  "email",
+  "resID_Source",
+];

package/package.json

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

package/utils/common.js

@@ -5,8 +5,9 @@ import {
   TRAI_DLT,
   CARD_RELATED_TAGS,
   CARD_BASED_SCOPE,
+  HOSPITALITY_RELATED_TAGS,
+  HOSPITALITY_BASED_SCOPE,
 } from '../containers/App/constants';
-import { apiMessageFormatHandler } from './commonUtils';
 
 export function getUserNameById(userId, allUserList) {
   let userName = "";
@@ -54,16 +55,28 @@ export const hasCardBasedScope = Auth.hasFeatureAccess.bind(
   CARD_BASED_SCOPE,
 );
 
+export const hasHospitalityBasedScope = Auth.hasFeatureAccess.bind(
+  null,
+  HOSPITALITY_BASED_SCOPE,
+);
+
+//filtering tags based on scope
+export const filterTags = (tagsToFilter, tagsList) => tagsList?.filter(
+    (tag) => !tagsToFilter?.includes(tag?.definition?.value)
+);
+
 export function getTreeStructuredTags({tagsList, userLocale = 'en', offerDetails = [], disableTagsDetails = {}}) {
-  console.log('populating tags', (tagsList || []).length);
   const mainTags = {};
   const { disableRelatedTags, childTagsToDisable, parentTagstoDisable} = disableTagsDetails;
 
   let clonedTags = tagsList;
   if (!hasCardBasedScope()) {
-    clonedTags = _.filter(tagsList, (tag) =>
-      !CARD_RELATED_TAGS.includes(tag?.definition?.value)
-    );
+    //filtering CARD_RELATED_TAGS if org does not have CARD_BASED_SCOPE feature enabled
+    clonedTags = filterTags(CARD_RELATED_TAGS, tagsList);
+  }
+  if (!hasHospitalityBasedScope()) {
+    //filtering HOSPITALITY_RELATED_TAGS if org does not have HOSPITALITY_BASED_SCOPE feature enabled
+    clonedTags = filterTags(HOSPITALITY_RELATED_TAGS, tagsList);
   }
   _.forEach(clonedTags, (temp) => {
     const tag = temp.definition;
@@ -263,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.mockdata.js

@@ -0,0 +1,125 @@
+export const tagsList = [
+  {
+    _id: "6501b8b2ddd26e9da234b7c0",
+    type: "TAG",
+    definition: {
+      "resolutionDetails": {
+        resolver: "EI",
+        reference:
+          "select check_in_date.date as timeSpan_Start from read_api_2000014.behavioural_catalog_reservation a join read_api_2000014.date check_in_date on check_in_date.date_id=a.dim_timespan_start_id join read_api_2000014.date modified_date on modified_date.date_id=a.dim_latest_updated_date_id join read_api_2000014.date lastmodifydate on lastmodifydate.date_id=a.dim_lastmodifydatetime_id join read_api_2000014.date d ON a.dim_event_date_id = d.date_id join read_api_2000014.date booking_date ON a.dim_createdatetime_id = booking_date.date_id join read_api_2000014.date check_out_date ON a.dim_timespan_end_id = check_out_date.date_id join (select resid_value,  max(date) as max_updated_date from read_api_2000014.behavioural_catalog_reservation a join read_api_2000014.date d on d.date_id=a.dim_latest_updated_date_id group by 1 ) b on a.resid_value=b.resid_value and b.max_updated_date=modified_date.date where resstatus='Reserved' and datediff(check_in_date.date, date(now()) )= 3",
+        type: "QUERY",
+      },
+      "subType": "EXTERNAL",
+      "label": {
+        "zh-cn": "",
+        "en": "Checkin date",
+      },
+      "value": "timeSpan_Start",
+      "subtags": [],
+      "tag-header": false,
+      "supportedModules": [
+        {
+          mandatory: false,
+          layout: "sms",
+          context: "default",
+        },
+        {
+          mandatory: false,
+          layout: "sms",
+          context: "outbound",
+        },
+        {
+          mandatory: false,
+          layout: "email",
+          context: "default",
+        },
+        {
+          mandatory: false,
+          layout: "email",
+          context: "outbound",
+        },
+      ],
+    },
+    scope: {
+      tag: "STANDARD",
+      orgId: -1,
+      verticals: [],
+    },
+    isActive: true,
+    createdBy: 50685535,
+    updatedBy: 50685535,
+    createdAt: "2023-09-13T13:27:14.653Z",
+    updatedAt: "2023-09-13T13:27:14.653Z",
+  },
+  {
+    _id: "5a291cdd85c3db29a2041e5a",
+    type: "TAG",
+    definition: {
+      "label": {
+        "en": "Optout",
+        "ja-JP": "撤回",
+      },
+      "value": "optout",
+      "subtags": [],
+      "tag-header": false,
+      "supportedModules": [
+        {
+          context: "journey",
+          layout: "sms",
+          mandatory: false,
+        },
+        {
+          context: "outbound",
+          layout: "sms",
+          mandatory: false,
+        },
+        {
+          context: "default",
+          layout: "sms",
+          mandatory: false,
+        },
+        {
+          context: "coupon_expiry",
+          layout: "sms",
+          mandatory: false,
+        },
+        {
+          context: "coupons",
+          layout: "sms",
+          mandatory: false,
+        },
+      ],
+    },
+    scope: {
+      tag: "STANDARD",
+      orgId: -1,
+      verticals: [],
+    },
+    isActive: true,
+    createdBy: 4,
+    updatedBy: 15000449,
+    createdAt: "2017-12-07T10:50:05.800Z",
+    updatedAt: "2018-01-22T11:43:05.611Z",
+  },
+];
+export const tagsToFilter = ["timeSpan_Start"];
+
+export const output1 = [
+  {
+    disabled: false,
+    title: "Optout",
+    value: "{{optout}}",
+  },
+];
+export const output2 = [
+  {
+    disabled: false,
+    title: "Checkin date",
+    value: "{{timeSpan_Start}}",
+  },
+  {
+    disabled: false,
+    title: "Optout",
+    value: "{{optout}}",
+  },
+];

package/utils/tests/common.test.js

@@ -0,0 +1,18 @@
+import "@testing-library/jest-dom";
+import { filterTags, getTreeStructuredTags } from "../common";
+import * as mockdata from "./common.mockdata";
+
+describe("getTreeStructuredTags test", () => {
+  it("test for getTreeStructuredTags when tagsList is not empty", () => {
+    expect(getTreeStructuredTags({tagsList: mockdata.tagsList})).toEqual(mockdata.output1);
+  });
+  it("test for getTreeStructuredTags when tagsList is empty", () => {
+    expect(getTreeStructuredTags({tagsList: []})).toEqual([]);
+  });
+  it("test for filterTags", () => {
+    expect(filterTags(mockdata.tagsToFilter, mockdata.tagsList)).toEqual([mockdata.tagsList[1]]);
+  });
+  it("test for filterTags when tagsToFilter and tagsList is empty", () => {
+    expect(filterTags([], [])).toEqual([]);
+  });
+});

package/utils/tests/commonUtil.test.js

@@ -0,0 +1,21 @@
+import "@testing-library/jest-dom";
+import { getTreeStructuredTags } from "../common";
+import * as mockdata from "./common.mockdata";
+
+jest.mock('@capillarytech/cap-ui-utils', () => ({
+  Auth: {
+    hasAccess: () => jest.fn(() => true),
+    hasFeatureAccess: () => jest.fn(() => true),
+    authHoc: jest.fn(),
+    initialize: jest.fn(),
+  },
+}));
+
+describe("common utils test", () => {
+  it("test for getTreeStructuredTags when tagsList is not empty", () => {
+    expect(getTreeStructuredTags({tagsList: mockdata.tagsList})).toEqual(mockdata.output2);
+  });
+  it("test for getTreeStructuredTags when tagsList is empty", () => {
+    expect(getTreeStructuredTags({tagsList: []})).toEqual([]);
+  });
+});

package/v2Components/CapTagList/index.js

@@ -7,6 +7,8 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import { connect } from 'react-redux';
+import moment from 'moment';
+import { FONT_COLOR_05 } from '@capillarytech/cap-ui-library/styled/variables';
 // import styled from 'styled-components';
 import { CapSpin, CapModal, CapButton, CapPopover, CapInput, CapTree, CapSelect, CapTooltip, CapLink, CapIcon } from '@capillarytech/cap-ui-library';
 
@@ -15,10 +17,9 @@ import { FormattedMessage, injectIntl, intlShape } from 'react-intl';
 import { createStructuredSelector } from 'reselect';
 import messages from './messages';
 import { makeSelectLoyaltyPromotionDisplay } from '../../v2Containers/Cap/selectors';
-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 { CARD_RELATED_TAGS, HOSPITALITY_RELATED_TAGS } from '../../containers/App/constants';
+import { hasCardBasedScope, hasHospitalityBasedScope } from '../../utils/common';
+
 import {
   GET_TRANSLATION_MAPPED,
   JAPANESE_HELP_TEXT,
@@ -43,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);
@@ -64,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);
@@ -181,6 +172,10 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
     if (!hasCardBasedScope()) {
       clonedTags = _.omit(clonedTags, CARD_RELATED_TAGS);
     }
+    if (!hasHospitalityBasedScope()) {
+      //filtering HOSPITALITY_RELATED_TAGS if org does not have HOSPITALITY_BASED_SCOPE feature enabled
+      clonedTags = _.omit(clonedTags, HOSPITALITY_RELATED_TAGS);
+    }
     _.forEach(clonedTags, (val = '', key) => {
       let supportedTagsString = '';
       _.forEach(val.supportedTags, (supportedTag) => {
@@ -264,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>