Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/vscode-extension/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.",

Expand Down
4 changes: 2 additions & 2 deletions packages/vscode-extension/src/service/TranslationKeys.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
},
Expand All @@ -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';
Expand Down
19 changes: 16 additions & 3 deletions packages/vscode-extension/src/startup/DevAssistConfiguration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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('');
});

Expand Down Expand Up @@ -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();
Expand All @@ -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);
};
Comment on lines +218 to +225
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Optional: maybe we could go for the MessageService.showCommandError() ?

Idk if it makes more sense since the code would be simpler but this is technically not a command output..


const showDevAssistEmitProblemNotification = (errorStage: string, emitError: string, devAssistStatusBar: vscode.StatusBarItem) => {
// console.log(`There was a problem when starting DevAssist service. (${errorStage})\n${error}`)
setErrorDevAssistStausBarMessage(devAssistStatusBar)
Expand All @@ -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()
Expand Down