Skip to content

Commit 7a89015

Browse files
aman19Kaman19K
committed
fix: summary & progress manager issue in import
1 parent 9da4a25 commit 7a89015

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1142
-1137
lines changed

‎packages/contentstack-export/src/export/modules/assets.ts‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {
2424
import config from '../../config';
2525
import { ModuleClassParams } from '../../types';
2626
import BaseClass, { CustomPromiseHandler, CustomPromiseHandlerInput } from './base-class';
27-
import { EXPORT_PROCESS_NAMES, EXPORT_MODULE_CONTEXTS, EXPORT_PROCESS_STATUS, EXPORT_MODULE_NAMES } from '../../utils';
27+
import { PROCESS_NAMES, MODULE_CONTEXTS, PROCESS_STATUS, MODULE_NAMES } from '../../utils';
2828

2929
export default class ExportAssets extends BaseClass {
3030
private assetsRootPath: string;
@@ -34,8 +34,8 @@ export default class ExportAssets extends BaseClass {
3434

3535
constructor({ exportConfig, stackAPIClient }: ModuleClassParams) {
3636
super({ exportConfig, stackAPIClient });
37-
this.exportConfig.context.module = EXPORT_MODULE_CONTEXTS.ASSETS;
38-
this.currentModuleName = EXPORT_MODULE_NAMES[EXPORT_MODULE_CONTEXTS.ASSETS];
37+
this.exportConfig.context.module = MODULE_CONTEXTS.ASSETS;
38+
this.currentModuleName = MODULE_NAMES[MODULE_CONTEXTS.ASSETS];
3939
}
4040

4141
get commonQueryParam(): Record<string, unknown> {
@@ -65,59 +65,59 @@ export default class ExportAssets extends BaseClass {
6565

6666
// Add sub-processes
6767
if (typeof assetsFolderCount === 'number' && assetsFolderCount > 0) {
68-
progress.addProcess(EXPORT_PROCESS_NAMES.ASSET_FOLDERS, assetsFolderCount);
68+
progress.addProcess(PROCESS_NAMES.ASSET_FOLDERS, assetsFolderCount);
6969
}
7070
if (typeof assetsCount === 'number' && assetsCount > 0) {
71-
progress.addProcess(EXPORT_PROCESS_NAMES.ASSET_METADATA, assetsCount);
72-
progress.addProcess(EXPORT_PROCESS_NAMES.ASSET_DOWNLOADS, assetsCount);
71+
progress.addProcess(PROCESS_NAMES.ASSET_METADATA, assetsCount);
72+
progress.addProcess(PROCESS_NAMES.ASSET_DOWNLOADS, assetsCount);
7373
}
7474

7575
try {
7676
// Process asset folders
7777
if (typeof assetsFolderCount === 'number' && assetsFolderCount > 0) {
7878
progress
79-
.startProcess(EXPORT_PROCESS_NAMES.ASSET_FOLDERS)
79+
.startProcess(PROCESS_NAMES.ASSET_FOLDERS)
8080
.updateStatus(
81-
EXPORT_PROCESS_STATUS[EXPORT_PROCESS_NAMES.ASSET_FOLDERS].FETCHING,
82-
EXPORT_PROCESS_NAMES.ASSET_FOLDERS,
81+
PROCESS_STATUS[PROCESS_NAMES.ASSET_FOLDERS].FETCHING,
82+
PROCESS_NAMES.ASSET_FOLDERS,
8383
);
8484
await this.getAssetsFolders(assetsFolderCount);
85-
progress.completeProcess(EXPORT_PROCESS_NAMES.ASSET_FOLDERS, true);
85+
progress.completeProcess(PROCESS_NAMES.ASSET_FOLDERS, true);
8686
}
8787

8888
// Process asset metadata
8989
if (typeof assetsCount === 'number' && assetsCount > 0) {
9090
progress
91-
.startProcess(EXPORT_PROCESS_NAMES.ASSET_METADATA)
91+
.startProcess(PROCESS_NAMES.ASSET_METADATA)
9292
.updateStatus(
93-
EXPORT_PROCESS_STATUS[EXPORT_PROCESS_NAMES.ASSET_METADATA].FETCHING,
94-
EXPORT_PROCESS_NAMES.ASSET_METADATA,
93+
PROCESS_STATUS[PROCESS_NAMES.ASSET_METADATA].FETCHING,
94+
PROCESS_NAMES.ASSET_METADATA,
9595
);
9696
await this.getAssets(assetsCount);
97-
progress.completeProcess(EXPORT_PROCESS_NAMES.ASSET_METADATA, true);
97+
progress.completeProcess(PROCESS_NAMES.ASSET_METADATA, true);
9898
}
9999

100100
// Get versioned assets
101101
if (!isEmpty(this.versionedAssets) && this.assetConfig.includeVersionedAssets) {
102102
log.debug('Fetching versioned assets metadata...', this.exportConfig.context);
103103
progress.updateStatus(
104-
EXPORT_PROCESS_STATUS[EXPORT_PROCESS_NAMES.ASSET_METADATA].FETCHING_VERSION,
105-
EXPORT_PROCESS_NAMES.ASSET_METADATA,
104+
PROCESS_STATUS[PROCESS_NAMES.ASSET_METADATA].FETCHING_VERSION,
105+
PROCESS_NAMES.ASSET_METADATA,
106106
);
107107
await this.getVersionedAssets();
108108
}
109109

110110
// Download all assets
111111
if (typeof assetsCount === 'number' && assetsCount > 0) {
112112
progress
113-
.startProcess(EXPORT_PROCESS_NAMES.ASSET_DOWNLOADS)
113+
.startProcess(PROCESS_NAMES.ASSET_DOWNLOADS)
114114
.updateStatus(
115-
EXPORT_PROCESS_STATUS[EXPORT_PROCESS_NAMES.ASSET_DOWNLOADS].DOWNLOADING,
116-
EXPORT_PROCESS_NAMES.ASSET_DOWNLOADS,
115+
PROCESS_STATUS[PROCESS_NAMES.ASSET_DOWNLOADS].DOWNLOADING,
116+
PROCESS_NAMES.ASSET_DOWNLOADS,
117117
);
118118
log.debug('Starting download of all assets...', this.exportConfig.context);
119119
await this.downloadAssets();
120-
progress.completeProcess(EXPORT_PROCESS_NAMES.ASSET_DOWNLOADS, true);
120+
progress.completeProcess(PROCESS_NAMES.ASSET_DOWNLOADS, true);
121121
}
122122

123123
this.completeProgress(true);
@@ -151,7 +151,7 @@ export default class ExportAssets extends BaseClass {
151151
true,
152152
`folder: ${folder.name || folder.uid}`,
153153
null,
154-
EXPORT_PROCESS_NAMES.ASSET_FOLDERS,
154+
PROCESS_NAMES.ASSET_FOLDERS,
155155
);
156156
});
157157
}
@@ -161,8 +161,8 @@ export default class ExportAssets extends BaseClass {
161161
this.progressManager?.tick(
162162
false,
163163
'asset folder',
164-
error?.message || EXPORT_PROCESS_STATUS[EXPORT_PROCESS_NAMES.ASSET_FOLDERS].FAILED,
165-
EXPORT_PROCESS_NAMES.ASSET_FOLDERS,
164+
error?.message || PROCESS_STATUS[PROCESS_NAMES.ASSET_FOLDERS].FAILED,
165+
PROCESS_NAMES.ASSET_FOLDERS,
166166
);
167167
handleAndLogError(error, { ...this.exportConfig.context });
168168
};
@@ -229,8 +229,8 @@ export default class ExportAssets extends BaseClass {
229229
this.progressManager?.tick(
230230
false,
231231
'asset',
232-
error?.message || EXPORT_PROCESS_STATUS[EXPORT_PROCESS_NAMES.ASSET_METADATA].FAILED,
233-
EXPORT_PROCESS_NAMES.ASSET_METADATA,
232+
error?.message || PROCESS_STATUS[PROCESS_NAMES.ASSET_METADATA].FAILED,
233+
PROCESS_NAMES.ASSET_METADATA,
234234
);
235235
handleAndLogError(error, { ...this.exportConfig.context }, messageHandler.parse('ASSET_QUERY_FAILED'));
236236
};
@@ -257,7 +257,7 @@ export default class ExportAssets extends BaseClass {
257257
true,
258258
`asset: ${asset.filename || asset.uid}`,
259259
null,
260-
EXPORT_PROCESS_NAMES.ASSET_METADATA,
260+
PROCESS_NAMES.ASSET_METADATA,
261261
);
262262
});
263263
}
@@ -461,7 +461,7 @@ export default class ExportAssets extends BaseClass {
461461
true,
462462
`Downloaded asset: ${asset.filename || asset.uid}`,
463463
null,
464-
EXPORT_PROCESS_NAMES.ASSET_DOWNLOADS,
464+
PROCESS_NAMES.ASSET_DOWNLOADS,
465465
);
466466
log.success(messageHandler.parse('ASSET_DOWNLOAD_SUCCESS', asset.filename, asset.uid), this.exportConfig.context);
467467
};
@@ -472,7 +472,7 @@ export default class ExportAssets extends BaseClass {
472472
false,
473473
`Failed to download asset: ${asset.filename || asset.uid}`,
474474
null,
475-
EXPORT_PROCESS_NAMES.ASSET_DOWNLOADS,
475+
PROCESS_NAMES.ASSET_DOWNLOADS,
476476
);
477477
handleAndLogError(
478478
error,

‎packages/contentstack-export/src/export/modules/content-types.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { ContentstackClient, handleAndLogError, messageHandler, log, sanitizePat
33

44
import BaseClass from './base-class';
55
import { ExportConfig, ModuleClassParams } from '../../types';
6-
import { fsUtil, executeTask, EXPORT_MODULE_CONTEXTS, EXPORT_MODULE_NAMES } from '../../utils';
6+
import { fsUtil, executeTask, MODULE_CONTEXTS, MODULE_NAMES } from '../../utils';
77

88
export default class ContentTypesExport extends BaseClass {
99
private stackAPIClient: ReturnType<ContentstackClient['stack']>;
@@ -52,8 +52,8 @@ export default class ContentTypesExport extends BaseClass {
5252
sanitizePath(this.contentTypesConfig.dirName),
5353
);
5454
this.contentTypes = [];
55-
this.exportConfig.context.module = EXPORT_MODULE_CONTEXTS.CONTENT_TYPES;
56-
this.currentModuleName = EXPORT_MODULE_NAMES[EXPORT_MODULE_CONTEXTS.CONTENT_TYPES];
55+
this.exportConfig.context.module = MODULE_CONTEXTS.CONTENT_TYPES;
56+
this.currentModuleName = MODULE_NAMES[MODULE_CONTEXTS.CONTENT_TYPES];
5757
}
5858

5959
async start() {

‎packages/contentstack-export/src/export/modules/custom-roles.ts‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import { handleAndLogError, messageHandler, log } from '@contentstack/cli-utilit
88
import BaseClass from './base-class';
99
import {
1010
fsUtil,
11-
EXPORT_PROCESS_NAMES,
12-
EXPORT_MODULE_CONTEXTS,
13-
EXPORT_PROCESS_STATUS,
14-
EXPORT_MODULE_NAMES,
11+
PROCESS_NAMES,
12+
MODULE_CONTEXTS,
13+
PROCESS_STATUS,
14+
MODULE_NAMES,
1515
} from '../../utils';
1616
import { CustomRoleConfig, ModuleClassParams } from '../../types';
1717

@@ -31,8 +31,8 @@ export default class ExportCustomRoles extends BaseClass {
3131
this.existingRoles = { Admin: 1, Developer: 1, 'Content Manager': 1 };
3232
this.localesMap = {};
3333
this.sourceLocalesMap = {};
34-
this.exportConfig.context.module = EXPORT_MODULE_CONTEXTS.CUSTOM_ROLES;
35-
this.currentModuleName = EXPORT_MODULE_NAMES[EXPORT_MODULE_CONTEXTS.CUSTOM_ROLES];
34+
this.exportConfig.context.module = MODULE_CONTEXTS.CUSTOM_ROLES;
35+
this.currentModuleName = MODULE_NAMES[MODULE_CONTEXTS.CUSTOM_ROLES];
3636
}
3737

3838
async start(): Promise<void> {
@@ -72,36 +72,36 @@ export default class ExportCustomRoles extends BaseClass {
7272

7373
// Create nested progress manager
7474
const progress = this.createNestedProgress(this.currentModuleName)
75-
.addProcess(EXPORT_PROCESS_NAMES.FETCH_ROLES, totalRoles)
76-
.addProcess(EXPORT_PROCESS_NAMES.FETCH_LOCALES, totalLocales)
77-
.addProcess(EXPORT_PROCESS_NAMES.PROCESS_MAPPINGS, 1);
75+
.addProcess(PROCESS_NAMES.FETCH_ROLES, totalRoles)
76+
.addProcess(PROCESS_NAMES.FETCH_LOCALES, totalLocales)
77+
.addProcess(PROCESS_NAMES.PROCESS_MAPPINGS, 1);
7878

7979
progress
80-
.startProcess(EXPORT_PROCESS_NAMES.FETCH_ROLES)
80+
.startProcess(PROCESS_NAMES.FETCH_ROLES)
8181
.updateStatus(
82-
EXPORT_PROCESS_STATUS[EXPORT_PROCESS_NAMES.FETCH_ROLES].FETCHING,
83-
EXPORT_PROCESS_NAMES.FETCH_ROLES,
82+
PROCESS_STATUS[PROCESS_NAMES.FETCH_ROLES].FETCHING,
83+
PROCESS_NAMES.FETCH_ROLES,
8484
);
8585
await this.getCustomRoles();
86-
progress.completeProcess(EXPORT_PROCESS_NAMES.FETCH_ROLES, true);
86+
progress.completeProcess(PROCESS_NAMES.FETCH_ROLES, true);
8787

8888
progress
89-
.startProcess(EXPORT_PROCESS_NAMES.FETCH_LOCALES)
89+
.startProcess(PROCESS_NAMES.FETCH_LOCALES)
9090
.updateStatus(
91-
EXPORT_PROCESS_STATUS[EXPORT_PROCESS_NAMES.FETCH_LOCALES].FETCHING,
92-
EXPORT_PROCESS_NAMES.FETCH_LOCALES,
91+
PROCESS_STATUS[PROCESS_NAMES.FETCH_LOCALES].FETCHING,
92+
PROCESS_NAMES.FETCH_LOCALES,
9393
);
9494
await this.getLocales();
95-
progress.completeProcess(EXPORT_PROCESS_NAMES.FETCH_LOCALES, true);
95+
progress.completeProcess(PROCESS_NAMES.FETCH_LOCALES, true);
9696

9797
progress
98-
.startProcess(EXPORT_PROCESS_NAMES.PROCESS_MAPPINGS)
98+
.startProcess(PROCESS_NAMES.PROCESS_MAPPINGS)
9999
.updateStatus(
100-
EXPORT_PROCESS_STATUS[EXPORT_PROCESS_NAMES.PROCESS_MAPPINGS].PROCESSING,
101-
EXPORT_PROCESS_NAMES.PROCESS_MAPPINGS,
100+
PROCESS_STATUS[PROCESS_NAMES.PROCESS_MAPPINGS].PROCESSING,
101+
PROCESS_NAMES.PROCESS_MAPPINGS,
102102
);
103103
await this.getCustomRolesLocales();
104-
progress.completeProcess(EXPORT_PROCESS_NAMES.PROCESS_MAPPINGS, true);
104+
progress.completeProcess(PROCESS_NAMES.PROCESS_MAPPINGS, true);
105105

106106
log.debug(
107107
`Custom roles export completed. Total custom roles: ${Object.keys(this.customRoles).length}`,
@@ -145,7 +145,7 @@ export default class ExportCustomRoles extends BaseClass {
145145
log.info(messageHandler.parse('ROLES_EXPORTING_ROLE', role.name), this.exportConfig.context);
146146
this.customRoles[role.uid] = role;
147147

148-
this.progressManager?.tick(true, `role: ${role.name}`, null, EXPORT_PROCESS_NAMES.FETCH_ROLES);
148+
this.progressManager?.tick(true, `role: ${role.name}`, null, PROCESS_NAMES.FETCH_ROLES);
149149
});
150150

151151
const customRolesFilePath = pResolve(this.rolesFolderPath, this.customRolesConfig.fileName);
@@ -174,7 +174,7 @@ export default class ExportCustomRoles extends BaseClass {
174174
this.sourceLocalesMap[locale.uid] = locale;
175175

176176
// Track progress for each locale
177-
this.progressManager?.tick(true, `locale: ${locale.name}`, null, EXPORT_PROCESS_NAMES.FETCH_LOCALES);
177+
this.progressManager?.tick(true, `locale: ${locale.name}`, null, PROCESS_NAMES.FETCH_LOCALES);
178178
}
179179

180180
log.debug(`Mapped ${Object.keys(this.sourceLocalesMap).length} locales`, this.exportConfig.context);
@@ -219,6 +219,6 @@ export default class ExportCustomRoles extends BaseClass {
219219
}
220220

221221
// Track progress for mapping completion
222-
this.progressManager?.tick(true, 'role-locale mappings', null, EXPORT_PROCESS_NAMES.PROCESS_MAPPINGS);
222+
this.progressManager?.tick(true, 'role-locale mappings', null, PROCESS_NAMES.PROCESS_MAPPINGS);
223223
}
224224
}

‎packages/contentstack-export/src/export/modules/entries.ts‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import { sanitizePath } from '@contentstack/cli-utilities';
55

66
import {
77
fsUtil,
8-
EXPORT_PROCESS_NAMES,
9-
EXPORT_MODULE_CONTEXTS,
10-
EXPORT_PROCESS_STATUS,
11-
EXPORT_MODULE_NAMES,
8+
PROCESS_NAMES,
9+
MODULE_CONTEXTS,
10+
PROCESS_STATUS,
11+
MODULE_NAMES,
1212
} from '../../utils';
1313
import BaseClass, { ApiOptions } from './base-class';
1414
import { ExportConfig, ModuleClassParams } from '../../types';
@@ -58,8 +58,8 @@ export default class EntriesExport extends BaseClass {
5858
'schema.json',
5959
);
6060
this.projectInstance = new ExportProjects(this.exportConfig);
61-
this.exportConfig.context.module = EXPORT_MODULE_CONTEXTS.ENTRIES;
62-
this.currentModuleName = EXPORT_MODULE_NAMES[EXPORT_MODULE_CONTEXTS.ENTRIES];
61+
this.exportConfig.context.module = MODULE_CONTEXTS.ENTRIES;
62+
this.currentModuleName = MODULE_NAMES[MODULE_CONTEXTS.ENTRIES];
6363
}
6464

6565
async start() {
@@ -109,22 +109,22 @@ export default class EntriesExport extends BaseClass {
109109

110110
// Add sub-processes
111111
if (totalEntriesCount > 0) {
112-
progress.addProcess(EXPORT_PROCESS_NAMES.ENTRIES, totalEntriesCount);
112+
progress.addProcess(PROCESS_NAMES.ENTRIES, totalEntriesCount);
113113

114114
if (this.entriesConfig.exportVersions) {
115-
progress.addProcess(EXPORT_PROCESS_NAMES.ENTRY_VERSIONS, totalEntriesCount);
115+
progress.addProcess(PROCESS_NAMES.ENTRY_VERSIONS, totalEntriesCount);
116116
}
117117

118118
if (this.exportVariantEntry) {
119-
progress.addProcess(EXPORT_PROCESS_NAMES.VARIANT_ENTRIES, 0);
119+
progress.addProcess(PROCESS_NAMES.VARIANT_ENTRIES, 0);
120120
}
121121
}
122122

123123
// Process entry collections
124124
if (totalEntriesCount > 0) {
125125
progress
126-
.startProcess(EXPORT_PROCESS_NAMES.ENTRIES)
127-
.updateStatus(EXPORT_PROCESS_STATUS[EXPORT_PROCESS_NAMES.ENTRIES].PROCESSING, EXPORT_PROCESS_NAMES.ENTRIES);
126+
.startProcess(PROCESS_NAMES.ENTRIES)
127+
.updateStatus(PROCESS_STATUS[PROCESS_NAMES.ENTRIES].PROCESSING, PROCESS_NAMES.ENTRIES);
128128

129129
for (let entryRequestOption of entryRequestOptions) {
130130
try {
@@ -147,20 +147,20 @@ export default class EntriesExport extends BaseClass {
147147
this.progressManager?.tick(
148148
false,
149149
`${entryRequestOption.contentType}:${entryRequestOption.locale}`,
150-
error?.message || EXPORT_PROCESS_STATUS[EXPORT_PROCESS_NAMES.ENTRIES].FAILED,
151-
EXPORT_PROCESS_NAMES.ENTRIES,
150+
error?.message || PROCESS_STATUS[PROCESS_NAMES.ENTRIES].FAILED,
151+
PROCESS_NAMES.ENTRIES,
152152
);
153153
throw error;
154154
}
155155
}
156-
progress.completeProcess(EXPORT_PROCESS_NAMES.ENTRIES, true);
156+
progress.completeProcess(PROCESS_NAMES.ENTRIES, true);
157157

158158
if (this.entriesConfig.exportVersions) {
159-
progress.completeProcess(EXPORT_PROCESS_NAMES.ENTRY_VERSIONS, true);
159+
progress.completeProcess(PROCESS_NAMES.ENTRY_VERSIONS, true);
160160
}
161161

162162
if (this.exportVariantEntry) {
163-
progress.completeProcess(EXPORT_PROCESS_NAMES.VARIANT_ENTRIES, true);
163+
progress.completeProcess(PROCESS_NAMES.VARIANT_ENTRIES, true);
164164
}
165165
}
166166

@@ -334,7 +334,7 @@ export default class EntriesExport extends BaseClass {
334334

335335
// Track progress for individual entries
336336
entriesSearchResponse.items.forEach((entry: any) => {
337-
this.progressManager?.tick(true, `entry: ${entry.uid}`, null, EXPORT_PROCESS_NAMES.ENTRIES);
337+
this.progressManager?.tick(true, `entry: ${entry.uid}`, null, PROCESS_NAMES.ENTRIES);
338338
});
339339

340340
if (this.entriesConfig.exportVersions) {
@@ -407,7 +407,7 @@ export default class EntriesExport extends BaseClass {
407407
log.debug(`Writing versioned entry to: ${versionFilePath}`, this.exportConfig.context);
408408
fsUtil.writeFile(versionFilePath, response);
409409
// Track version progress if the process exists
410-
this.progressManager?.tick(true, `version: ${entry.uid}`, null, EXPORT_PROCESS_NAMES.ENTRY_VERSIONS);
410+
this.progressManager?.tick(true, `version: ${entry.uid}`, null, PROCESS_NAMES.ENTRY_VERSIONS);
411411
log.success(
412412
messageHandler.parse('ENTRIES_VERSIONED_EXPORT_SUCCESS', options.contentType, entry.uid, options.locale),
413413
this.exportConfig.context,
@@ -419,8 +419,8 @@ export default class EntriesExport extends BaseClass {
419419
this.progressManager?.tick(
420420
false,
421421
`version: ${uid}`,
422-
error?.message || EXPORT_PROCESS_STATUS[EXPORT_PROCESS_NAMES.ENTRY_VERSIONS].FAILED,
423-
EXPORT_PROCESS_NAMES.ENTRY_VERSIONS,
422+
error?.message || PROCESS_STATUS[PROCESS_NAMES.ENTRY_VERSIONS].FAILED,
423+
PROCESS_NAMES.ENTRY_VERSIONS,
424424
);
425425
handleAndLogError(
426426
error,

0 commit comments

Comments
 (0)