Skip to content

Commit e746439

Browse files
aman19Kaman19K
authored
Merge pull request #1257 from contentstack/staging
Merge staging to main (Hotfix release)
2 parents 8441115 + c40717f commit e746439

18 files changed

Lines changed: 84 additions & 74 deletions

File tree

‎package-lock.json‎

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

‎packages/contentstack-audit/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@contentstack/cli-audit",
3-
"version": "1.3.2",
3+
"version": "1.3.3",
44
"description": "Contentstack audit plugin",
55
"author": "Contentstack CLI",
66
"homepage": "https://github.com/contentstack/cli",

‎packages/contentstack-audit/src/commands/cm/stacks/audit/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ export default class Audit extends AuditBaseCommand {
4242
try {
4343
await this.start('cm:stacks:audit');
4444
} catch (error) {
45+
console.trace(error);
4546
this.log(error instanceof Error ? error.message : error, 'error');
4647
ux.action.stop('Process failed.!');
4748
this.exit(1);

‎packages/contentstack-audit/src/config/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
const config = {
22
showTerminalOutput: true,
33
skipRefs: ['sys_assets'],
4+
skipFieldTypes: ['taxonomy'],
45
modules: ['content-types', 'global-fields', 'entries'],
56
'fix-fields': ['reference', 'global_field', 'json:rte', 'json:custom-field', 'blocks', 'group'],
67
moduleConfig: {

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,8 +379,9 @@ export default class ContentType {
379379
}
380380
})
381381
.filter((val: any) => {
382-
if (val?.schema && isEmpty(val.schema)) return false;
383-
if (val?.reference_to && isEmpty(val.reference_to)) return false;
382+
if (this.config.skipFieldTypes.includes(val?.data_type)) return true;
383+
if (val?.schema && isEmpty(val?.schema)) return false;
384+
if (val?.reference_to && isEmpty(val?.reference_to)) return false;
384385

385386
return !!val;
386387
}) as ContentTypeSchemaType[];

‎packages/contentstack-branches/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ $ npm install -g @contentstack/cli-cm-branches
3737
$ csdx COMMAND
3838
running command...
3939
$ csdx (--version)
40-
@contentstack/cli-cm-branches/1.0.20 darwin-arm64 node-v20.8.0
40+
@contentstack/cli-cm-branches/1.0.21 darwin-arm64 node-v20.8.0
4141
$ csdx --help [COMMAND]
4242
USAGE
4343
$ csdx COMMAND

‎packages/contentstack-branches/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@contentstack/cli-cm-branches",
33
"description": "Contentstack CLI plugin to do branches operations",
4-
"version": "1.0.20",
4+
"version": "1.0.21",
55
"author": "Contentstack",
66
"bugs": "https://github.com/contentstack/cli/issues",
77
"dependencies": {

‎packages/contentstack-branches/src/branch/merge-handler.ts‎

Lines changed: 20 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,6 @@ export default class MergeHandler {
241241
async executeEntryExpFlow(mergeJobUID: string, mergePayload) {
242242
const { mergeContent } = this.mergeSettings;
243243
let mergePreference = await selectContentMergePreference();
244-
let selectedMergePreference;
245244

246245
const updateEntryMergeStrategy = (items, mergeStrategy) => {
247246
items &&
@@ -250,25 +249,16 @@ export default class MergeHandler {
250249
});
251250
};
252251

253-
switch (mergePreference) {
254-
case 'existing_new':
255-
selectedMergePreference = 'merge_existing_new';
256-
updateEntryMergeStrategy(mergeContent.content_types.added, selectedMergePreference);
257-
updateEntryMergeStrategy(mergeContent.content_types.modified, selectedMergePreference);
258-
break;
259-
260-
case 'new':
261-
selectedMergePreference = 'merge_new';
262-
updateEntryMergeStrategy(mergeContent.content_types.added, selectedMergePreference);
263-
break;
264-
265-
case 'existing':
266-
selectedMergePreference = 'merge_existing';
267-
updateEntryMergeStrategy(mergeContent.content_types.modified, selectedMergePreference);
268-
break;
252+
const mergePreferencesMap = {
253+
'existing_new': 'merge_existing_new',
254+
'new': 'merge_new',
255+
'existing': 'merge_existing',
256+
'ask_preference': 'custom',
257+
};
258+
const selectedMergePreference = mergePreferencesMap[mergePreference];
269259

270-
case 'ask_preference':
271-
selectedMergePreference = 'custom';
260+
if (selectedMergePreference) {
261+
if (selectedMergePreference === 'custom') {
272262
const selectedMergeItems = await selectContentMergeCustomPreferences(mergeContent.content_types);
273263
mergeContent.content_types = {
274264
added: [],
@@ -279,23 +269,25 @@ export default class MergeHandler {
279269
selectedMergeItems?.forEach((item) => {
280270
mergeContent.content_types[item.status].push(item.value);
281271
});
282-
break;
283-
284-
default:
285-
cliux.error(`error: Invalid preference ${mergePreference}`);
286-
process.exit(1);
272+
} else {
273+
updateEntryMergeStrategy(mergeContent.content_types.added, selectedMergePreference);
274+
updateEntryMergeStrategy(mergeContent.content_types.modified, selectedMergePreference);
275+
}
276+
} else {
277+
cliux.error(`error: Invalid preference ${mergePreference}`);
278+
process.exit(1);
287279
}
288280

289281
let scriptFolderPath = generateMergeScripts(mergeContent.content_types, mergeJobUID);
290282

291283
if (scriptFolderPath !== undefined) {
292284
cliux.success(`\nSuccess! We have generated entry migration files in the folder ${scriptFolderPath}`);
293-
cliux.print('\nWARNING!!! Migration is not intended to be run more than once. Migrated(entries/assets) will be duplicated if run more than once', {color: 'yellow'});
285+
cliux.print('\nWARNING!!! Migration is not intended to be run more than once. Migrated(entries/assets) will be duplicated if run more than once', { color: 'yellow' });
294286

295287
let migrationCommand: string;
296-
if(os.platform() === 'win32'){
297-
migrationCommand = `csdx cm:stacks:migration --multiple --file-path ./${scriptFolderPath} --config compare-branch:${mergePayload.compare_branch},file-path:./${scriptFolderPath} --branch ${mergePayload.base_branch} --stack-api-key ${this.stackAPIKey}`;
298-
}else{
288+
if (os.platform() === 'win32') {
289+
migrationCommand = `csdx cm:stacks:migration --multiple --file-path ./${scriptFolderPath} --config compare-branch:${mergePayload.compare_branch} file-path:./${scriptFolderPath} --branch ${mergePayload.base_branch} --stack-api-key ${this.stackAPIKey}`;
290+
} else {
299291
migrationCommand = `csdx cm:stacks:migration --multiple --file-path ./${scriptFolderPath} --config {compare-branch:${mergePayload.compare_branch},file-path:./${scriptFolderPath}} --branch ${mergePayload.base_branch} --stack-api-key ${this.stackAPIKey}`;
300292
}
301293

‎packages/contentstack-branches/src/utils/create-merge-scripts.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,20 @@ export function generateMergeScripts(mergeSummary, mergeJobUID) {
3434

3535
const processContentTypes = (contentTypes, messageType) => {
3636
if (contentTypes && contentTypes.length > 0) {
37-
processContentType(
38-
{ type: 'assets', uid: '', entry_merge_strategy: '' },
39-
mergeStrategies['asset_create_folder'],
40-
);
4137
contentTypes.forEach((contentType) => {
4238
const mergeStrategy = contentType.entry_merge_strategy;
4339
if (mergeStrategies.hasOwnProperty(mergeStrategy)) {
4440
processContentType(contentType, mergeStrategies[mergeStrategy]);
4541
}
4642
});
47-
} else {
48-
cliux.print(`No ${messageType} entries selected for merge`, { color: 'yellow' });
43+
cliux.print(`Info: Entries of ${messageType} content types selected for the migration`, { color: 'blue' });
4944
}
5045
};
51-
46+
47+
processContentType(
48+
{ type: 'assets', uid: '', entry_merge_strategy: '' },
49+
mergeStrategies['asset_create_folder'],
50+
);
5251
processContentTypes(mergeSummary.modified, 'Modified');
5352
processContentTypes(mergeSummary.added, 'New');
5453

@@ -93,10 +92,11 @@ export function createMergeScripts(contentType: CreateMergeScriptsProps, mergeJo
9392
fs.mkdirSync(fullPath);
9493
}
9594
let filePath: string;
95+
let milliSeconds = date.getMilliseconds().toString().padStart(3, '0')
9696
if (contentType.type === 'assets') {
97-
filePath = `${fullPath}/${fileCreatedAt}_create_assets_folder.js`;
97+
filePath = `${fullPath}/${fileCreatedAt}${milliSeconds}_create_assets_folder.js`;
9898
} else {
99-
filePath = `${fullPath}/${fileCreatedAt}_${getContentTypeMergeStatus(contentType.entry_merge_strategy)}_${
99+
filePath = `${fullPath}/${fileCreatedAt}${milliSeconds}_${getContentTypeMergeStatus(contentType.entry_merge_strategy)}_${
100100
contentType.uid
101101
}.js`;
102102
}

‎packages/contentstack-bulk-publish/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-cm-bulk-publish
1818
$ csdx COMMAND
1919
running command...
2020
$ csdx (--version)
21-
@contentstack/cli-cm-bulk-publish/1.4.0 darwin-arm64 node-v20.8.0
21+
@contentstack/cli-cm-bulk-publish/1.4.0 darwin-arm64 node-v20.10.0
2222
$ csdx --help [COMMAND]
2323
USAGE
2424
$ csdx COMMAND

0 commit comments

Comments
 (0)