Skip to content

Commit e09d991

Browse files
Fixed NGF update issue in import setup
1 parent 3ce10fc commit e09d991

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

packages/contentstack-import/src/import/modules/base-class.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,11 +323,12 @@ export default abstract class BaseClass {
323323
case 'create-gfs':
324324
return this.stack.globalField({api_version: '3.2'}).create(apiData).then(onSuccess).catch(onReject);
325325
case 'update-gfs':
326+
let globalFieldUid = apiData.uid ?? apiData.global_field?.uid;
326327
return this.stack
327-
.globalField(apiData.uid)
328+
.globalField(globalFieldUid, {api_version: '3.2'})
328329
.fetch()
329330
.then(async (response) => {
330-
response.parent = apiData;
331+
response.parent = apiData?.uid ? apiData : apiData.global_field;
331332
await response.update().then(onSuccess).catch(onReject);
332333
})
333334
.catch(onReject);

packages/contentstack-import/src/import/modules/global-fields.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,19 +204,22 @@ export default class ImportGlobalFields extends BaseClass {
204204
}
205205

206206
async replaceGFs(): Promise<any> {
207-
const onSuccess = ({ response: globalField, apiData: { uid } = { uid: null } }: any) => {
207+
const onSuccess = ({ response: globalField, apiData }: any) => {
208+
const uid = apiData?.uid ?? apiData?.global_field?.uid ?? 'unknown';
208209
this.createdGFs.push(globalField);
209210
this.gFsUidMapper[uid] = globalField;
210211
fsUtil.writeFile(this.gFsUidMapperPath, this.gFsUidMapper);
211-
log(this.config, 'Global field ' + uid + ' replaced successfully', 'success');
212+
log(this.config, `Global field '${uid}' replaced successfully`, 'success');
212213
};
213214

214-
const onReject = ({ error, apiData: { uid } }: any) => {
215+
const onReject = ({ error, apiData }: any) => {
216+
const uid = apiData?.uid ?? apiData?.global_field?.uid ?? 'unknown';
215217
log(this.importConfig, `Global fields '${uid}' failed to replace`, 'error');
216218
log(this.importConfig, formatError(error), 'error');
217219
this.failedGFs.push({ uid });
218220
};
219221

222+
220223
await this.makeConcurrentCall(
221224
{
222225
apiContent: this.existingGFs,

0 commit comments

Comments
 (0)