@capillarytech/creatives-library 8.0.17 → 8.0.19

package/package.json

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

package/utils/tagValidations.js

@@ -265,4 +265,13 @@ export const preprocessHtml = (content) => {
 
   // Step 2: Perform the standard replacements on the entire content
   return contentWithStyleFixes?.replace(/'|"|&|<|>|"|\n/g, match => replacements[match]);
+};
+
+//this is used to get the subtags from custom or extended tags
+export const getTagMapValue = (object = {}) => {
+  return Object.values(
+    object
+  ).reduce((acc, current) => {
+    return { ...acc?.subtags ?? {}, ...current?.subtags ?? {} };
+  }, {});
 };

package/utils/tests/tagValidations.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import '@testing-library/jest-dom';
-import { checkSupport, extractNames, preprocessHtml, validateIfTagClosed,validateTags} from '../tagValidations';
+import { checkSupport, extractNames, getTagMapValue, preprocessHtml, validateIfTagClosed,validateTags} from '../tagValidations';
 
 describe("check if curly brackets are balanced", () => {
     it("test for balanced curly brackets", () => {
@@ -421,4 +421,26 @@ describe('preprocessHtml', () => {
     expect(preprocessHtml(input)).toEqual(expectedOutput);
   });
 
+
+});
+
+
+describe("getTagMapValue", () => {
+  it("should return an empty object when no object is provided", () => {
+    const result = getTagMapValue();
+    expect(result).toEqual({});
+  });
+
+  it("should return the tag map value when an object is provided", () => {
+    const object = {
+      "key 1": {
+        name: "23",
+        subtags: {
+          name: "233",
+        },
+      },
+    };
+    const result = getTagMapValue(object);
+    expect(result).toEqual({ name: "233" });
+  });
 });

package/v2Containers/Cap/mockData.js

@@ -51,7 +51,7 @@ export const expectedStateGetLiquidTagsRequest = {
     messages: [],
     metaEntities: {
       layouts: undefined,
-      tagLookupMap: { undefined: "32" },
+      tagLookupMap: { undefined: {definition: {}} },
       tags: { standard: { random: "32" } }
     },
     orgID: "",

package/v2Containers/Cap/reducer.js

@@ -7,6 +7,7 @@ import * as types from './constants';
 import initialState from '../../initialState';
 import { FAILURE } from '../App/constants';
 import { TAG } from '../Whatsapp/constants';
+import { getTagMapValue } from '../../utils/tagValidations';
 
 function capReducer(state = fromJS(initialState.cap), action) {
   switch (action.type) {
@@ -96,14 +97,34 @@ function capReducer(state = fromJS(initialState.cap), action) {
       return state
         .set('fetchingLiquidTags', false)
     case types.GET_SCHEMA_FOR_ENTITY_SUCCESS: {
-      const stateMeta = state.get('metaEntities');
-      const standardTagMap = _.keyBy(action?.data?.metaEntities?.standard, item => item?.definition?.value);
+      //Process standard tags
+      const standardTagMapInitial = _.keyBy(
+        action?.data?.metaEntities?.standard,
+        item => item?.definition?.value
+      );
+      // Mapping only the `definition` object instead of the entire item, to reduce space used
+      const standardTagMap = _.mapValues(standardTagMapInitial, item => ({
+        definition: item?.definition ?? {},
+      }));
+
+      // Process custom tags
+      const customSubtags = getTagMapValue(action?.data?.metaEntities?.custom)
+      // Process extended tags
+      const extendedSubtags = getTagMapValue(action?.data?.metaEntities?.extended);
+
+      // Combine all maps
+      const combinedTagMap = {
+        ...standardTagMap,
+        ...customSubtags,
+        ...extendedSubtags
+      };
+      const stateMeta = state.get("metaEntities");
       return state
         .set('fetchingSchema', false)
         .set('metaEntities', {
           layouts: action.data && action.entityType === 'LAYOUT' ? action.data.metaEntities : stateMeta.layouts,
           tags: action.data && action.entityType === 'TAG' ? action.data.metaEntities : stateMeta.tags,
-          tagLookupMap: action?.data && action?.entityType === TAG ? standardTagMap : stateMeta?.tagLookupMap,
+          tagLookupMap: action?.data && action?.entityType === TAG ? combinedTagMap : stateMeta?.tagLookupMap,
         })
         .set('fetchingSchemaError', false);
     }

package/v2Containers/FTP/index.js

@@ -22,7 +22,7 @@ import {
   CapTooltip,
 } from '@capillarytech/cap-ui-library';
 import { FONT_SIZE_L } from '@capillarytech/cap-ui-library/styled/variables';
-import { find, cloneDeep, findIndex, isEmpty, isEqual, filter, flattenDeep, replace } from 'lodash';
+import _, { find, cloneDeep, findIndex, isEmpty, isEqual, filter, flattenDeep, replace } from 'lodash';
 import * as actions from './actions';
 import { makeSelectFTP, makeSelectMetaEntities } from './selectors';
 import { makeSelectLoyaltyPromotionDisplay, setInjectedTags } from '../Cap/selectors';

package/v2Containers/MobilePush/Create/constants.js

@@ -22,3 +22,4 @@ export const GET_IOS_CTAS = 'app/v2Containers/PushMessage/Create/GET_IOS_CTAS';
 export const GET_IOS_CTAS_SUCCESS = 'app/v2Containers/PushMessage/Create/GET_IOS_CTAS_SUCCESS';
 export const GET_IOS_CTAS_FAILURE = 'app/v2Containers/PushMessage/Create/GET_IOS_CTAS_FAILURE';
 export const RESET_STORE = 'app/v2Containers/PushMessage/Create/RESET_STORE';
+export const EXTERNAL_LINK_LOWERCASE = 'external link';

package/v2Containers/MobilePush/Create/index.js

@@ -36,6 +36,7 @@ import injectReducer from '../../../utils/injectReducer';
 import injectSaga from '../../../utils/injectSaga';
 import v2MobilePushCreateReducer from './reducer';
 import { v2MobilePushWatchDuplicateTemplateSaga } from './sagas';
+import { EXTERNAL_LINK_LOWERCASE } from './constants';
 
 const PrefixWrapper = styled.div`
   margin-right: 16px;
@@ -200,11 +201,25 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
         newFormData[0]["add-sec-cta-2"] = false;
       }
     }
-    this.setState({formData: newFormData, tabCount, isSchemaChanged: !this.state.isSchemaChanged}, () => {
-      if (isFullMode && showTemplateName) {
-        showTemplateName({formData: this.state.formData, onFormDataChange: this.onFormDataChange});
+    const compareValue =
+      newFormData?.[this.state?.currentTab - 1]?.[inputField?.id] || "";
+    this.setState(
+      {
+        formData: newFormData,
+        tabCount,
+        isSchemaChanged:
+          compareValue.toLowerCase() === EXTERNAL_LINK_LOWERCASE ||
+          !this.state?.isSchemaChanged,
+      },
+      () => {
+        if (isFullMode && showTemplateName) {
+          showTemplateName({
+            formData: this.state?.formData,
+            onFormDataChange: this.onFormDataChange,
+          });
+        }
       }
-    });
+    );
   };
 
   onTagSelect = (data, currentTab, srcComp) => {