Merge branch 'development' into feat/dx-3127

Author: harshithad0703

.gitignore

@@ -67,4 +67,5 @@ tsconfig.json
 .next
 .dccache
 dist
-jsdocs
+jsdocs
+.early.coverage

CHANGELOG.md

@@ -1,4 +1,7 @@
 # Changelog
+## [v1.21.8](https://github.com/contentstack/contentstack-management-javascript/tree/v1.21.8) (2025-07-07)
+ - Fix
+   - Fixed branch header conflits
 ## [v1.21.7](https://github.com/contentstack/contentstack-management-javascript/tree/v1.21.7) (2025-06-30)
  - Fix
    - Fixed Request-URI Too Large error

lib/entity.js

@@ -313,7 +313,6 @@ export const move = (http, type, force = false, params = {}) => {
     try {
       let updateData = {}
       const json = cloneDeep(this)
-      delete json.parent_uid
       if (type) {
         updateData[type] = json
       } else {
@@ -328,7 +327,7 @@ export const move = (http, type, force = false, params = {}) => {
       if (force === true) {
         headers.params.force = true
       }
-      const response = await http.put(`${this.urlPath}/move`, updateData, headers)
+      const response = await http.put(`${this.urlPath}/move`, param, headers)
       if (response.data) {
         return new this.constructor(http, parseData(response, this.stackHeaders, this.content_type_uid, this.taxonomy_uid, http))
       } else {

lib/stack/index.js

@@ -168,8 +168,8 @@ export function Stack (http, data) {
     this.globalField = (uidOrOptions = null, option = {}) => {
       let globalFieldUid = null
       let apiVersion = '3.0'
-      let branch = 'main'
       const stackHeaders = { ...this.stackHeaders }
+      let branch = stackHeaders.branch || http.defaults.headers.branch || 'main'
       if (typeof uidOrOptions === 'object' && uidOrOptions !== null) {
         option = uidOrOptions
       } else {

test/sanity-check/api/terms-test.js

@@ -135,13 +135,14 @@ describe('Terms API Test', () => {
   })
 
   it('should move the term to parent uid passed', done => {
-    makeTerms(taxonomy.uid, childTerm2.term.uid).fetch()
+    const term = {
+      parent_uid: 'term_test_child1',
+      order: 1
+    }
+    makeTerms(taxonomy.uid, childTerm2.term.uid).move({ term, force: true })
       .then(async (term) => {
-        term.parent_uid = null
-        const moveTerm = await term.move({ force: true })
-        expect(moveTerm.parent_uid).to.be.equal(null)
+        expect(term.parent_uid).to.not.equal(null)
         done()
-        return moveTerm
       })
       .catch(done)
   })