Port file dialog changes to release branch (#96)

* Add ability to only show folders in File Browser dialogs (#95)

* Add built files

Author: corivera

lib/main.js

@@ -925,8 +925,8 @@ class FileBrowserFeature extends SqlOpsFeature {
     }
     registerProvider(options) {
         const client = this._client;
-        let openFileBrowser = (ownerUri, expandPath, fileFilters, changeFilter) => {
-            let params = { ownerUri, expandPath, fileFilters, changeFilter };
+        let openFileBrowser = (ownerUri, expandPath, fileFilters, changeFilter, showFoldersOnly) => {
+            let params = { ownerUri, expandPath, fileFilters, changeFilter, showFoldersOnly };
             return client.sendRequest(protocol.FileBrowserOpenRequest.type, params).then(r => r, e => {
                 client.logFailedRequest(protocol.FileBrowserOpenRequest.type, e);
                 return Promise.resolve(undefined);

lib/types.d.ts

@@ -121,6 +121,7 @@ export interface FileBrowserOpenParams {
     expandPath: string;
     fileFilters: string[];
     changeFilter: boolean;
+    showFoldersOnly?: boolean;
 }
 export interface FileTreeNode {
     children: FileTreeNode[];

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dataprotocol-client",
-  "version": "1.3.6",
+  "version": "1.3.8",
   "description": "Client data protocol implementation for Azure Data Studio",
   "main": "lib/main",
   "typings": "lib/main",

src/azdata.proposed.d.ts

@@ -661,12 +661,7 @@ declare module 'azdata' {
 		type?: ExtensionNodeType;
 	}
 
-	export interface AccountKey {
-		/**
-		 * Auth Library used to add the account
-		 */
-		authLibrary?: string;
-	}
+	export interface Component extends vscode.Disposable { }
 
 	export namespace workspace {
 		/**
@@ -694,6 +689,25 @@ declare module 'azdata' {
 		headerFilter?: boolean,
 	}
 
+	export type ExecutionPlanData = executionPlan.ExecutionPlanGraphInfo | executionPlan.ExecutionPlanGraph[];
+
+	export interface ExecutionPlanComponentProperties extends ComponentProperties {
+		/**
+		 * Provide the execution plan file to be displayed. In case of execution plan graph info, the file type will determine the provider to be used to generate execution plan graphs
+		 */
+		data?: ExecutionPlanData;
+	}
+
+	/**
+	 * Defines the executionPlan component
+	 */
+	export interface ExecutionPlanComponent extends Component, ExecutionPlanComponentProperties {
+	}
+
+	export interface ModelBuilder {
+		executionPlan(): ComponentBuilder<ExecutionPlanComponent, ExecutionPlanComponentProperties>;
+	}
+
 	export interface ListViewOption {
 		/**
 		 * The optional accessibility label for the column. Default is the label for the list view option.
@@ -853,18 +867,14 @@ declare module 'azdata' {
 		 * Whether to include the column headers.
 		 */
 		includeHeaders: boolean
-		/**
-		 * Whether to remove line breaks from the cell value.
-		 */
-		removeNewLines: boolean;
 		/**
 		 * The selected ranges to be copied.
 		 */
 		selections: SelectionRange[];
 	}
 
 	export interface CopyResultsRequestResult {
-		/** 
+		/**
 		 * Result string from copy operation
 		 */
 		results: string;
@@ -886,12 +896,19 @@ declare module 'azdata' {
 
 	export enum DataProviderType {
 		TableDesignerProvider = 'TableDesignerProvider',
-		ExecutionPlanProvider = 'ExecutionPlanProvider'
+		ExecutionPlanProvider = 'ExecutionPlanProvider',
+		ServerContextualizationProvider = 'ServerContextualizationProvider'
 	}
 
 	export namespace dataprotocol {
 		export function registerTableDesignerProvider(provider: designers.TableDesignerProvider): vscode.Disposable;
 		export function registerExecutionPlanProvider(provider: executionPlan.ExecutionPlanProvider): vscode.Disposable;
+		/**
+		 * Registers a server contextualization provider, which can provide context about a server to extensions like GitHub
+		 * Copilot for improved suggestions.
+		 * @param provider The provider to register
+		 */
+		export function registerServerContextualizationProvider(provider: contextualization.ServerContextualizationProvider): vscode.Disposable;
 	}
 
 	export namespace designers {
@@ -900,8 +917,9 @@ declare module 'azdata' {
 		 * @param providerId The table designer provider Id.
 		 * @param tableInfo The table information. The object will be passed back to the table designer provider as the unique identifier for the table.
 		 * @param telemetryInfo Optional Key-value pair containing any extra information that needs to be sent via telemetry
+		 * @param objectExplorerContext Optional The context used to refresh Object Explorer after the table is created or edited
 		 */
-		export function openTableDesigner(providerId: string, tableInfo: TableInfo, telemetryInfo?: { [key: string]: string }): Thenable<void>;
+		export function openTableDesigner(providerId: string, tableInfo: TableInfo, telemetryInfo?: { [key: string]: string }, objectExplorerContext?: ObjectExplorerContext): Thenable<void>;
 
 		/**
 		 * Definition for the table designer provider.
@@ -1771,6 +1789,23 @@ declare module 'azdata' {
 		}
 	}
 
+	export namespace contextualization {
+		export interface GetServerContextualizationResult {
+			/**
+			 * The retrieved server context.
+			 */
+			context: string | undefined;
+		}
+
+		export interface ServerContextualizationProvider extends DataProvider {
+			/**
+			 * Gets server context, which can be in the form of create scripts but is left up each provider.
+			 * @param ownerUri The URI of the connection to get context for.
+			 */
+			getServerContextualization(ownerUri: string): Thenable<GetServerContextualizationResult>;
+		}
+	}
+
 	/**
 	 * Component to display text with an icon representing the severity
 	 */
@@ -1824,14 +1859,21 @@ declare module 'azdata' {
 		/**
 		 * Corresponds to the aria-live accessibility attribute for this component
 		 */
-		ariaLive?: AriaLiveValue
+		ariaLive?: AriaLiveValue;
 	}
 
 	export interface ContainerProperties extends ComponentProperties {
 		/**
 		 * Corresponds to the aria-live accessibility attribute for this component
 		 */
-		ariaLive?: AriaLiveValue
+		ariaLive?: AriaLiveValue;
+	}
+
+	export interface DropDownProperties {
+		/**
+		 * Whether or not an option in the list must be selected or a "new" option can be set. Only applicable when 'editable' is true. Default false.
+		 */
+		strictSelection?: boolean;
 	}
 
 	export interface NodeInfo {
@@ -1926,16 +1968,24 @@ declare module 'azdata' {
 		NotBetween = 7,
 		Contains = 8,
 		NotContains = 9,
-		IsNull = 10,
-		IsNotNull = 11
+		StartsWith = 10,
+		NotStartsWith = 11,
+		EndsWith = 12,
+		NotEndsWith = 13
 	}
 
+	export interface ModelView extends vscode.Disposable { }
+
+	export interface DeclarativeTableMenuCellValue extends vscode.Disposable { }
+
 	export namespace window {
-		export interface Wizard extends LoadingComponentBase {
-		}
+		export interface Wizard extends LoadingComponentBase { }
 
-		export interface Dialog extends LoadingComponentBase {
-		}
+		export interface Dialog extends LoadingComponentBase, vscode.Disposable { }
+
+		export interface ModelViewPanel extends vscode.Disposable { }
+
+		export interface ModelViewDashboard extends vscode.Disposable { }
 
 		/**
 		 * Opens the error dialog with customization options provided.
@@ -2000,6 +2050,32 @@ declare module 'azdata' {
 			 */
 			isPrimary: boolean;
 		}
+
+		export interface FileFilters {
+			/**
+			 * The label to display in the file filter field next to the list of filters.
+			 */
+			label: string;
+			/**
+			 * The filters to limit what files are visible in the file browser (e.g. '*.sql' for SQL files).
+			 */
+			filters: string[];
+		}
+
+		/**
+		 * Opens a dialog to select a file path on the specified server's machine. Note: The dialog for just browsing local
+		 * files without any connection is opened via vscode.window.showOpenDialog.
+		 * @param connectionUri The URI of the connection to the target server
+		 * @param targetPath The file path on the server machine to open by default in the dialog
+		 * @param fileFilters The filters used to limit which files are displayed in the file browser
+		 * @param showFoldersOnly Optional argument to specify whether the browser should only show folders
+		 * @returns The path of the file chosen from the dialog, and undefined if the dialog is closed without selecting anything.
+		 */
+		export function openServerFileBrowserDialog(connectionUri: string, targetPath: string, fileFilters: FileFilters[], showFoldersOnly?: boolean): Thenable<string | undefined>;
+	}
+
+	export interface FileBrowserProvider extends DataProvider {
+		openFileBrowser(ownerUri: string, expandPath: string, fileFilters: string[], changeFilter: boolean, showFoldersOnly?: boolean): Thenable<boolean>;
 	}
 
 	export interface TableComponent {
@@ -2008,4 +2084,21 @@ declare module 'azdata' {
 		 */
 		setActiveCell(row: number, column: number): void;
 	}
+
+	export interface ProfilerProvider {
+		startSession(sessionId: string, sessionName: string, sessionType?: ProfilingSessionType): Thenable<boolean>;
+	}
+
+	export enum ProfilingSessionType {
+		RemoteSession = 0,
+		LocalFile = 1
+	}
+
+	export interface SplitViewLayout extends FlexLayout {
+		/**
+		 * SplitView size. Height if the orientation is vertical, width if the orientation is horizontal
+		 * If undefined, the size of the model view container is used
+		 */
+		splitViewSize?: number | string | undefined;
+	}
 }

src/main.ts

@@ -1267,8 +1267,8 @@ export class FileBrowserFeature extends SqlOpsFeature<undefined> {
 	protected registerProvider(options: undefined): Disposable {
 		const client = this._client;
 
-		let openFileBrowser = (ownerUri: string, expandPath: string, fileFilters: string[], changeFilter: boolean): Thenable<boolean> => {
-			let params: types.FileBrowserOpenParams = { ownerUri, expandPath, fileFilters, changeFilter };
+		let openFileBrowser = (ownerUri: string, expandPath: string, fileFilters: string[], changeFilter: boolean, showFoldersOnly?: boolean): Thenable<boolean> => {
+			let params: types.FileBrowserOpenParams = { ownerUri, expandPath, fileFilters, changeFilter, showFoldersOnly };
 			return client.sendRequest(protocol.FileBrowserOpenRequest.type, params).then(
 				r => r,
 				e => {

src/types.ts

@@ -184,6 +184,7 @@ export interface FileBrowserOpenParams {
 	expandPath: string;
 	fileFilters: string[];
 	changeFilter: boolean;
+	showFoldersOnly?: boolean;
 }
 
 export interface FileTreeNode {