ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

additional data property to error object and use it for table designer scenarios (#19713)

Browse Source 
* add data property to error object

* vbump sts
This commit is contained in:
Alan Ren
2022-06-13 16:18:27 -07:00
committed by GitHub
parent 037daf8528
commit ba82444229
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/mssql/config.json
View File

@@ -1,6 +1,6 @@
{ {
"downloadUrl": "https://github.com/Microsoft/sqltoolsservice/releases/download/{#version#}/microsoft.sqltools.servicelayer-{#fileName#}", "downloadUrl": "https://github.com/Microsoft/sqltoolsservice/releases/download/{#version#}/microsoft.sqltools.servicelayer-{#fileName#}",
"version": "4.1.0.1", "version": "4.1.0.2",
"downloadFileNames": { "downloadFileNames": {
"Windows_86": "win-x86-net6.0.zip", "Windows_86": "win-x86-net6.0.zip",
"Windows_64": "win-x64-net6.0.zip", "Windows_64": "win-x64-net6.0.zip",

10
src/sql/workbench/services/tableDesigner/browser/tableDesignerComponentInput.ts
View File

@@ -119,7 +119,7 @@ export class TableDesignerComponentInput implements DesignerComponentInput {
}).withAdditionalProperties(metadataTelemetryInfo).send(); }).withAdditionalProperties(metadataTelemetryInfo).send();
}, },
error => { error => {
this._errorMessageService.showDialog(Severity.Error, ErrorDialogTitle, localize('tableDesigner.errorProcessingEdit', "An error occured while processing the change: {0}", error?.message ?? error)); this._errorMessageService.showDialog(Severity.Error, ErrorDialogTitle, localize('tableDesigner.errorProcessingEdit', "An error occured while processing the change: {0}", error?.message ?? error), error?.data);
this.updateState(this.valid, this.dirty); this.updateState(this.valid, this.dirty);
this._adsTelemetryService.createErrorEvent(TelemetryView.TableDesigner, this._adsTelemetryService.createErrorEvent(TelemetryView.TableDesigner,
this.designerEditTypeDisplayValue[edit.type]).withAdditionalProperties(telemetryInfo).send(); this.designerEditTypeDisplayValue[edit.type]).withAdditionalProperties(telemetryInfo).send();
@@ -146,7 +146,7 @@ export class TableDesignerComponentInput implements DesignerComponentInput {
'elapsedTimeMs': new Date().getTime() - startTime 'elapsedTimeMs': new Date().getTime() - startTime
}).send(); }).send();
} catch (error) { } catch (error) {
this._errorMessageService.showDialog(Severity.Error, ErrorDialogTitle, localize('tableDesigner.generateScriptError', "An error occured while generating the script: {0}", error?.message ?? error)); this._errorMessageService.showDialog(Severity.Error, ErrorDialogTitle, localize('tableDesigner.generateScriptError', "An error occured while generating the script: {0}", error?.message ?? error, error?.data));
this.updateState(this.valid, this.dirty); this.updateState(this.valid, this.dirty);
this._adsTelemetryService.createErrorEvent(TelemetryView.TableDesigner, TelemetryAction.GenerateScript).withAdditionalProperties(telemetryInfo).send(); this._adsTelemetryService.createErrorEvent(TelemetryView.TableDesigner, TelemetryAction.GenerateScript).withAdditionalProperties(telemetryInfo).send();
} }
@@ -176,7 +176,7 @@ export class TableDesignerComponentInput implements DesignerComponentInput {
'elapsedTimeMs': new Date().getTime() - startTime 'elapsedTimeMs': new Date().getTime() - startTime
}).withAdditionalProperties(metadataTelemetryInfo).send(); }).withAdditionalProperties(metadataTelemetryInfo).send();
} catch (error) { } catch (error) {
this._errorMessageService.showDialog(Severity.Error, ErrorDialogTitle, localize('tableDesigner.publishChangeError', "An error occured while publishing changes: {0}", error?.message ?? error)); this._errorMessageService.showDialog(Severity.Error, ErrorDialogTitle, localize('tableDesigner.publishChangeError', "An error occured while publishing changes: {0}", error?.message ?? error, error?.data));
this.updateState(this.valid, this.dirty); this.updateState(this.valid, this.dirty);
this._adsTelemetryService.createErrorEvent(TelemetryView.TableDesigner, TelemetryAction.PublishChanges).withAdditionalProperties(telemetryInfo).send(); this._adsTelemetryService.createErrorEvent(TelemetryView.TableDesigner, TelemetryAction.PublishChanges).withAdditionalProperties(telemetryInfo).send();
} }
@@ -210,7 +210,7 @@ export class TableDesignerComponentInput implements DesignerComponentInput {
reportNotificationHandle.close(); reportNotificationHandle.close();
this.updateState(this.valid, this.dirty); this.updateState(this.valid, this.dirty);
} catch (error) { } catch (error) {
this._errorMessageService.showDialog(Severity.Error, ErrorDialogTitle, localize('tableDesigner.generatePreviewReportError', "An error occurred while generating preview report: {0}", error?.message ?? error)); this._errorMessageService.showDialog(Severity.Error, ErrorDialogTitle, localize('tableDesigner.generatePreviewReportError', "An error occurred while generating preview report: {0}", error?.message ?? error, error?.data));
this.updateState(this.valid, this.dirty); this.updateState(this.valid, this.dirty);
this._adsTelemetryService.createErrorEvent(TelemetryView.TableDesigner, TelemetryAction.GeneratePreviewReport).withAdditionalProperties(telemetryInfo).send(); this._adsTelemetryService.createErrorEvent(TelemetryView.TableDesigner, TelemetryAction.GeneratePreviewReport).withAdditionalProperties(telemetryInfo).send();
return; return;
@@ -267,7 +267,7 @@ export class TableDesignerComponentInput implements DesignerComponentInput {
this.doInitialization(result); this.doInitialization(result);
this._onInitialized.fire(); this._onInitialized.fire();
} catch (error) { } catch (error) {
this._errorMessageService.showDialog(Severity.Error, ErrorDialogTitle, localize('tableDesigner.errorInitializingTableDesigner', "An error occurred while initializing the table designer: {0}", error?.message ?? error)); this._errorMessageService.showDialog(Severity.Error, ErrorDialogTitle, localize('tableDesigner.errorInitializingTableDesigner', "An error occurred while initializing the table designer: {0}", error?.message ?? error, error?.data));
} }
} }

3
src/vs/base/common/errors.ts
View File

@@ -111,7 +111,8 @@ export function transformErrorForSerialization(error: any): any {
name, name,
message, message,
stack, stack,
errorCode errorCode,
data: (<any>error).data // {{SQL CARBON EDIT}} Add data property.
}; };
} }

1
src/vs/workbench/services/extensions/common/rpcProtocol.ts
View File

@@ -446,6 +446,7 @@ export class RPCProtocol extends Disposable implements IRPCProtocol {
err.message = value.message; err.message = value.message;
err.stack = value.stack; err.stack = value.stack;
err.errorCode = value.errorCode; // {{SQL CARBON EDIT}} Include custom error code err.errorCode = value.errorCode; // {{SQL CARBON EDIT}} Include custom error code
err.data = value.data; // {{SQL CARBON EDIT}} Include custom data
} else { } else {
err = value; err = value;
} }