Skip to content

Commit cd2f381

Browse files
Merge pull request #2296 from contentstack/enhancement/DX-3611
feat:fix progress manager logging
2 parents ba69370 + 54d08f2 commit cd2f381

5 files changed

Lines changed: 74 additions & 6 deletions

File tree

.talismanrc

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,60 @@
11
fileignoreconfig:
22
- filename: package-lock.json
33
checksum: 3f28d87bef29c352de910a0654318a847b5ced07cdaf271e9a155c98ae677b16
4+
- filename: pnpm-lock.yaml
5+
checksum: 6f278bce220f922eef8cd7d2a5c74e978892621e66049b927df6ed01964a76c8
6+
- filename: packages/contentstack-import/src/commands/cm/stacks/import.ts
7+
checksum: ee643d664d69eafc6f82923048a85c4dc26f78b1ac93cfe1e152c69945b65d9e
8+
- filename: packages/contentstack-seed/src/commands/cm/stacks/seed.ts
9+
checksum: d04770564196b080878566255ea0faf1c82c1460161d2004d2b1edece0546493
10+
- filename: packages/contentstack-import/README.md
11+
checksum: f701583669afcf9be38c8b1698aede39658c0df5afe6691ba1301408d20c7c69
12+
- filename: packages/contentstack-auth/test/unit/commands/tokens-remove.test.ts
13+
checksum: 7e256db86c516b40c47eab78b3881b7ece525607281ebcd0b8711c089bdac056
14+
- filename: packages/contentstack-export/src/commands/cm/stacks/export.ts
15+
checksum: 0f419db76a2e4132e8f833ae2b194d2c2658a0417265390a6036b63b3401c876
16+
- filename: packages/contentstack-export/README.md
17+
checksum: ed79c7f29e1cb17a4889c9b19877fd2d7596aec4cc8fcbf4f83643155ef1800c
18+
- filename: packages/contentstack-import-setup/README.md
19+
checksum: f1640c025b0f7603b5f81b511802bf9de18ee6daefbf01521b8d2347490c7757
20+
- filename: packages/contentstack-import-setup/src/commands/cm/stacks/import-setup.ts
21+
checksum: a903276f842ec00e49ed4751d6df8f4f7213fb1aaa631323f6ce593dad0b236c
22+
- filename: packages/contentstack-migration/README.md
23+
checksum: f25b5601b30057471827d44b41483ea9664586f6c65559ac04a3d39bfb319526
24+
- filename: packages/contentstack-import-setup/src/utils/login-handler.ts
25+
checksum: ca22ae9649dbc11eba4a4399ef517bdd3f3e3b0ca815307a3313bc9332be3f85
26+
- filename: packages/contentstack-migration/src/commands/cm/stacks/migration.js
27+
checksum: ebc17ed46356ec89d294fa0caa84a654d09823410ba5f122331c0ebd83decd92
28+
- filename: packages/contentstack-import-setup/test/unit/login-handler.test.ts
29+
checksum: 51155d629b9825ab8218023cba367ea41264ce534f891e3a6e14a829c2399654
30+
- filename: packages/contentstack-bootstrap/test/bootstrap-integration.test.js
31+
checksum: d3e3902b2ee72aa41483da5c135e5c4bcec85f65939695708e9bec9478f6336c
32+
- filename: packages/contentstack-migration/test/unit/utils/map.test.js
33+
checksum: 7d570280b2f379531dde84946b06171d50f92489ff0de6336f7fbd81c336ee89
34+
- filename: packages/contentstack-seed/test/commands/cm/stacks/seed.test.ts
35+
checksum: 61143bbb2ac86c24afc6972d17d9179c6181ec68a909b84570afdad2aaa13ade
36+
- filename: packages/contentstack-config/test/unit/commands/remove-base-branch.test.ts
37+
checksum: 3e73b079b749120221f357d66ac7351ddb300d283f28410d5e6f3b0309ab3962
38+
- filename: packages/contentstack-migration/test/unit/validators/edit-content-type-validator.test.js
39+
checksum: bde4bc6b2a90e7ce5872e6fbbabef9f2db352705be4d2f8d28d71d84209a714e
40+
- filename: packages/contentstack-bootstrap/test/bootstrap.test.js
41+
checksum: b1f46b3447b1b358f80d6404d9d5b385fb385714e5c1f865ca97d64d6edaefc2
42+
- filename: packages/contentstack-seed/README.md
43+
checksum: 67378f35a33ae250a8099bbb42a5e644486e7279715685e3ba5c65add6451c46
44+
- filename: packages/contentstack-utilities/test/unit/contentstack-marketplace-sdk.test.ts
45+
checksum: ccf521d7eafe03d5c4b597c8b30c4cceac00e75d597685fbfb411da4603fbd29
46+
- filename: packages/contentstack-migration/test/unit/validators/create-content-type-validator.test.js
47+
checksum: f92e39a542cd2d561c441d23395515cadc24c9514de55c3edb038f70bd2458b3
48+
- filename: packages/contentstack-migration/test/unit/modules/parser.test.js
49+
checksum: 243fa1c45875675f719f660c0c988e2ba9266c562a37aaeb09b0db93a0cb037d
50+
- filename: packages/contentstack-bootstrap/test/interactive.test.js
51+
checksum: fb0c32cd846cce3a53927316699a1c5aaa814939fe9b33bcd9141addbbe447d0
52+
- filename: packages/contentstack-seed/test/seed/interactive.test.ts
53+
checksum: e7a823051b5eb27f2674ca2c31719205fa822e9cac1524dbd14e48b1ec078c06
54+
- filename: packages/contentstack/README.md
55+
checksum: e650b0eb54404b08fb2b802a05883dc5984bff43842876df70bcbb5821034fe5
56+
- filename: packages/contentstack-seed/test/seed/importer.test.ts
57+
checksum: 77bc27f5217c6d69c21bac51afc94d677ad67374c1b39b0575646300eb0decd3
58+
- filename: packages/contentstack-seed/test/seed/contentstack/client.test.ts
59+
checksum: f1bc369c9c3c4a84ddd590864c0f3e8b13be956b8fb8891b6324f44cdcc7d568
460
version: '1.0'

packages/contentstack-export/src/utils/export-config-handler.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ import { filter, includes } from 'lodash';
99
import { ExportConfig } from '../types';
1010

1111
const setupConfig = async (exportCmdFlags: any): Promise<ExportConfig> => {
12+
// Set progress supported module FIRST, before any log calls
13+
// This ensures the logger respects the showConsoleLogs setting correctly
14+
configHandler.set('log.progressSupportedModule', 'export');
15+
1216
let config = merge({}, defaultConfig);
1317

1418
// Track authentication method
@@ -132,8 +136,6 @@ const setupConfig = async (exportCmdFlags: any): Promise<ExportConfig> => {
132136
throw new Error(`Invalid query format: ${error.message}`);
133137
}
134138
}
135-
// Set progress supported module to check and display console logs
136-
configHandler.set('log.progressSupportedModule', 'export');
137139
// Add authentication details to config for context tracking
138140
config.authenticationMethod = authenticationMethod;
139141
log.debug('Export configuration setup completed.', { ...config });

packages/contentstack-import-setup/src/utils/import-config-handler.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ import login from './login-handler';
77
import { ImportConfig } from '../types';
88

99
const setupConfig = async (importCmdFlags: any): Promise<ImportConfig> => {
10-
const config: ImportConfig = merge({}, defaultConfig);
10+
// Set progress supported module FIRST, before any log calls
11+
// This ensures the logger respects the showConsoleLogs setting correctly
12+
configHandler.set('log.progressSupportedModule', 'import-setup');
13+
14+
let config: ImportConfig = merge({}, defaultConfig);
1115
// setup the config
1216
// if (importCmdFlags['config']) {
1317
// let externalConfig = await readFile(importCmdFlags['config']);
@@ -18,7 +22,9 @@ const setupConfig = async (importCmdFlags: any): Promise<ImportConfig> => {
1822
// config = merge.recursive(config, externalConfig);
1923
// }
2024

21-
config.contentDir = sanitizePath(importCmdFlags['data'] || importCmdFlags['data-dir'] || config.data || (await askContentDir()));
25+
config.contentDir = sanitizePath(
26+
importCmdFlags['data'] || importCmdFlags['data-dir'] || config.data || (await askContentDir()),
27+
);
2228
const pattern = /[*$%#<>{}!&?]/g;
2329
if (pattern.test(config.contentDir)) {
2430
cliux.print(`\nPlease enter a directory path without special characters: (*,&,{,},[,],$,%,<,>,?,!)`, {

packages/contentstack-import/src/utils/import-config-handler.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ import login from './login-handler';
99
import { ImportConfig } from '../types';
1010

1111
const setupConfig = async (importCmdFlags: any): Promise<ImportConfig> => {
12+
// Set progress supported module FIRST, before any log calls
13+
// This ensures the logger respects the showConsoleLogs setting correctly
14+
configHandler.set('log.progressSupportedModule', 'import');
15+
1216
let config: ImportConfig = merge({}, defaultConfig);
1317
// Track authentication method
1418
let authenticationMethod = 'unknown';

packages/contentstack-utilities/src/logger/logger.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ export default class Logger {
7777
const hasProgressSupport = currentModule && PROGRESS_SUPPORTED_MODULES.includes(currentModule);
7878

7979
if (hasProgressSupport) {
80-
// Plugin has progress bars - respect user's showConsoleLogs setting
81-
showConsoleLogs = logConfig.showConsoleLogs ?? true;
80+
// Plugin has progress bars - respect user's explicit setting, or default to false (show progress bars)
81+
showConsoleLogs = logConfig.showConsoleLogs ?? false;
8282
} else {
8383
// Plugin doesn't have progress support - always show console logs
8484
showConsoleLogs = true;

0 commit comments

Comments
 (0)