Skip to content

Commit fefca94

Browse files
rohitmishra209rohitmishra209
authored
Merge pull request #50 from contentstack/hotfix0.1.2
hotfix
2 parents fe2b7e1 + b62e871 commit fefca94

8 files changed

Lines changed: 9 additions & 78 deletions

File tree

‎packages/contentstack-export/src/app.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ var allExport = async (config, types) => {
7171
var exportedModule = require('./lib/export/' + type)
7272
await exportedModule.start(config).then(result => {
7373
if (type === 'stack') {
74-
let master_locale = { master_locale: { code: result.master_locale } }
74+
let master_locale = { master_locale: { code: result.code } }
7575
config = _.merge(config, master_locale)
7676
}
7777
return

‎packages/contentstack-export/src/lib/export/entries.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ exportEntries.prototype.start = function (credentialConfig) {
6161
})
6262
}
6363
}
64+
apiBucket.push({
65+
content_type: content_type.uid,
66+
locale: config.master_locale.code,
67+
})
6468
})
6569
return Promise.map(apiBucket, function (apiDetails) {
6670
return self.getEntries(apiDetails)

‎packages/contentstack-export/src/lib/export/stack.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ExportStack.prototype.start = function (credentialConfig) {
4040
return obj
4141
}
4242
});
43-
return resolve(masterLocalObj)
43+
return resolve(masterLocalObj[0])
4444
}).catch(error => {
4545
return reject(error)
4646
})

‎packages/contentstack-export/src/lib/util/log.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ function init (_logPath, logfileName) {
9191
}
9292

9393
exports.addlogs = async (config, message, type) => {
94-
// console.log("datattaat", data)
9594
if (type !== 'error') {
9695
init(config.data, type).log(message)
9796
} else {

‎packages/contentstack-export/src/lib/util/login.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ module.exports.login = config => {
4848
.then(function () {
4949
return resolve()
5050
}).catch(error => {
51-
console.log("cdncndcndjc", error);
5251
if (error.errors.api_key) {
5352
return reject(error)
5453
}

‎packages/contentstack-import/src/app.js‎

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -98,59 +98,6 @@ let singleImport = async (moduleName, types, config) => {
9898
})
9999
}
100100

101-
// function field_rules_update(config, ctPath) {
102-
// return new Promise(function (resolve, reject) {
103-
// let client = stack.Client(config)
104-
105-
// fs.readFile(path.join(ctPath + '/field_rules_uid.json'), async (err, data) => {
106-
// if (err) {
107-
// throw err;
108-
// }
109-
// var ct_field_visibility_uid = JSON.parse(data)
110-
// let ct_files = fs.readdirSync(ctPath)
111-
// if (ct_field_visibility_uid && ct_field_visibility_uid != 'undefined') {
112-
// for (let index = 0; index < ct_field_visibility_uid.length; index++) {
113-
// if (ct_files.indexOf(ct_field_visibility_uid[index] + '.json') > -1) {
114-
// let schema = require(path.resolve(ctPath, ct_field_visibility_uid[index]))
115-
// // await field_rules_update(schema)
116-
// let fieldRuleLength = schema.field_rules.length
117-
// for (let k = 0; k < fieldRuleLength; k++) {
118-
// let fieldRuleConditionLength = schema.field_rules[k].conditions.length
119-
// for (let i = 0; i < fieldRuleConditionLength; i++) {
120-
// if (schema.field_rules[k].conditions[i].operand_field === 'reference') {
121-
// let entryMapperPath = path.resolve(config.data, 'mapper', 'entries')
122-
// let entryUidMapperPath = path.join(entryMapperPath, 'uid-mapping.json')
123-
// let fieldRulesValue = schema.field_rules[k].conditions[i].value
124-
// let fieldRulesArray = fieldRulesValue.split('.')
125-
// let updatedValue = []
126-
// for (let j = 0; j < fieldRulesArray.length; j++) {
127-
// let splitedFieldRulesValue = fieldRulesArray[j]
128-
// let oldUid = helper.readFile(path.join(entryUidMapperPath))
129-
// if (oldUid.hasOwnProperty(splitedFieldRulesValue)) {
130-
// updatedValue.push(oldUid[splitedFieldRulesValue])
131-
// } else {
132-
// updatedValue.push(fieldRulesArray[j])
133-
// }
134-
// }
135-
// schema.field_rules[k].conditions[i].value = updatedValue.join('.')
136-
// }
137-
// }
138-
// }
139-
// let ctObj = client.stack({ api_key: config.target_stack, management_token: config.management_token }).contentType(schema.uid)
140-
// Object.assign(ctObj, _.cloneDeep(schema))
141-
// ctObj.update()
142-
// .then(() => {
143-
// return resolve()
144-
// }).catch(function (error) {
145-
// return reject(error)
146-
// })
147-
// }
148-
// }
149-
// }
150-
// })
151-
// })
152-
// }
153-
154101
let allImport = async (config, types) => {
155102
return new Promise(async (resolve, reject) => {
156103
try {
@@ -175,7 +122,6 @@ let allImport = async (config, types) => {
175122
}
176123
return resolve()
177124
} catch (error) {
178-
console.log("errrorororo", error);
179125
addlogs(config, chalk.red('Failed to migrate stack: ' + config.target_stack + '. Please check error logs for more info'), 'error')
180126
addlogs(config, error, 'error')
181127
addlogs(config, 'The log for this is stored at ' + path.join(config.oldPath, 'logs', 'import'), 'error')
@@ -184,24 +130,6 @@ let allImport = async (config, types) => {
184130
})
185131
}
186132

187-
// let masterLocalDetails = async (credentialConfig) => {
188-
// let client = stack.Client(credentialConfig)
189-
// return new Promise((resolve, reject) => {
190-
// var result = client.stack({ api_key: credentialConfig.target_stack, management_token: credentialConfig.management_token }).locale().query()
191-
// result.find()
192-
// .then(response => {
193-
// var masterLocalObj = response.items.filter(obj => {
194-
// if (obj.fallback_locale === null) {
195-
// return obj
196-
// }
197-
// });
198-
// return resolve(masterLocalObj)
199-
// }).catch(error => {
200-
// return reject(error)
201-
// })
202-
// })
203-
// }
204-
205133
function createBackup(backupDirPath, config) {
206134
return new Promise((resolve, reject) => {
207135
if (config.hasOwnProperty('useBackedupDir') && fs.existsSync(config.useBackedupDir)) {

‎packages/contentstack-import/src/lib/import/entries.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ let uniqueUidMapperPath
3636
let modifiedSchemaPath
3737
let createdEntriesWOUidPath
3838
let failedWOPath
39+
let masterLanguage
3940

40-
let masterLanguage = config.master_locale
4141
let skipFiles = ['__master.json', '__priority.json', 'schema.json']
4242
let entryBatchLimit = config.rateLimit || 10
4343

@@ -99,6 +99,7 @@ importEntries.prototype = {
9999
let self = this
100100
config = credentialConfig
101101
client = stack.Client(config)
102+
masterLanguage = config.master_locale
102103
addlogs(config, 'Migrating entries', 'success')
103104
let languages = helper.readFile(lPath)
104105
return new Promise(function (resolve, reject) {

‎packages/contentstack-import/src/lib/util/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ exports.masterLocalDetails = function(credentialConfig) {
118118
return obj
119119
}
120120
});
121-
return resolve(masterLocalObj)
121+
return resolve(masterLocalObj[0])
122122
}).catch(error => {
123123
return reject(error)
124124
})

0 commit comments

Comments
 (0)