Skip to content

Commit 9fd8a74

Browse files
authored
Merge pull request #923 from oracle/feature/PDPDEVTOOL-6106-fix-non-intreactive-action-messages
fix non interactive messages collapsing on spinner
2 parents 5f89708 + 65ba928 commit 9fd8a74

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

packages/node-cli/src/commands/file/import/ImportFilesAction.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ module.exports = class ImportFilesAction extends BaseAction {
7575
}
7676

7777
if (!this._calledFromCompareFiles && !this._calledFromUpdate && this._runInInteractiveMode === false) {
78-
this._log.info(NodeTranslationService.getMessage(WARNINGS.OVERRIDE));
78+
await this._log.info(NodeTranslationService.getMessage(WARNINGS.OVERRIDE));
7979
}
8080

8181
if (this._calledFromCompareFiles) {

packages/node-cli/src/commands/object/import/ImportObjectsAction.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ module.exports = class ImportObjectsAction extends BaseAction {
9494
scriptIdArray = params[ANSWERS_NAMES.SCRIPT_ID];
9595
}
9696

97-
this._log.info(NodeTranslationService.getMessage(WARNINGS.OVERRIDE));
97+
await this._log.info(NodeTranslationService.getMessage(WARNINGS.OVERRIDE));
9898
}
9999

100100
delete params[ANSWERS_NAMES.SCRIPT_ID];

packages/node-cli/src/commands/project/create/CreateProjectAction.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ module.exports = class CreateProjectAction extends BaseAction {
162162
createProject(executionContextCreateProject, params, projectAbsolutePath, projectFolderName, manifestFilePath) {
163163
return async (resolve, reject) => {
164164
try {
165-
this._log.info(NodeTranslationService.getMessage(MESSAGES.CREATING_PROJECT_STRUCTURE));
165+
await this._log.info(NodeTranslationService.getMessage(MESSAGES.CREATING_PROJECT_STRUCTURE));
166166
if (params[COMMAND_OPTIONS.OVERWRITE]) {
167167
this._fileSystemService.emptyFolderRecursive(projectAbsolutePath);
168168
}
@@ -187,15 +187,15 @@ module.exports = class CreateProjectAction extends BaseAction {
187187
let npmInstallSuccess;
188188
let includeUnitTesting = this._getIncludeUnitTestingBoolean(params[COMMAND_OPTIONS.INCLUDE_UNIT_TESTING]);
189189
if (includeUnitTesting) {
190-
this._log.info(NodeTranslationService.getMessage(MESSAGES.SETUP_TEST_ENV));
190+
await this._log.info(NodeTranslationService.getMessage(MESSAGES.SETUP_TEST_ENV));
191191
await this._createUnitTestFiles(
192192
params[COMMAND_OPTIONS.TYPE],
193193
params[COMMAND_OPTIONS.PROJECT_NAME],
194194
params[COMMAND_OPTIONS.PROJECT_VERSION],
195195
projectAbsolutePath
196196
);
197197

198-
this._log.info(NodeTranslationService.getMessage(MESSAGES.INIT_NPM_DEPENDENCIES));
198+
await this._log.info(NodeTranslationService.getMessage(MESSAGES.INIT_NPM_DEPENDENCIES));
199199
npmInstallSuccess = await this._runNpmInstall(projectAbsolutePath);
200200
} else {
201201
await this._createDefaultSuiteCloudConfigFile(projectAbsolutePath);

packages/node-cli/src/commands/project/package/PackageAction.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ module.exports = class PackageAction extends BaseAction {
4646

4747
const executionContext = SdkExecutionContext.Builder.forCommand(this._commandMetadata.sdkCommand).integration().addParams(sdkParams).build();
4848

49-
this._log.warning(NodeTranslationService.getMessage(COMMAND_PACKAGE.LOCAL_VALIDATION_NOT_EXECUTED));
49+
await this._log.warning(NodeTranslationService.getMessage(COMMAND_PACKAGE.LOCAL_VALIDATION_NOT_EXECUTED));
5050

5151
const operationResult = await executeWithSpinner({
5252
action: this._sdkExecutor.execute(executionContext),

packages/node-cli/src/core/CommandActionExecutor.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,13 @@ module.exports = class CommandActionExecutor {
112112
}
113113
const inspectAuthzData = inspectAuthzOperationResult.data;
114114
if (inspectAuthzData[AUTHORIZATION_PROPERTIES_KEYS.NEEDS_REAUTHORIZATION]) {
115-
this._log.info(NodeTranslationService.getMessage(COMMAND_REFRESH_AUTHORIZATION.MESSAGES.CREDENTIALS_NEED_TO_BE_REFRESHED, defaultAuthId));
115+
await this._log.info(NodeTranslationService.getMessage(COMMAND_REFRESH_AUTHORIZATION.MESSAGES.CREDENTIALS_NEED_TO_BE_REFRESHED, defaultAuthId));
116116
const refreshAuthzOperationResult = await refreshAuthorization(defaultAuthId, this._sdkPath, this._executionEnvironmentContext);
117117

118118
if (!refreshAuthzOperationResult.isSuccess()) {
119119
throw refreshAuthzOperationResult.errorMessages;
120120
}
121-
this._log.info(NodeTranslationService.getMessage(COMMAND_REFRESH_AUTHORIZATION.MESSAGES.AUTHORIZATION_REFRESH_COMPLETED));
121+
await this._log.info(NodeTranslationService.getMessage(COMMAND_REFRESH_AUTHORIZATION.MESSAGES.AUTHORIZATION_REFRESH_COMPLETED));
122122
}
123123
}
124124

packages/node-cli/src/loggers/NodeConsoleLogger.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@ const fontFormatterPromise = loadLoggerFontFormatter();
1515
class NodeConsoleLogger extends ConsoleLogger {
1616

1717
info(message) {
18-
fontFormatterPromise.then(({ COLORS: { INFO } }) => {
18+
return fontFormatterPromise.then(({ COLORS: { INFO } }) => {
1919
this._println(message, INFO);
2020
});
2121
}
2222

2323
result(message) {
24-
fontFormatterPromise.then(({ COLORS: { RESULT } }) => {
24+
return fontFormatterPromise.then(({ COLORS: { RESULT } }) => {
2525
this._println(message, RESULT);
2626
});
2727
}
2828

2929
warning(message) {
30-
fontFormatterPromise.then(({ COLORS: { WARNING } }) => {
30+
return fontFormatterPromise.then(({ COLORS: { WARNING } }) => {
3131
this._println(message, WARNING);
3232
});
3333
}
3434

3535
error(message) {
36-
fontFormatterPromise.then(({ COLORS: { ERROR } }) => {
36+
return fontFormatterPromise.then(({ COLORS: { ERROR } }) => {
3737
this._println(message, ERROR);
3838
});
3939
}

0 commit comments

Comments
 (0)