@contentstack/cli-cm-import 0.1.1-beta.17 → 0.1.1-beta.18

package/README.md

@@ -34,7 +34,7 @@ $ npm install -g @contentstack/cli-cm-import
 $ csdx COMMAND
 running command...
 $ csdx (-v|--version|version)
-@contentstack/cli-cm-import/0.1.1-beta.17 linux-x64 node-v16.14.2
+@contentstack/cli-cm-import/0.1.1-beta.18 linux-x64 node-v16.14.2
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -80,5 +80,5 @@ EXAMPLES
   csdx cm:import -A -B <branch name>
 ```
 
-_See code: [src/commands/cm/import.js](https://github.com/contentstack/cli/blob/v0.1.1-beta.17/packages/contentstack-import/src/commands/cm/import.js)_
+_See code: [src/commands/cm/import.js](https://github.com/contentstack/cli/blob/v0.1.1-beta.18/packages/contentstack-import/src/commands/cm/import.js)_
 <!-- commandsstop -->

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"0.1.1-beta.17","commands":{"cm:import":{"id":"cm:import","description":"Import script for importing the content into new stack\n...\nOnce you export content from the source stack, import it to your destination stack by using the cm:import command.\n","pluginName":"@contentstack/cli-cm-import","pluginType":"core","aliases":[],"examples":["csdx cm:import -A","csdx cm:import -A -s <stack_ApiKey> -d <path/of/export/destination/dir>","csdx cm:import -A -c <path/of/config/dir>","csdx cm:import -A -m <single module name>","csdx cm:import -A -m <single module name> -b <backup dir>","csdx cm:import -a <management_token_alias>","csdx cm:import -a <management_token_alias> -d <path/of/export/destination/dir>","csdx cm:import -a <management_token_alias> -c <path/of/config/file>","csdx cm:import -A -m <single module name>","csdx cm:import -A -B <branch name>"],"flags":{"config":{"name":"config","type":"option","char":"c","description":"[optional] path of config file"},"stack-uid":{"name":"stack-uid","type":"option","char":"s","description":"API key of the target stack"},"data":{"name":"data","type":"option","char":"d","description":"path and location where data is stored"},"management-token-alias":{"name":"management-token-alias","type":"option","char":"a","description":"alias of the management token"},"auth-token":{"name":"auth-token","type":"boolean","char":"A","description":"to use auth token","allowNo":false},"module":{"name":"module","type":"option","char":"m","description":"[optional] specific module name"},"backup-dir":{"name":"backup-dir","type":"option","char":"b","description":"[optional] backup directory name when using specific module"},"branch":{"name":"branch","type":"option","char":"B","description":"[optional] branch name"}},"args":[]}}}
+{"version":"0.1.1-beta.18","commands":{"cm:import":{"id":"cm:import","description":"Import script for importing the content into new stack\n...\nOnce you export content from the source stack, import it to your destination stack by using the cm:import command.\n","pluginName":"@contentstack/cli-cm-import","pluginType":"core","aliases":[],"examples":["csdx cm:import -A","csdx cm:import -A -s <stack_ApiKey> -d <path/of/export/destination/dir>","csdx cm:import -A -c <path/of/config/dir>","csdx cm:import -A -m <single module name>","csdx cm:import -A -m <single module name> -b <backup dir>","csdx cm:import -a <management_token_alias>","csdx cm:import -a <management_token_alias> -d <path/of/export/destination/dir>","csdx cm:import -a <management_token_alias> -c <path/of/config/file>","csdx cm:import -A -m <single module name>","csdx cm:import -A -B <branch name>"],"flags":{"config":{"name":"config","type":"option","char":"c","description":"[optional] path of config file"},"stack-uid":{"name":"stack-uid","type":"option","char":"s","description":"API key of the target stack"},"data":{"name":"data","type":"option","char":"d","description":"path and location where data is stored"},"management-token-alias":{"name":"management-token-alias","type":"option","char":"a","description":"alias of the management token"},"auth-token":{"name":"auth-token","type":"boolean","char":"A","description":"to use auth token","allowNo":false},"module":{"name":"module","type":"option","char":"m","description":"[optional] specific module name"},"backup-dir":{"name":"backup-dir","type":"option","char":"b","description":"[optional] backup directory name when using specific module"},"branch":{"name":"branch","type":"option","char":"B","description":"[optional] branch name"}},"args":[]}}}

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@contentstack/cli-cm-import",
 	"description": "Contentstack CLI plugin to import content into stack",
-	"version": "0.1.1-beta.17",
+	"version": "0.1.1-beta.18",
 	"author": "Contentstack",
 	"bugs": "https://github.com/contentstack/cli/issues",
 	"dependencies": {

package/src/commands/cm/import.js

@@ -38,8 +38,8 @@ class ImportCommand extends Command {
             moduleName,
             host,
             _authToken,
-            branchName,
-            backupdir
+            backupdir,
+            branchName
           )
           .then(() => {
             return resolve()
@@ -51,8 +51,8 @@ class ImportCommand extends Command {
             moduleName,
             host,
             _authToken,
-            branchName,
-            backupdir
+            backupdir,
+            branchName
           )
           .then(() => {
             return resolve()
@@ -63,8 +63,8 @@ class ImportCommand extends Command {
             moduleName,
             host,
             _authToken,
-            branchName,
-            backupdir
+            backupdir,
+            branchName
           )
           .then(() => {
             return resolve()
@@ -80,8 +80,8 @@ class ImportCommand extends Command {
           _authToken,
           moduleName,
           host,
-          branchName,
-          backupdir
+          backupdir,
+          branchName
         )
         .then(() => {
           return resolve()

package/src/lib/import/assets.js

@@ -376,6 +376,7 @@ importAssets.prototype = {
           branch[parent_uid][coll[j].uid] = {}
           coll.splice(j, 1);
           self.findBranches(branch[parent_uid], coll)
+          --j
         }
       }
     }

package/src/lib/import/entries.js

@@ -9,7 +9,6 @@ const path = require('path')
 const _ = require('lodash')
 const mkdirp = require('mkdirp')
 const chalk = require('chalk')
-const crypto = require('crypto')
 
 const helper = require('../util/fs')
 const {addlogs} = require('../util/log')
@@ -117,7 +116,7 @@ importEntries.prototype = {
         }
       }
 
-      // Step 1: Removes filed rules from content type
+      // Step 1: Removes field rules from content type
       // This allows to handle cases like self references and circular reference
       // if mandatory reference fields are not filed in entries then avoids the error
       // Also remove field visibility rules
@@ -210,15 +209,10 @@ importEntries.prototype = {
               if (eUid) {
 
                 // check ctUid in self.ctJsonRte array, if ct exists there... only then remove entry references for json rte
-                // also with json rte, api creates the json-rte field with the same uid as passed in the payload. So use the node's inbuilt
-                // crypto module to generate a random uid and populate the json rte data
-                // https://www.kindacode.com/article/how-to-easily-generate-a-random-string-in-node-js/
+                // also with json rte, api creates the json-rte field with the same uid as passed in the payload.
 
-                // while creating entries with json-rte field, the api does not create fresh uids for the json-rte field
-                // and its subsequent children. If the data is passed without a uid, then the fields aren't created. So, I'll
-                // generate the uids for now, and will come up with a better solution later
                 if (self.ctJsonRte.indexOf(ctUid) > -1) {
-                  entries[eUid] = self.generateUidsForJsonRteFields(entries[eUid], self.ctSchemas[ctUid].schema)
+                  entries[eUid] = self.removeUidsFromJsonRteFields(entries[eUid], self.ctSchemas[ctUid].schema)
                 }
 
                 // remove entry references from json-rte fields
@@ -251,7 +245,7 @@ importEntries.prototype = {
                   }) + ' as it is already created'), 'success')
                   self.success[ctUid] = createdEntries[eUid]
                   // if its a non-master language, i.e. the entry isn't present in the master language
-                  if (lang !== masterLanguage) {
+                  if (lang !== masterLanguage.code) {
                     self.uniqueUids[eUid] = self.uniqueUids[eUid] || {}
                     if (self.uniqueUids[eUid].locales) {
                       self.uniqueUids[eUid].locales.push(lang)
@@ -280,7 +274,7 @@ importEntries.prototype = {
                       self.mappedUids[eUid] = entryResponse.uid
                       createdEntries = entryResponse
                       // if its a non-master language, i.e. the entry isn't present in the master language
-                      if (lang !== masterLanguage) {
+                      if (lang !== masterLanguage.code) {
                         self.uniqueUids[eUid] = self.uniqueUids[eUid] || {}
                         if (self.uniqueUids[eUid].locales) {
                           self.uniqueUids[eUid].locales.push(lang)
@@ -303,7 +297,7 @@ importEntries.prototype = {
                   })
                 }
                 delete requestObject.json.entry.publish_details
-                return client.stack({api_key: config.target_stack, management_token: config.management_token}).contentType(ctUid).entry().create(requestObject.json)
+                return client.stack({api_key: config.target_stack, management_token: config.management_token}).contentType(ctUid).entry().create(requestObject.json, {locale: lang})
                 .then(async entryResponse => {
                   self.success[ctUid] = self.success[ctUid] || []
                   self.success[ctUid].push(entries[eUid])
@@ -311,7 +305,7 @@ importEntries.prototype = {
                     self.mappedUids[eUid] = entryResponse.uid
                     createdEntries = entryResponse
                     // if its a non-master language, i.e. the entry isn't present in the master language
-                    if (lang !== masterLanguage) {
+                    if (lang !== masterLanguage.code) {
                       self.uniqueUids[eUid] = self.uniqueUids[eUid] || {}
                       if (self.uniqueUids[eUid].locales) {
                         self.uniqueUids[eUid].locales.push(lang)
@@ -445,7 +439,6 @@ importEntries.prototype = {
         // map failed reference uids @mapper/language/unmapped-uids.json
         let refUidMapperPath = path.join(entryMapperPath, lang)
 
-        // add entry references to JSON RTE fields
         entries = _.map(entries, function (entry) {
           try {
             let uid = entry.uid
@@ -453,7 +446,8 @@ importEntries.prototype = {
 
             // restores json rte entry refs if they exist
             if (self.ctJsonRte.indexOf(ctUid) > -1) {
-              updatedEntry = self.restoreJsonRteEntryRefs(entry, sourceStackEntries[self.mappedUids[entry.uid]], schema)
+              // the entries stored in eSuccessFilePath, have the same uids as the entries from source data
+              updatedEntry = self.restoreJsonRteEntryRefs(entry, sourceStackEntries[entry.uid], schema.schema)
             } else {
               updatedEntry = entry
             }
@@ -902,7 +896,7 @@ importEntries.prototype = {
       })
     })
   },
-  removeEntryRefsFromJSONRTE(entry, ctSchema) {
+  removeEntryRefsFromJSONRTE: function(entry, ctSchema) {
     for (let i = 0; i < ctSchema.length; i++) {
       switch(ctSchema[i].data_type) {
         case 'blocks': {
@@ -958,15 +952,13 @@ importEntries.prototype = {
     }
     return entry
   },
-  doEntryReferencesExist(element) { 
+  doEntryReferencesExist: function(element) { 
     // checks if the children of p element contain any references
     // only checking one level deep, not recursive
 
     if (element.length) {
       for(let i=0; i < element.length; i++) {
-        // although most data has only one level of nesting, and this case might never come up
-        // I've handled multiple level of nesting for 'p' elements
-        if(element[i].type === 'p' && element[i].children && element[i].children.length > 0) {
+        if((element[i].type === 'p' || element[i].type === 'a') && element[i].children && element[i].children.length > 0) {
           return this.doEntryReferencesExist(element[i].children)
         } else if(this.isEntryRef(element[i])) {
           return true
@@ -977,13 +969,15 @@ importEntries.prototype = {
         return true
       }
 
-      if (element.type === "p" && element.children && element.children.length > 0) {
+      if ((element.type === 'p' || element.type === 'a') && element.children && element.children.length > 0) {
         return this.doEntryReferencesExist(element.children)
       }
     }
     return false
   },
-  restoreJsonRteEntryRefs(entry, sourceStackEntry, ctSchema) {
+  restoreJsonRteEntryRefs: function(entry, sourceStackEntry, ctSchema) {
+    let mappedAssetUids = helper.readFile(mappedAssetUidPath) || {}
+    let mappedAssetUrls = helper.readFile(mappedAssetUrlPath) || {}
     for (let i = 0; i < ctSchema.length; i++) {
       switch (ctSchema[i].data_type) {
         case 'blocks': {
@@ -1020,17 +1014,56 @@ importEntries.prototype = {
           if (entry[ctSchema[i].uid] && ctSchema[i].field_metadata.rich_text_type) {
             if (ctSchema[i].multiple) {
               entry[ctSchema[i].uid] = entry[ctSchema[i].uid].map((field, index) => {
-                field.children = [
-                  ...field.children, 
-                  ...sourceStackEntry[ctSchema[i].uid][index].children.filter(e => this.doEntryReferencesExist(e))
-                ]
+
+                // i am facing a Maximum call stack exceeded issue, 
+                // probably because of this loop operation
+
+                let entryRefs = sourceStackEntry[ctSchema[i].uid][index].children
+                .map((e, index) => {
+                  return { index: index, value: e }
+                })
+                .filter(e => this.doEntryReferencesExist(e.value))
+                .map(e => {
+                  // commenting the line below resolved the maximum call stack exceeded issue
+                  // e.value = this.setDirtyTrue(e.value)
+                  this.setDirtyTrue(e.value)
+                  return e
+                })
+                .map(e => {
+                  // commenting the line below resolved the maximum call stack exceeded issue
+                  // e.value = this.resolveAssetRefsInEntryRefsForJsonRte(e, mappedAssetUids, mappedAssetUrls)
+                  this.resolveAssetRefsInEntryRefsForJsonRte(e.value, mappedAssetUids, mappedAssetUrls)
+                  return e
+                })
+
+                if(entryRefs.length > 0) {
+                  entryRefs.forEach(element => {
+                    field.children.splice(element.index, 0, element.value)
+                  })
+                }
                 return field
               })
             } else {
-              entry[ctSchema[i].uid].children = [
-                ...entry[ctSchema[i].uid].children, 
-                ...sourceStackEntry[ctSchema[i].uid].children.filter(e => this.doEntryReferencesExist(e)),
-              ]
+
+              let entryRefs = sourceStackEntry[ctSchema[i].uid].children
+              .map((e, index) => {
+                return { index: index, value: e }
+              })
+              .filter(e => this.doEntryReferencesExist(e.value))
+              .map(e => {
+                this.setDirtyTrue(e.value)
+                return e
+              })
+              .map(e => {
+                this.resolveAssetRefsInEntryRefsForJsonRte(e.value, mappedAssetUids, mappedAssetUrls)
+                return e
+              })
+
+              if(entryRefs.length > 0) {
+                entryRefs.forEach(element => {
+                  entry[ctSchema[i].uid].children.splice(element.index, 0, element.value)                  
+                })
+              }
             }
           }
           break;
@@ -1038,25 +1071,11 @@ importEntries.prototype = {
       }
     }
     return entry
-    //------------------------------------------------------------------------------------------------------------
-    // if (Object.keys(self.jsonRteEntryRefs).indexOf(entry.uid) > -1) {
-    //   Object.keys(self.jsonRteEntryRefs[entry.uid]).forEach(jsonRteFieldUid => {
-    //     if (self.jsonRteEntryRefs[entry.uid][jsonRteFieldUid].length) { // handles when json_rte is multiple
-    //       entry[jsonRteFieldUid] = entry[jsonRteFieldUid].map((field, index) => {
-    //         field.children = [...field.children, ...self.jsonRteEntryRefs[entry.uid][jsonRteFieldUid][index]]
-    //         return field
-    //       })
-    //     } else {
-    //       entry[jsonRteFieldUid].children = [...entry[jsonRteFieldUid].children, ...self.jsonRteEntryRefs[entry.uid][jsonRteFieldUid].children]
-    //     }
-    //   })
-    // }
-    // return entry
   },
-  isEntryRef(element) {
+  isEntryRef: function(element) {
     return element.type === "reference" && element.attrs.type === "entry"
   },
-  generateUidsForJsonRteFields(entry, ctSchema) {
+  removeUidsFromJsonRteFields: function(entry, ctSchema) {
     for (let i = 0; i < ctSchema.length; i++) {
       switch (ctSchema[i].data_type) {
         case 'blocks': {
@@ -1065,7 +1084,7 @@ importEntries.prototype = {
               entry[ctSchema[i].uid] = entry[ctSchema[i].uid].map(e => {
                 let key = Object.keys(e).pop()
                 let subBlock = ctSchema[i].blocks.filter(e => e.uid === key).pop()
-                e[key] = this.generateUidsForJsonRteFields(e[key], subBlock.schema)
+                e[key] = this.removeUidsFromJsonRteFields(e[key], subBlock.schema)
                 return e
               })
             }
@@ -1077,11 +1096,11 @@ importEntries.prototype = {
           if (entry[ctSchema[i].uid]) {
             if (ctSchema[i].multiple) {
               entry[ctSchema[i].uid] = entry[ctSchema[i].uid].map(e => {
-                e = this.generateUidsForJsonRteFields(e, ctSchema[i].schema)
+                e = this.removeUidsFromJsonRteFields(e, ctSchema[i].schema)
                 return e
               })
             } else {
-              entry[ctSchema[i].uid] = this.generateUidsForJsonRteFields(entry[ctSchema[i].uid], ctSchema[i].schema)
+              entry[ctSchema[i].uid] = this.removeUidsFromJsonRteFields(entry[ctSchema[i].uid], ctSchema[i].schema)
             }
           }
           break;
@@ -1090,13 +1109,15 @@ importEntries.prototype = {
           if (entry[ctSchema[i].uid] && ctSchema[i].field_metadata.rich_text_type) {
             if (ctSchema[i].multiple) {
               entry[ctSchema[i].uid] = entry[ctSchema[i].uid].map(jsonRteData => {
-                jsonRteData.uid = this.generateUid()
-                jsonRteData.children = jsonRteData.children.map(child => this.populateChildrenWithUids(child))
+                delete jsonRteData.uid // remove uid
+                jsonRteData.attrs.dirty = true
+                jsonRteData.children = jsonRteData.children.map(child => this.removeUidsFromChildren(child))
                 return jsonRteData
               })
             } else {
-              entry[ctSchema[i].uid].uid = this.generateUid()
-              entry[ctSchema[i].uid].children = entry[ctSchema[i].uid].children.map(child => this.populateChildrenWithUids(child))
+              delete entry[ctSchema[i].uid].uid // remove uid
+              entry[ctSchema[i].uid].attrs.dirty = true
+              entry[ctSchema[i].uid].children = entry[ctSchema[i].uid].children.map(child => this.removeUidsFromChildren(child))
             }
           }
           break;
@@ -1105,29 +1126,70 @@ importEntries.prototype = {
     }
     return entry
   },
-  populateChildrenWithUids(children) {
+  removeUidsFromChildren: function(children) {
     if (children.length && children.length > 0) {
       return children.map(child => {
         if(child.type && child.type.length > 0) {
-          child.uid = this.generateUid()
+          delete child.uid // remove uid
+          child.attrs.dirty = true
         }
         if(child.children && child.children.length > 0) {
-          child.children = this.populateChildrenWithUids(child.children)
+          child.children = this.removeUidsFromChildren(child.children)
         }
         return child
       })
     } else {
       if (children.type && children.type.length > 0) {
-        children.uid = this.generateUid()
+        delete children.uid // remove uid
+        children.attrs.dirty = true
       }
       if (children.children && children.children.length > 0) {
-        children.children = this.populateChildrenWithUids(children.children)
+        children.children = this.removeUidsFromChildren(children.children)
       }
       return children
     }
   },
-  generateUid() {
-    return crypto.randomBytes(16).toString('hex')
+  setDirtyTrue: function(jsonRteChild) { // also removing uids in this function
+    if (jsonRteChild.type) {
+      jsonRteChild.attrs['dirty'] = true
+      delete jsonRteChild.uid
+
+      if (jsonRteChild.children && jsonRteChild.children.length > 0) {
+        jsonRteChild.children = jsonRteChild.children.map(subElement => this.setDirtyTrue(subElement))
+      }
+    }
+    return jsonRteChild
+  },
+  resolveAssetRefsInEntryRefsForJsonRte: function(jsonRteChild, mappedAssetUids, mappedAssetUrls) {
+    
+      if (jsonRteChild.type) {
+        if (jsonRteChild.attrs.type === 'asset') {
+          let assetUrl
+          if(mappedAssetUids[jsonRteChild.attrs['asset-uid']]) {
+            jsonRteChild.attrs['asset-uid'] = mappedAssetUids[jsonRteChild.attrs['asset-uid']]
+          }
+
+          if (jsonRteChild.attrs['display-type'] !== 'link') {
+            assetUrl = jsonRteChild.attrs['asset-link']
+          } else {
+            assetUrl = jsonRteChild.attrs['href']
+          }
+
+          if(mappedAssetUrls[assetUrl]) {
+            if (jsonRteChild.attrs['display-type'] !== 'link') {
+              jsonRteChild.attrs['asset-link'] = mappedAssetUrls[assetUrl]
+            } else {
+              jsonRteChild.attrs['href'] = mappedAssetUrls[assetUrl]
+            }
+          }
+        }
+
+        if (jsonRteChild.children && jsonRteChild.children.length > 0) {
+          jsonRteChild.children = jsonRteChild.children.map(subElement => this.resolveAssetRefsInEntryRefsForJsonRte(subElement, mappedAssetUids, mappedAssetUrls))
+        }
+      }
+
+      return jsonRteChild
   }
 }
 

package/src/lib/util/lookupReplaceAssets.js

@@ -54,9 +54,7 @@ module.exports = function (data, mappedAssetUids, mappedAssetUrls, assetUidMappe
       if (schema[i].data_type === "json" && schema[i].field_metadata.rich_text_type) {
         parent.push(schema[i].uid)
         // findFileUrls(schema[i], entry, assetUrls)
-        if (assetUids.length === 0) {
-          findAssetIdsFromJsonRte(data.entry, data.content_type.schema)
-        }
+        findAssetIdsFromJsonRte(data.entry, data.content_type.schema)
         // maybe only one of these checks would be enough
         parent.pop()
       }
@@ -106,11 +104,12 @@ module.exports = function (data, mappedAssetUids, mappedAssetUrls, assetUidMappe
       }
     }
   }
-
+  
   function gatherJsonRteAssetIds(jsonRteData) {
     jsonRteData.children.forEach(element => {
       if (element.type) {
         switch (element.type) {
+          case 'a':
           case 'p': {
             if (element.children && element.children.length > 0) {
               gatherJsonRteAssetIds(element)
@@ -119,8 +118,25 @@ module.exports = function (data, mappedAssetUids, mappedAssetUrls, assetUidMappe
           }
           case 'reference': {
             if (Object.keys(element.attrs).length > 0 && element.attrs.type === "asset") {
-              assetUids.push(element.attrs['asset-uid'])
-              assetUrls.push(element.attrs['asset-link'])
+              if (assetUids.indexOf(element.attrs['asset-uid']) === -1) {
+                assetUids.push(element.attrs['asset-uid'])
+              }
+              // assets references inserted as link inside entry reference inserted as link did not have asset-link property
+              // instead it had an 'href' property. I haven't seen 'asset-link' and 'href' together yet
+              // writing this condition assuming that this never occurs, need to confirm
+              // (element.attrs['asset-link']) ? assetUrls.push(element.attrs['asset-link']) : assetUrls.push(element.attrs['asset-link'])
+              if (element.attrs['asset-link']) {
+                if (assetUrls.indexOf(element.attrs['asset-link']) === -1) {
+                  assetUrls.push(element.attrs['asset-link'])
+                }
+              } else if (element.attrs['href']) {
+                if (assetUrls.indexOf(element.attrs['href']) === -1) {
+                  assetUrls.push(element.attrs['href'])
+                }
+              }
+            }
+            if (element.children && element.children.length > 0) {
+              gatherJsonRteAssetIds(element)
             }
             break;
           }

package/src/lib/util/lookupReplaceEntries.js

@@ -25,6 +25,7 @@ module.exports = function (data, mappedUids, uidMapperPath) {
     jsonRteData.children.forEach(element => {
       if (element.type) {
         switch (element.type) {
+          case 'a':
           case 'p': {
             if (element.children && element.children.length > 0) {
               gatherJsonRteEntryIds(element)
@@ -33,7 +34,12 @@ module.exports = function (data, mappedUids, uidMapperPath) {
           }
           case 'reference': {
             if (Object.keys(element.attrs).length > 0 && element.attrs.type === "entry") {
-              uids.push(element.attrs['entry-uid'])
+              if (uids.indexOf(element.attrs['entry-uid']) === -1) {
+                uids.push(element.attrs['entry-uid'])
+              }
+            }
+            if (element.children && element.children.length > 0) {
+              gatherJsonRteEntryIds(element)
             }
             break;
           }
@@ -104,6 +110,7 @@ module.exports = function (data, mappedUids, uidMapperPath) {
           parent.pop()
         }
         break
+      case 'global_field':
       case 'group':
         parent.push(schema[i].uid)
         find(schema[i].schema, entry)
@@ -120,9 +127,7 @@ module.exports = function (data, mappedUids, uidMapperPath) {
         break
       case 'json':
         if (schema[i].field_metadata.rich_text_type) {
-          if (uids.length === 0) {
-            findEntryIdsFromJsonRte(data.entry, data.content_type.schema)
-          }
+          findEntryIdsFromJsonRte(data.entry, data.content_type.schema)
         }
         break
       }

package/src/lib/util/supress-mandatory-fields.js

@@ -6,7 +6,7 @@
 
 var supress = module.exports = function (schema, flag) {
   for (var i in schema) {
-    if (schema[i].data_type === 'group') {
+    if (schema[i].data_type === 'group' || schema[i].data_type === 'global_field') {
       supress(schema[i].schema, flag);
     } else if (schema[i].data_type === 'blocks') {
       for (var block in schema[i].blocks) {