Back Merge

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 
 
+## [1.3.12](https://github.com/contentstack/contentstack-utils-javascript/tree/v1.3.12) (2024-09-30)
+ - Fix: addTags methods changes for Variants
+
 ## [1.3.11](https://github.com/contentstack/contentstack-utils-javascript/tree/v1.3.11) (2024-08-21)
  - Fix: Reference to HTML fixed to support assets that are referenced
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/utils",
-  "version": "1.3.11",
+  "version": "1.3.12",
   "description": "Contentstack utilities for Javascript",
   "main": "dist/index.es.js",
   "types": "dist/types/index.d.ts",

src/entry-editable.ts

@@ -2,9 +2,9 @@
 
   export function addTags(entry: EntryModel, contentTypeUid: string, tagsAsObject: boolean, locale: string = 'en-us') : void {  
       if (entry) { 
-          const appliedVariants = entry._applied_variants || null;
-          entry.$ = getTag(entry, `${contentTypeUid}.${entry.uid}.${locale}`, tagsAsObject, locale, {_applied_variants: appliedVariants, shouldApplyVariant: !!appliedVariants, metaKey: ''})      }  
-  }
+          const appliedVariants = entry._applied_variants || entry?.system?.applied_variants || null;
+         entry.$ = getTag(entry, `${contentTypeUid}.${entry.uid}.${locale}`, tagsAsObject, locale, {_applied_variants: appliedVariants, shouldApplyVariant: !!appliedVariants, metaKey: ''})      }  
+        }
 
   function getTag(content: object, prefix: string, tagsAsObject: boolean, locale: string, appliedVariants: {_applied_variants:{[key: string]: any}, shouldApplyVariant: boolean, metaKey: string}): object {
       const tags: any = {}
@@ -12,8 +12,8 @@
       Object.entries(content).forEach(([key, value]) => {      
           if (key === '$') return
           let metaUID = value && typeof value === 'object' && value._metadata && value._metadata.uid ? value._metadata.uid : '';
           let updatedMetakey = appliedVariants.shouldApplyVariant ? `${appliedVariants.metaKey ? appliedVariants.metaKey + '.' : '' }${key}` : '';
           if(metaUID && updatedMetakey) updatedMetakey = updatedMetakey + '.' + metaUID;
           switch (typeof value) {
               case "object":
                   if (Array.isArray(value)) {
@@ -21,8 +21,8 @@
                           const childKey = `${key}__${index}`
                           const parentKey = `${key}__parent`
                           metaUID = value && typeof value === 'object' && obj._metadata && obj._metadata.uid ? obj._metadata.uid : '';
                           updatedMetakey = appliedVariants.shouldApplyVariant ? `${appliedVariants.metaKey ? appliedVariants.metaKey + '.' : '' }${key}` : '';
                           if(metaUID && updatedMetakey) updatedMetakey = updatedMetakey + '.' + metaUID;
                           /**
                            * Indexes of array are handled here
                            * {
@@ -48,7 +48,7 @@
                                *  }]
                                * }
                                */
-                              const newAppliedVariants = obj._applied_variants || _applied_variants;
+                              const newAppliedVariants = obj._applied_variants || obj?.system?.applied_variants || _applied_variants;
                               const newShouldApplyVariant = !!newAppliedVariants
                               value[index].$ = getTag(obj, `${obj._content_type_uid}.${obj.uid}.${obj.locale || locale}`, tagsAsObject, locale, {_applied_variants:newAppliedVariants, shouldApplyVariant:newShouldApplyVariant, metaKey: ""})
                           }else if (typeof obj === "object") {
@@ -110,12 +110,12 @@
   }
 
 function getTagsValue (dataValue:string, tagsAsObject: boolean, appliedVariants: {_applied_variants: {[key: string]: any}, shouldApplyVariant: boolean, metaKey: string}): any {
     if(appliedVariants.shouldApplyVariant && appliedVariants._applied_variants && appliedVariants._applied_variants[appliedVariants.metaKey]) {
         const variant = appliedVariants._applied_variants[appliedVariants.metaKey]
         // Adding v2 prefix to the cslp tag. New cslp tags are in v2 format. ex: v2:content_type_uid.entry_uid.locale.title
         const newDataValueArray = ('v2:' + dataValue).split('.');
         newDataValueArray[1] = newDataValueArray[1] + '_' + variant;
         dataValue = newDataValueArray.join('.');
     }
     if (tagsAsObject) {
         return { "data-cslp": dataValue };