Fix table view (#197)

mandel59 · web-flow · commit e93d7d9b9331 · 2021-11-06T15:53:35.000+01:00
* Update @types/vscode * Fix a type error * Pass correct localResourceRoots Fix #196. * Update vscode engine version to 1.61.0 * Use Node.js 14.x with GitHub Actions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Setup Node.js 10.x
-      uses: actions/setup-node@v1
+    - name: Setup Node.js 14.x
+      uses: actions/setup-node@v2
       with:
-        node-version: 10.x
+        node-version: '14'
     - name: Install
       run: |
         npm install
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -8,10 +8,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Setup Node.js 10.x
-      uses: actions/setup-node@v1
+    - name: Setup Node.js 14.x
+      uses: actions/setup-node@v2
       with:
-        node-version: 10.x
+        node-version: '14'
     - name: Install vsce and ovsx
       run: npm install --global vsce ovsx
     - name: Install
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
         "type": "git"
     },
     "engines": {
-        "vscode": "^1.30.0"
+        "vscode": "^1.61.0"
     },
     "categories": [
         "Other"
@@ -449,7 +449,7 @@
         "@types/jest": "^26.0.0",
         "@types/node": "^7.10.14",
         "@types/sqlite3": "^3.1.7",
-        "@types/vscode": "1.30.0",
+        "@types/vscode": "^1.61.0",
         "jest": "^26.0.0",
         "sqlite3": "^4.2.0",
         "ts-jest": "^26.0.0",
diff --git a/src/explorer/explorerTreeProvider.ts b/src/explorer/explorerTreeProvider.ts
@@ -17,7 +17,7 @@ export class ExplorerTreeProvider implements TreeDataProvider<Schema.Item> {
     }
     
     refresh(): void {
-        this._onDidChangeTreeData.fire();
+        this._onDidChangeTreeData.fire(undefined);
     }
 
     addToTree(database: Schema.Database) {
diff --git a/src/resultview/customview.ts b/src/resultview/customview.ts
@@ -8,8 +8,6 @@ export interface Message {
 }
 
 export class CustomView extends EventEmitter implements Disposable {
-    private resourceScheme = 'vscode-resource';
-
     private disposable?: Disposable;
 
     private resourcesPath: string;
@@ -36,7 +34,7 @@ export class CustomView extends EventEmitter implements Disposable {
                 <body>
                     <div id="root"></div>
                     <script>const RECORDS_PER_PAGE=${recordsPerPage || 20}</script>
-                    <script src="${(this.panel!.webview as any).asWebviewUri(Uri.file(jsPath)).toString()}"></script>
+                    <script src="${this.panel!.webview.asWebviewUri(Uri.file(jsPath)).toString()}"></script>
                 </body>
             </html>
         `;
@@ -63,7 +61,7 @@ export class CustomView extends EventEmitter implements Disposable {
         let options = {
             enableScripts: true,
             retainContextWhenHidden: true,
-            localResourceRoots: [Uri.file(this.resourcesPath).with({scheme: this.resourceScheme})]
+            localResourceRoots: [Uri.file(this.resourcesPath)]
         };
 
         this.panel = window.createWebviewPanel(this.type, this.title, ViewColumn.Two,

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ export class ExplorerTreeProvider implements TreeDataProvider<Schema.Item> {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`refresh(): void {`
`20`		`- this._onDidChangeTreeData.fire();`
	`20`	`+ this._onDidChangeTreeData.fire(undefined);`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`addToTree(database: Schema.Database) {`