Merge pull request #972 from oracle/bugfix/PDPDEVTOOL-6317-DevAssist-Fix-Stopped-Button-Server-Error

pdpdevtool 6317 dev assist avoid to stop button when proxy server error

Author: davidecorreu

packages/vscode-extension/messages.json

@@ -63,12 +63,12 @@
 	"DEVASSIST_SERVICE_IS_RUNNING_OUTPUT": "SuiteCloud Developer Assistant service is now running at {0} and is using the {1} auth ID.\nUse this Cline Base URL {2}.",
 	"DEVASSIST_SERVICE_IS_RUNNING_STATUSBAR": "Dev Assist: running",
 	"DEVASSIST_SERVICE_IS_STOPPED_NOTIFICATION": "Something went wrong with SuiteCloud Developer Assistant service.",
-	"DEVASSIST_SERVICE_IS_STOPPED_NOTIFICATION_BUTTON": "See Details",
 	"DEVASSIST_SERVICE_IS_STOPPED_OUTPUT": "There was a problem when starting SuiteCloud Developer Assistant service.\n{0}",
 	"DEVASSIST_SERVICE_IS_STOPPED_STATUSBAR": "Dev Assist: stopped",
 	"DEVASSIST_SERVICE_SERVER_ERROR_OUTPUT": "A server error has occurred while running SuiteCloud Developer Assistant service.\nError: {0}",
 	"DEVASSIST_SERVICE_STARTUP_BUTTON_DONT_SHOW_AGAIN": "Don't show again",
 	"DEVASSIST_SERVICE_STARTUP_BUTTON_OPEN_SETTINGS": "Open Settings",
+	"DEVASSIST_SERVICE_SEE_DETAILS_BUTTON": "See Details",
 	"DEVASSIST_SERVICE_STARTUP_MESSAGE": "SuiteCloud Developer Assistant is here. Open settings to start using it.",
 	"DEVASSIST_SERVICE_STATUSBAR_TOOLTIP": "Shows the status of SuiteCloud Developer Assistant service.",
 

packages/vscode-extension/src/service/TranslationKeys.ts

@@ -116,7 +116,6 @@ export const DEVASSIST_SERVICE = {
 	},
 	IS_STOPPED: {
 		NOTIFICATION: 'DEVASSIST_SERVICE_IS_STOPPED_NOTIFICATION',
-		NOTIFICATION_BUTTON: 'DEVASSIST_SERVICE_IS_STOPPED_NOTIFICATION_BUTTON',
 		OUTPUT: 'DEVASSIST_SERVICE_IS_STOPPED_OUTPUT',
 		STATUSBAR: 'DEVASSIST_SERVICE_IS_STOPPED_STATUSBAR'
 	},
@@ -127,7 +126,8 @@ export const DEVASSIST_SERVICE = {
 		},
 		MESSAGE: 'DEVASSIST_SERVICE_STARTUP_MESSAGE',
 	},
-	STATUSBAR_TOOLTIP: 'DEVASSIST_SERVICE_STATUSBAR_TOOLTIP'
+	STATUSBAR_TOOLTIP: 'DEVASSIST_SERVICE_STATUSBAR_TOOLTIP',
+	SEE_DETAILS_BUTTON: 'DEVASSIST_SERVICE_SEE_DETAILS_BUTTON'
 }
 
 export const DISMISS = 'DISMISS';

packages/vscode-extension/src/startup/DevAssistConfiguration.ts

@@ -127,7 +127,7 @@ const initializeDevAssistService = (devAssistStatusBar: vscode.StatusBarItem) =>
     // adding listener to forward ServerError from SuiteCloudAuthProxy to vscode suitecloud output
     devAssistProxyService.on(PROXY_SERVICE_EVENTS.SERVER_ERROR, (emitParams: { authId: string, message: string }) => {
 		const errorMessage = translationService.getMessage(DEVASSIST_SERVICE.EMIT_ERROR.OUTPUT.SERVER_ERROR, emitParams.message);
-		showDevAssistEmitProblemNotification(PROXY_SERVICE_EVENTS.SERVER_ERROR, errorMessage, devAssistStatusBar);
+		showDevAssistEmitProblemLog(PROXY_SERVICE_EVENTS.SERVER_ERROR, errorMessage, devAssistStatusBar);
         vsLogger.error('');
 	});
 
@@ -200,7 +200,7 @@ const showStartDevAssistProblemNotification = (errorStage: string, error: string
     const errorMessage = translationService.getMessage(DEVASSIST_SERVICE.IS_STOPPED.NOTIFICATION);
     const buttonsAndActions: { buttonMessage: string, buttonAction: () => void }[] = [
         {
-            buttonMessage: translationService.getMessage(DEVASSIST_SERVICE.IS_STOPPED.NOTIFICATION_BUTTON),
+            buttonMessage: translationService.getMessage(DEVASSIST_SERVICE.SEE_DETAILS_BUTTON),
             buttonAction: () => {
                 // show suitecloud output and devassist settings
                 output.show();
@@ -211,6 +211,19 @@ const showStartDevAssistProblemNotification = (errorStage: string, error: string
     vsNotificationService.showCommandErrorWithSpecificButtonsAndActions(errorMessage, buttonsAndActions);
 }
 
+const showDevAssistEmitProblemLog = (errorStage: string, emitError: string, devAssistStatusBar: vscode.StatusBarItem) => {
+    vsLogger.printTimestamp();
+    vsLogger.error(emitError);
+    const errorMessage = translationService.getMessage(DEVASSIST_SERVICE.IS_STOPPED.NOTIFICATION);
+    const buttonsAndActions: { buttonMessage: string, buttonAction: () => void }[] = [
+        {
+            buttonMessage: translationService.getMessage(DEVASSIST_SERVICE.SEE_DETAILS_BUTTON),
+            buttonAction: () => output.show(),
+        },
+    ];
+    vsNotificationService.showCommandErrorWithSpecificButtonsAndActions(errorMessage, buttonsAndActions);
+};
+
 const showDevAssistEmitProblemNotification = (errorStage: string, emitError: string, devAssistStatusBar: vscode.StatusBarItem) => {
     // console.log(`There was a problem when starting DevAssist service. (${errorStage})\n${error}`)
     setErrorDevAssistStausBarMessage(devAssistStatusBar)
@@ -219,7 +232,7 @@ const showDevAssistEmitProblemNotification = (errorStage: string, emitError: str
     const errorMessage = translationService.getMessage(DEVASSIST_SERVICE.IS_STOPPED.NOTIFICATION);
     const buttonsAndActions: { buttonMessage: string, buttonAction: () => void }[] = [
         {
-            buttonMessage: translationService.getMessage(DEVASSIST_SERVICE.IS_STOPPED.NOTIFICATION_BUTTON),
+            buttonMessage: translationService.getMessage(DEVASSIST_SERVICE.SEE_DETAILS_BUTTON),
             buttonAction: () => {
                 // show suitecloud output and devassist settings
                 output.show()