diff --git a/docs/src/pages/changelog.mdx b/docs/src/pages/changelog.mdx index 8faf68813..913bf856b 100644 --- a/docs/src/pages/changelog.mdx +++ b/docs/src/pages/changelog.mdx @@ -7,6 +7,11 @@ route: /changelog ## v0.22 +### Upcoming Release + +- **Extension** + - Fixes webview resource. [#624](https://github.com/mtxr/vscode-sqltools/issues/624) + ### v0.22.9 - (Jun 22, 2020) - **Extension** diff --git a/packages/plugins/connection-manager/ui/screens/Results/Main.tsx b/packages/plugins/connection-manager/ui/screens/Results/Main.tsx index 8cf056e06..0ac97ee58 100644 --- a/packages/plugins/connection-manager/ui/screens/Results/Main.tsx +++ b/packages/plugins/connection-manager/ui/screens/Results/Main.tsx @@ -179,7 +179,7 @@ const Screen: React.SFC = () => { const columns = cols.map(title => ({ name: title, title })); return ( - 0 ? 'has-tabs' : ''}> + 1 ? 'has-tabs' : ''}> r.label || r.query)} onChange={toggleTab}/> {activeResult && implements Disposable - + - +
- - - + + + `; } @@ -61,7 +61,7 @@ export default abstract class WebviewProvider implements Disposable enableScripts: true, retainContextWhenHidden: true, // @OPTIMIZE remove and migrate to state restore enableCommandUris: true, - localResourceRoots: [Uri.file(path.resolve(Context.extensionPath, '..')).with({ scheme: 'vscode-resource' })], + localResourceRoots: [Uri.file(Context.extensionPath), Uri.file(path.resolve(Context.extensionPath, '..'))], // enableFindWidget: true, }, ); @@ -103,8 +103,10 @@ export default abstract class WebviewProvider implements Disposable return this.panel && this.panel.active; } - public get asWebviewUri() { - return this.panel ? this.panel.webview.asWebviewUri : (() => ''); + public prepareUrl(localResource: Uri | string) { + return this.panel && this.panel.webview + ? this.panel.webview.asWebviewUri(Uri.parse(localResource.toString())) + : null; } public hide = () => { if (this.panel === undefined) return;