Merge pull request #885 from oracle/bugfix/PDPDEVTOOL-5947_vscode_extension_remove_see_details_warnings_errors

karl-anthony-ng · web-flow · commit 4f179c2bd4d9 · 2025-02-04T11:41:08.000+08:00
-PDPDEVTOOL-5947 vscode-extension - Remove the See Details button on warnings and errors
diff --git a/packages/vscode-extension/messages.json b/packages/vscode-extension/messages.json
@@ -12,6 +12,7 @@
 
 	"BUTTONS_RESTART_NOW": "Restart Now",
 	"BUTTONS_SEE_DETAILS": "See Details",
+	"BUTTONS_OK": "Ok",
 
 	"COMMAND_ERROR": "Something went wrong with '{0}'.",
 	"COMMAND_SUCCESS": "'{0}' has been successfully executed.",
diff --git a/packages/vscode-extension/src/commands/SetupAccount.ts b/packages/vscode-extension/src/commands/SetupAccount.ts
@@ -115,7 +115,7 @@ export default class SetupAccount extends BaseAction {
 		try {
 			validatorFunction();
 		} catch (err: any) {
-			this.messageService.showCommandError(err);
+			this.messageService.showErrorMessage(err);
 			return false;
 		}
 		return true;
@@ -205,7 +205,7 @@ export default class SetupAccount extends BaseAction {
 
 		const warning = ExecutionContextService.getBrowserBasedWarningMessages();
 		if (warning) {
-			this.messageService.showCommandWarning(warning);
+			this.messageService.showWarningMessageWithOk(warning);
 		}
 	}
 
diff --git a/packages/vscode-extension/src/service/MessageService.ts b/packages/vscode-extension/src/service/MessageService.ts
@@ -52,6 +52,12 @@ export default class MessageService {
 			);
 	}
 
+	showWarningMessageWithOk(warningMessage: string, includeProjectName = true) {
+		window.showWarningMessage(
+			includeProjectName ? this.addProjectNameToMessage(warningMessage) : warningMessage,
+			this.translationService.getMessage(BUTTONS.OK));
+	}
+
 	showErrorMessage(errorMessage: string) {
 		window.showErrorMessage(this.addProjectNameToMessage(errorMessage));
 	}
diff --git a/packages/vscode-extension/src/service/TranslationKeys.ts b/packages/vscode-extension/src/service/TranslationKeys.ts
@@ -22,6 +22,7 @@ export const ANSWERS = {
 export const BUTTONS = {
 	RESTART_NOW: 'BUTTONS_RESTART_NOW',
 	SEE_DETAILS: 'BUTTONS_SEE_DETAILS',
+	OK: 'BUTTONS_OK'
 };
 
 export const COMMAND = {

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ export default class SetupAccount extends BaseAction {`
`115`	`115`	`try {`
`116`	`116`	`validatorFunction();`
`117`	`117`	`} catch (err: any) {`
`118`		`- this.messageService.showCommandError(err);`
	`118`	`+ this.messageService.showErrorMessage(err);`
`119`	`119`	`return false;`
`120`	`120`	`}`
`121`	`121`	`return true;`
`@@ -205,7 +205,7 @@ export default class SetupAccount extends BaseAction {`
`205`	`205`
`206`	`206`	`const warning = ExecutionContextService.getBrowserBasedWarningMessages();`
`207`	`207`	`if (warning) {`
`208`		`- this.messageService.showCommandWarning(warning);`
	`208`	`+ this.messageService.showWarningMessageWithOk(warning);`
`209`	`209`	`}`
`210`	`210`	`}`
`211`	`211`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,12 @@ export default class MessageService {`
`52`	`52`	`);`
`53`	`53`	`}`
`54`	`54`
	`55`	`+ showWarningMessageWithOk(warningMessage: string, includeProjectName = true) {`
	`56`	`+ window.showWarningMessage(`
	`57`	`+ includeProjectName ? this.addProjectNameToMessage(warningMessage) : warningMessage,`
	`58`	`+ this.translationService.getMessage(BUTTONS.OK));`
	`59`	`+ }`
	`60`	`+`
`55`	`61`	`showErrorMessage(errorMessage: string) {`
`56`	`62`	`window.showErrorMessage(this.addProjectNameToMessage(errorMessage));`
`57`	`63`	`}`