Skip to content

Commit cb05dd2

Browse files
authored
Merge pull request #127 from contentstack/next
Fix: params in taxonomy export CS-43764
2 parents a5fa8dc + f22d448 commit cb05dd2

28 files changed

+1527
-67
lines changed

.talismanrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
threshold: medium
22
fileignoreconfig:
33
- filename: package-lock.json
4-
checksum: 2a2327aabd3f6eacf41a8e8bb3dd5afdab892683cfd15aac308f43c14108b824
4+
checksum: 9d0340f9359927d477fe8ab4650642c068c592be63fb817651d866849e0dbbc2
55
version: ""

lib/organization/teams/teamUsers/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ export function TeamUsers (http, data) {
6464
}
6565
}
6666
export function UsersCollection (http, data) {
67-
const obj = cloneDeep(data.teamUsers) || []
68-
const usersCollection = obj.map((user) => {
69-
return new TeamUsers(http, { userId: user })
67+
const obj = cloneDeep(data.users) || []
68+
const usersCollection = obj.map((userId) => {
69+
return new TeamUsers(http, { userId })
7070
})
7171
return usersCollection
7272
}

lib/stack/taxonomy/index.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,11 @@ export function Taxonomy (http, data = {}) {
8787
* .then((taxonomy) => console.log(taxonomy))
8888
*
8989
*/
90-
this.export = async () => {
90+
this.export = async (params = {}) => {
9191
try {
9292
const headers = {
93-
headers: { ...cloneDeep(this.stackHeaders) }
93+
headers: { ...cloneDeep(this.stackHeaders) },
94+
params
9495
}
9596
const response = await http.get(`${this.urlPath}/export`, headers)
9697
if (response.data) {
@@ -103,7 +104,6 @@ export function Taxonomy (http, data = {}) {
103104
}
104105
}
105106

106-
107107
this.terms = (uid = '') => {
108108
const data = { stackHeaders: this.stackHeaders }
109109
data.taxonomy_uid = this.uid
@@ -183,7 +183,6 @@ export function Taxonomy (http, data = {}) {
183183
throw error(err)
184184
}
185185
}
186-
187186
}
188187
}
189188
export function TaxonomyCollection (http, data) {
@@ -201,4 +200,4 @@ export function createFormData (data) {
201200
formData.append('taxonomy', uploadStream)
202201
return formData
203202
}
204-
}
203+
}

package-lock.json

Lines changed: 26 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@contentstack/management",
3-
"version": "1.15.1",
3+
"version": "1.15.2",
44
"description": "The Content Management API is used to manage the content of your Contentstack account",
55
"main": "./dist/node/contentstack-management.js",
66
"browser": "./dist/web/contentstack-management.js",

test/api/taxonomy-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ describe('taxonomy api Test', () => {
3939
makeTaxonomy()
4040
.import(importTaxonomy)
4141
.then((taxonomyResponse) => {
42-
expect(taxonomyResponse.name).to.be.equal("name")
42+
expect(taxonomyResponse.name).to.be.equal('name')
4343
done()
4444
})
4545
.catch(done)
4646
})
4747

4848
it('Export taxonomy', done => {
4949
makeTaxonomy(taxonomyUID)
50-
.export()
50+
.export({})
5151
.then((taxonomyResponse) => {
5252
expect(taxonomyResponse.uid).to.be.equal(taxonomyUID)
5353
expect(taxonomyResponse.name).to.be.not.equal(null)
Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+
import { expect } from 'chai'
2+
import { describe, it, setup } from 'mocha'
3+
import { jsonReader } from '../utility/fileOperations/readwrite.js'
4+
import { createManagementToken, createManagementToken2 } from '../mock/managementToken.js'
5+
import { contentstackClient } from '../utility/ContentstackClient.js'
6+
7+
let client = {}
8+
9+
let tokenUidProd = ''
10+
let tokenUidDev = ''
11+
describe('Management Token api Test', () => {
12+
setup(() => {
13+
const user = jsonReader('loggedinuser.json')
14+
client = contentstackClient(user.authtoken)
15+
})
16+
17+
it('should add a Management Token', done => {
18+
makeManagementToken()
19+
.create(createManagementToken)
20+
.then((token) => {
21+
tokenUidDev = token.uid
22+
expect(token.name).to.be.equal(createManagementToken.token.name)
23+
expect(token.description).to.be.equal(createManagementToken.token.description)
24+
expect(token.scope[0].module).to.be.equal(createManagementToken.token.scope[0].module)
25+
expect(token.uid).to.be.not.equal(null)
26+
done()
27+
})
28+
.catch(done)
29+
})
30+
31+
it('should add a Management Token for production', done => {
32+
makeManagementToken()
33+
.create(createManagementToken2)
34+
.then((token) => {
35+
tokenUidProd = token.uid
36+
expect(token.name).to.be.equal(createManagementToken2.token.name)
37+
expect(token.description).to.be.equal(createManagementToken2.token.description)
38+
expect(token.scope[0].module).to.be.equal(createManagementToken2.token.scope[0].module)
39+
expect(token.uid).to.be.not.equal(null)
40+
done()
41+
})
42+
.catch(done)
43+
})
44+
45+
it('should get a Management Token from uid', done => {
46+
makeManagementToken(tokenUidProd)
47+
.fetch()
48+
.then((token) => {
49+
expect(token.name).to.be.equal(createManagementToken2.token.name)
50+
expect(token.description).to.be.equal(createManagementToken2.token.description)
51+
expect(token.scope[0].module).to.be.equal(createManagementToken2.token.scope[0].module)
52+
expect(token.uid).to.be.not.equal(null)
53+
done()
54+
})
55+
.catch(done)
56+
})
57+
58+
it('should query to get all Management Token', done => {
59+
makeManagementToken()
60+
.query()
61+
.find()
62+
.then((tokens) => {
63+
tokens.items.forEach((token) => {
64+
expect(token.name).to.be.not.equal(null)
65+
expect(token.description).to.be.not.equal(null)
66+
expect(token.scope[0].module).to.be.not.equal(null)
67+
expect(token.uid).to.be.not.equal(null)
68+
})
69+
done()
70+
})
71+
.catch(done)
72+
})
73+
74+
it('should query to get a Management Token from name', done => {
75+
makeManagementToken()
76+
.query({ query: { name: createManagementToken.token.name } })
77+
.find()
78+
.then((tokens) => {
79+
tokens.items.forEach((token) => {
80+
expect(token.name).to.be.equal(createManagementToken.token.name)
81+
expect(token.description).to.be.equal(createManagementToken.token.description)
82+
expect(token.scope[0].module).to.be.equal(createManagementToken.token.scope[0].module)
83+
expect(token.uid).to.be.not.equal(null)
84+
})
85+
done()
86+
})
87+
.catch(done)
88+
})
89+
90+
it('should fetch and update a Management Token from uid', done => {
91+
makeManagementToken(tokenUidProd)
92+
.fetch()
93+
.then((token) => {
94+
token.name = 'Update Production Name'
95+
token.description = 'Update Production description'
96+
token.scope = createManagementToken2.token.scope
97+
return token.update()
98+
})
99+
.then((token) => {
100+
expect(token.name).to.be.equal('Update Production Name')
101+
expect(token.description).to.be.equal('Update Production description')
102+
expect(token.scope[0].module).to.be.equal(createManagementToken2.token.scope[0].module)
103+
expect(token.uid).to.be.not.equal(null)
104+
done()
105+
})
106+
.catch(done)
107+
})
108+
109+
it('should update a Management Token from uid', done => {
110+
const token = makeManagementToken(tokenUidProd)
111+
Object.assign(token, createManagementToken2.token)
112+
token.update()
113+
.then((token) => {
114+
expect(token.name).to.be.equal(createManagementToken2.token.name)
115+
expect(token.description).to.be.equal(createManagementToken2.token.description)
116+
expect(token.scope[0].module).to.be.equal(createManagementToken2.token.scope[0].module)
117+
expect(token.uid).to.be.not.equal(null)
118+
done()
119+
})
120+
.catch(done)
121+
})
122+
123+
it('should delete a Management Token from uid', done => {
124+
makeManagementToken(tokenUidProd)
125+
.delete()
126+
.then((data) => {
127+
expect(data.notice).to.be.equal('Management Token deleted successfully.')
128+
done()
129+
})
130+
.catch(done)
131+
})
132+
133+
it('should delete a Management Token from uid 2', done => {
134+
makeManagementToken(tokenUidDev)
135+
.delete()
136+
.then((data) => {
137+
expect(data.notice).to.be.equal('Management Token deleted successfully.')
138+
done()
139+
})
140+
.catch(done)
141+
})
142+
})
143+
144+
function makeManagementToken (uid = null) {
145+
return client.stack({ api_key: process.env.API_KEY }).managementToken(uid)
146+
}

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { expect } from 'chai'
22
import { describe, it, setup } from 'mocha'
3-
import { jsonReader } from '../utility/fileOperations/readwrite'
3+
import { jsonReader, jsonWrite } from '../utility/fileOperations/readwrite'
44
import { contentstackClient } from '../utility/ContentstackClient'
55

66
var user = {}
@@ -79,6 +79,7 @@ describe('Organization api test', () => {
7979
organization.roles()
8080
.then((roles) => {
8181
for (const i in roles.items) {
82+
jsonWrite(roles.items, 'orgRoles.json')
8283
expect(roles.items[i].uid).to.not.equal(null, 'Role uid cannot be null')
8384
expect(roles.items[i].name).to.not.equal(null, 'Role name cannot be null')
8485
expect(roles.items[i].org_uid).to.be.equal(organization.uid, 'Role org_uid not match')
@@ -102,7 +103,4 @@ describe('Organization api test', () => {
102103
})
103104
.catch(done)
104105
})
105-
106-
// addUser
107-
// Resend invitation
108106
})

0 commit comments

Comments
 (0)