@capillarytech/creatives-library 8.0.76-alpha.0 → 8.0.76

package/package.json

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

package/services/api.js

@@ -2,12 +2,12 @@
  * Created by vivek on 3/5/17.
  */
 import 'whatwg-fetch';
-import { GA, decompressJsonObject } from '@capillarytech/cap-ui-utils';
 import { loadItem, clearItem } from './localStorageApi';
 import config from '../config/app';
 import pathConfig from '../config/path';
 import getSchema from './getSchema';
 import * as API from '../utils/ApiCaller';
+import { GA, decompressJsonObject } from '@capillarytech/cap-ui-utils';
 import { addBaseToTemplate } from '../utils/commonUtils';
 import { EMAIL, SMS } from '../v2Containers/CreativesContainer/constants';
 let API_ENDPOINT = config.development.api_endpoint;
@@ -403,28 +403,14 @@ export const getCmsData = (cmsType, projectId, langId) => {
   return API.get(url);
 };
 
-export const getEdmTemplates = async () => {
+export const getEdmTemplates = () => {
   const url = `${API_ENDPOINT}/templates/email/default`;
-  const compressedEdmTemplates = await request(url, getAPICallObject('GET'));
-  const { response = '' } = compressedEdmTemplates || {};
-  // Check if response contains error
-  if (compressedEdmTemplates.errorMessage || compressedEdmTemplates.error) {
-    return compressedEdmTemplates;
-  }
-  const decompressedEdmTemplates = decompressJsonObject(response);
-  return { ...compressedEdmTemplates, response: addBaseToTemplate(decompressedEdmTemplates) };
+  return request(url, getAPICallObject('GET'));
 };
 
-export const getDefaultBeeTemplates = async () => {
+export const getDefaultBeeTemplates = () => {
   const url = `${API_ENDPOINT}/templates/v2/email/default`;
-  const compressedDefaultBeeTemplates = await request(url, getAPICallObject('GET'));
-  const { response = '' } = compressedDefaultBeeTemplates || {};
-  // Check if response contains error
-  if (compressedDefaultBeeTemplates.errorMessage || compressedDefaultBeeTemplates.error) {
-    return compressedDefaultBeeTemplates;
-  }
-  const decompressedBeeTemplates = decompressJsonObject(response);
-  return { ...compressedDefaultBeeTemplates, response: addBaseToTemplate(decompressedBeeTemplates) };
+  return request(url, getAPICallObject('GET'));
 };
 
 // All about line

package/utils/tagValidations.js

@@ -315,7 +315,7 @@ export const getTagMapValue = (object = {}) => {
   return Object.values(
     object
   ).reduce((acc, current) => {
-    return { ...acc?.subtags ?? {}, ...current?.subtags ?? {} };
+    return { ...acc, ...current?.subtags ?? {} };
   }, {});
 };
 

package/utils/tests/tagValidations.test.js

@@ -498,6 +498,27 @@ describe("getTagMapValue", () => {
           name: "233",
         },
       },
+      "key 2": {
+        name: "24",
+        subtags: {
+          tagName: "234",
+        },
+      },
+    };
+    const result = getTagMapValue(object);
+    expect(result).toEqual({ name: "233", tagName: "234", });
+  });
+  it("should return the tag map value when an object is provided but subtag is not present in one of the obj", () => {
+    const object = {
+      "key 1": {
+        name: "23",
+        subtags: {
+          name: "233",
+        },
+      },
+      "key 2": {
+        name: "24",
+      },
     };
     const result = getTagMapValue(object);
     expect(result).toEqual({ name: "233" });

package/v2Containers/Email/index.js

@@ -199,9 +199,9 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         this.setState({isDragDrop: true});
       }
       if (this.props.params.id) {
-        this.props.actions.getCmsSetting(BEE_PLUGIN, this.props.Templates.BEETemplate.versions.base.drag_drop_id, 'open', undefined, isBEESupport, isBEEAppEnable);
+        this.props.actions.getCmsSetting(BEE_PLUGIN, this.props.Templates.BEETemplate._id, 'open', undefined, isBEESupport, isBEEAppEnable);
       } else if (this.props.location.query.module !== "library" || (this.props.location.query.module === "library" && !this.props.templateData)) {
-        this.props.actions.getCmsSetting(BEE_PLUGIN, this.props.Templates.BEETemplate.versions.base.drag_drop_id, 'create', undefined, isBEESupport, isBEEAppEnable);
+        this.props.actions.getCmsSetting(BEE_PLUGIN, this.props.Templates.BEETemplate._id, 'create', undefined, isBEESupport, isBEEAppEnable);
       }
     }
     this.setState({ content: (this.props.Templates.selectedEmailLayout ? this.props.Templates.selectedEmailLayout : ''), formData});