More Layering (#9139)

* move handling generated files to the serilization classes

* remove unneeded methods

* add more folders to strictire compile, add more strict compile options

* update ci

* wip

* add more layering and fix issues

* add more strictness

* remove unnecessary assertion

* add missing checks

* fix indentation

* wip

* remove jsdoc

* fix layering

* fix compile

* fix compile errors

* wip

* wip

* finish layering

* fix css

* more layering

* rip

* reworking results serializer

* move some files around

* move capabilities to platform wip

* implement capabilities register provider

* fix capabilities service

* fix usage of the regist4ry

* add contribution

* wip

* wip

* wip

* remove no longer good parts

* fix strict-nulls

* fix issues with startup

* another try

* fix startup

* fix imports

* fix tests

* fix tests

* fix more tests

* fix tests

* fix more tests

* fix broken test

* fix tabbing

* fix naming

* wip

* finished layering

* fix imports

* fix valid layers

* fix layers

src/sql/workbench/contrib/backup/browser/backup.component.ts

@@ -18,7 +18,7 @@ import { IBackupService, TaskExecutionMode } from 'sql/platform/backup/common/ba
 import * as FileValidationConstants from 'sql/workbench/services/fileBrowser/common/fileValidationServiceConstants';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { IFileBrowserDialogController } from 'sql/workbench/services/fileBrowser/common/fileBrowserDialogController';
-import { IBackupUiService } from 'sql/workbench/services/backup/common/backupUiService';
+import { IBackupUiService } from 'sql/workbench/contrib/backup/common/backupUiService';
 import * as cr from 'vs/platform/theme/common/colorRegistry';
 
 import { MessageType } from 'vs/base/browser/ui/inputbox/inputBox';
@@ -33,6 +33,7 @@ import { KeyCode } from 'vs/base/common/keyCodes';
 import { ITheme } from 'vs/platform/theme/common/themeService';
 import { AngularDisposable } from 'sql/base/browser/lifecycle';
 import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
+import { fileFiltersSet } from 'sql/workbench/services/restore/common/constants';
 
 export const BACKUP_SELECTOR: string = 'backup-component';
 
@@ -654,7 +655,7 @@ export class BackupComponent extends AngularDisposable {
 	private onAddClick(): void {
 		this.fileBrowserDialogService.showDialog(this._uri,
 			this.defaultNewBackupFolder,
-			BackupConstants.fileFiltersSet,
+			fileFiltersSet,
 			FileValidationConstants.backup,
 			false,
 			(filepath => this.handlePathAdded(filepath)));

src/sql/workbench/contrib/backup/browser/backup.contribution.ts

@@ -14,10 +14,10 @@ import { MssqlNodeContext } from 'sql/workbench/services/objectExplorer/browser/
 import { NodeType } from 'sql/workbench/services/objectExplorer/common/nodeType';
 import { mssqlProviderName } from 'sql/platform/connection/common/constants';
 import { localize } from 'vs/nls';
-import { OEAction } from 'sql/workbench/contrib/objectExplorer/browser/objectExplorerActions';
-import { TreeNodeContextKey } from 'sql/workbench/contrib/objectExplorer/common/treeNodeContextKey';
+import { OEAction } from 'sql/workbench/services/objectExplorer/browser/objectExplorerActions';
+import { TreeNodeContextKey } from 'sql/workbench/services/objectExplorer/common/treeNodeContextKey';
 import { ConnectionContextKey } from 'sql/workbench/services/connection/common/connectionContextKey';
-import { ServerInfoContextKey } from 'sql/workbench/contrib/connection/common/serverInfoContextKey';
+import { ServerInfoContextKey } from 'sql/workbench/services/connection/common/serverInfoContextKey';
 import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { DatabaseEngineEdition } from 'sql/workbench/api/common/sqlExtHostTypes';
 

src/sql/workbench/contrib/backup/browser/backupActions.ts

@@ -13,7 +13,7 @@ import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/br
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { getCurrentGlobalConnection } from 'sql/workbench/browser/taskUtilities';
 import { mssqlProviderName } from 'sql/platform/connection/common/constants';
-import { IBackupUiService } from 'sql/workbench/services/backup/common/backupUiService';
+import { IBackupUiService } from 'sql/workbench/contrib/backup/common/backupUiService';
 import { Task } from 'sql/workbench/services/tasks/browser/tasksRegistry';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';

src/sql/workbench/contrib/backup/browser/backupUiService.ts

@@ -0,0 +1,124 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Event, Emitter } from 'vs/base/common/event';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+
+import * as azdata from 'azdata';
+
+import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
+import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
+import * as ConnectionUtils from 'sql/platform/connection/common/utils';
+import { ProviderConnectionInfo } from 'sql/platform/connection/common/providerConnectionInfo';
+import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
+import { BackupDialog } from 'sql/workbench/contrib/backup/browser/backupDialog';
+import { OptionsDialog } from 'sql/workbench/browser/modal/optionsDialog';
+import { IBackupService, TaskExecutionMode } from 'sql/platform/backup/common/backupService';
+import { IBackupUiService } from 'sql/workbench/contrib/backup/common/backupUiService';
+import { find } from 'vs/base/common/arrays';
+
+export class BackupUiService implements IBackupUiService {
+	public _serviceBrand: undefined;
+	private _backupDialogs: { [providerName: string]: BackupDialog | OptionsDialog } = {};
+	private _currentProvider: string;
+	private _optionValues: { [optionName: string]: any } = {};
+	private _connectionUri: string;
+	private static _connectionUniqueId: number = 0;
+
+	private _onShowBackupEvent: Emitter<{ connection: IConnectionProfile, ownerUri: string }>;
+	public get onShowBackupEvent(): Event<{ connection: IConnectionProfile, ownerUri: string }> { return this._onShowBackupEvent.event; }
+
+	constructor(
+		@IInstantiationService private _instantiationService: IInstantiationService,
+		@ICapabilitiesService private _capabilitiesService: ICapabilitiesService,
+		@IBackupService private _disasterRecoveryService: IBackupService,
+		@IConnectionManagementService private _connectionManagementService: IConnectionManagementService
+	) {
+		this._onShowBackupEvent = new Emitter<{ connection: IConnectionProfile, ownerUri: string }>();
+	}
+
+	public showBackup(connection: IConnectionProfile): Promise<any> {
+		let self = this;
+		return new Promise<void>((resolve, reject) => {
+			self.showBackupDialog(connection).then(() => {
+				resolve(void 0);
+			}, error => {
+				reject();
+			});
+		});
+	}
+
+	private getOptions(provider: string): azdata.ServiceOption[] {
+		let feature = find(this._capabilitiesService.getLegacyCapabilities(this._currentProvider).features, f => f.featureName === 'backup');
+		if (feature) {
+			return feature.optionsMetadata;
+		} else {
+			return undefined;
+		}
+	}
+
+	public async showBackupDialog(connection: IConnectionProfile): Promise<void> {
+		let self = this;
+		self._connectionUri = ConnectionUtils.generateUri(connection);
+		self._currentProvider = connection.providerName;
+		let backupDialog = self._backupDialogs[self._currentProvider];
+		if (!backupDialog) {
+			let backupOptions = this.getOptions(this._currentProvider);
+			if (backupOptions) {
+				backupDialog = self._instantiationService ? self._instantiationService.createInstance(
+					OptionsDialog, 'Backup database - ' + connection.serverName + ':' + connection.databaseName, 'BackupOptions', undefined) : undefined;
+				backupDialog.onOk(() => this.handleOptionDialogClosed());
+			}
+			else {
+				backupDialog = self._instantiationService ? self._instantiationService.createInstance(BackupDialog) : undefined;
+			}
+			backupDialog.render();
+			self._backupDialogs[self._currentProvider] = backupDialog;
+		}
+
+		let backupOptions = this.getOptions(this._currentProvider);
+		let uri = this._connectionManagementService.getConnectionUri(connection)
+			+ ProviderConnectionInfo.idSeparator
+			+ ConnectionUtils.ConnectionUriBackupIdAttributeName
+			+ ProviderConnectionInfo.nameValueSeparator
+			+ BackupUiService._connectionUniqueId;
+
+		this._connectionUri = uri;
+
+		BackupUiService._connectionUniqueId++;
+
+		if (backupOptions) {
+			(backupDialog as OptionsDialog).open(backupOptions, self._optionValues);
+		} else {
+			(backupDialog as BackupDialog).open(connection);
+		}
+
+		// Create connection if needed
+		if (!this._connectionManagementService.isConnected(uri)) {
+			await this._connectionManagementService.connect(connection, uri);
+			this._onShowBackupEvent.fire({ connection: connection, ownerUri: uri });
+		}
+	}
+
+	public onShowBackupDialog() {
+		let backupDialog = this._backupDialogs[this._currentProvider];
+		if (backupDialog) {
+			backupDialog.setInitialFocusedElement();
+		}
+	}
+
+	public closeBackup() {
+		let self = this;
+		let backupDialog = self._backupDialogs[self._currentProvider];
+		if (backupDialog) {
+			backupDialog.close();
+		}
+	}
+
+	private handleOptionDialogClosed() {
+		this._disasterRecoveryService.backup(this._connectionUri, this._optionValues, TaskExecutionMode.executeAndScript);
+	}
+
+}

src/sql/workbench/contrib/backup/common/backupUiService.ts

@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
+import { Event } from 'vs/base/common/event';
+
+export const UI_SERVICE_ID = 'backupUiService';
+export const IBackupUiService = createDecorator<IBackupUiService>(UI_SERVICE_ID);
+
+export interface IBackupUiService {
+	_serviceBrand: undefined;
+
+	/**
+	 * Show backup wizard
+	 */
+	showBackup(connection: IConnectionProfile): Promise<any>;
+
+	/**
+	 * On show backup event
+	 */
+	onShowBackupEvent: Event<{ connection: IConnectionProfile, ownerUri: string }>;
+
+	/**
+	 * Close backup wizard
+	 */
+	closeBackup();
+
+	/**
+	 * After the backup dialog is rendered, run Modal methods to set focusable elements, etc.
+	 */
+	onShowBackupDialog();
+}

src/sql/workbench/contrib/backup/common/constants.ts

@@ -43,7 +43,3 @@ export const tripleDES = 'Triple DES';
 export const serverCertificate = localize('backup.serverCertificate', "Server Certificate");
 export const asymmetricKey = localize('backup.asymmetricKey', "Asymmetric Key");
 
-export const fileFiltersSet: { label: string, filters: string[] }[] = [
-	{ label: localize('backup.filterBackupFiles', "Backup Files"), filters: ['*.bak', '*.trn', '*.log'] },
-	{ label: localize('backup.allFiles', "All Files"), filters: ['*'] }
-];