ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

use error dialog instead of notification (#18313)

Browse Source
This commit is contained in:
Alan Ren
2022-02-10 19:22:29 -08:00
committed by GitHub
parent a2e34c4609
commit e82b4da0b9
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,9 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
import { TableDesignerPublishDialogResult, TableDesignerPublishDialog } from 'sql/workbench/services/tableDesigner/browser/tableDesignerPublishDialog'; import { TableDesignerPublishDialogResult, TableDesignerPublishDialog } from 'sql/workbench/services/tableDesigner/browser/tableDesignerPublishDialog';
import { IAdsTelemetryService, ITelemetryEventProperties } from 'sql/platform/telemetry/common/telemetry'; import { IAdsTelemetryService, ITelemetryEventProperties } from 'sql/platform/telemetry/common/telemetry';
import { TelemetryAction, TelemetryView } from 'sql/platform/telemetry/common/telemetryKeys'; import { TelemetryAction, TelemetryView } from 'sql/platform/telemetry/common/telemetryKeys';
import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService';
const ErrorDialogTitle: string = localize('tableDesigner.ErrorDialogTitle', "Table Designer Error");
export class TableDesignerComponentInput implements DesignerComponentInput { export class TableDesignerComponentInput implements DesignerComponentInput {
private _viewModel: DesignerViewModel; private _viewModel: DesignerViewModel;
@@ -45,7 +47,8 @@ export class TableDesignerComponentInput implements DesignerComponentInput {
@INotificationService private readonly _notificationService: INotificationService, @INotificationService private readonly _notificationService: INotificationService,
@IAdsTelemetryService readonly _adsTelemetryService: IAdsTelemetryService, @IAdsTelemetryService readonly _adsTelemetryService: IAdsTelemetryService,
@IQueryEditorService private readonly _queryEditorService: IQueryEditorService, @IQueryEditorService private readonly _queryEditorService: IQueryEditorService,
@IInstantiationService private readonly _instantiationService: IInstantiationService) { @IInstantiationService private readonly _instantiationService: IInstantiationService,
@IErrorMessageService private readonly _errorMessageService: IErrorMessageService) {
} }
get valid(): boolean { get valid(): boolean {
@@ -96,7 +99,7 @@ export class TableDesignerComponentInput implements DesignerComponentInput {
}).send(); }).send();
}, },
error => { error => {
this._notificationService.error(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));
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();
@@ -123,8 +126,7 @@ export class TableDesignerComponentInput implements DesignerComponentInput {
'elapsedTimeMs': new Date().getTime() - startTime 'elapsedTimeMs': new Date().getTime() - startTime
}).send(); }).send();
} catch (error) { } catch (error) {
notificationHandle.updateSeverity(Severity.Error); this._errorMessageService.showDialog(Severity.Error, ErrorDialogTitle, localize('tableDesigner.generateScriptError', "An error occured while generating the script: {0}", error?.message ?? error));
notificationHandle.updateMessage(localize('tableDesigner.generateScriptError', "An error occured while generating the script: {0}", error?.message ?? error));
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();
} }
@@ -152,8 +154,7 @@ export class TableDesignerComponentInput implements DesignerComponentInput {
'elapsedTimeMs': new Date().getTime() - startTime 'elapsedTimeMs': new Date().getTime() - startTime
}).send(); }).send();
} catch (error) { } catch (error) {
saveNotificationHandle.updateSeverity(Severity.Error); this._errorMessageService.showDialog(Severity.Error, ErrorDialogTitle, localize('tableDesigner.publishChangeError', "An error occured while publishing changes: {0}", error?.message ?? error));
saveNotificationHandle.updateMessage(localize('tableDesigner.publishChangeError', "An error occured while publishing changes: {0}", error?.message ?? error));
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();
} }
@@ -173,8 +174,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) {
reportNotificationHandle.updateSeverity(Severity.Error); this._errorMessageService.showDialog(Severity.Error, ErrorDialogTitle, localize('tableDesigner.generatePreviewReportError', "An error occured while generating preview report: {0}", error?.message ?? error));
reportNotificationHandle.updateMessage(localize('tableDesigner.generatePreviewReportError', "An error occured while generating preview report: {0}", error?.message ?? error));
this.updateState(this.valid, this.dirty); this.updateState(this.valid, this.dirty);
return; return;
} }
@@ -225,7 +225,7 @@ export class TableDesignerComponentInput implements DesignerComponentInput {
this.doInitialization(result); this.doInitialization(result);
this._onInitialized.fire(); this._onInitialized.fire();
}, error => { }, error => {
this._notificationService.error(localize('tableDesigner.errorInitializingTableDesigner', "An error occured while initializing the table designer: {0}", error?.message ?? error)); this._errorMessageService.showDialog(Severity.Error, ErrorDialogTitle, localize('tableDesigner.errorInitializingTableDesigner', "An error occured while initializing the table designer: {0}", error?.message ?? error));
}); });
} }