Merge pull request #657 from q-masters/development

Release 1.6.0
q-masters · Nov 1, 2020 · b4beb97 · b4beb97
2 parents c504d32 + bc387be
commit b4beb97
Show file tree

Hide file tree

Showing 38 changed files with 1,531 additions and 828 deletions.
diff --git a/src/package-lock.json b/src/package-lock.json
diff --git a/src/package.json b/src/package.json
@@ -109,8 +109,9 @@
                 "dimensions": true,
                 "measures": true,
                 "script": true,
-                "sheets": false,
-                "variables": false
+                "sheets": true,
+                "variables": true,
+                "visualization": true
               }
             }]
           }
@@ -122,13 +123,13 @@
         {
           "command": "VsQlik.Script.LoadData",
           "group": "navigation",
-          "when": "resourceScheme == 'qix' && resourceFilename == 'main.qvs'"
+          "when": "resourceScheme == 'qix' && resourceFilename == 'main.qvs' && !isInDiffEditor"
         }
       ],
       "commandPalette": [
         {
           "command": "VsQlik.Script.LoadData",
-          "when": "resourceScheme == 'qix' && resourceFilename == 'main.qvs'"
+          "when": "resourceScheme == 'qix' && resourceFilename == 'main.qvs' && !isInDiffEditor"
         }
       ]
     },
@@ -167,34 +168,34 @@
   "devDependencies": {
     "@types/chai": "4.2.14",
     "@types/enigma.js": "2.2.1",
-    "@types/node": "14.11.10",
+    "@types/node": "14.14.6",
     "@types/node-fetch": "^2.5.7",
     "@types/qlik-engineapi": "12.67.9",
     "@types/request": "2.48.5",
     "@types/sinon": "9.0.8",
     "@types/triple-beam": "^1.3.2",
     "@types/vscode": "1.45.1",
-    "@types/ws": "7.2.7",
+    "@types/ws": "7.2.9",
     "@typescript-eslint/eslint-plugin": "4.0.0",
     "@typescript-eslint/parser": "3.10.1",
     "chai": "4.2.0",
     "chalk": "4.1.0",
     "copyfiles": "2.4.0",
     "deepmerge": "4.2.2",
-    "eslint": "7.11.0",
+    "eslint": "7.12.1",
     "html-loader": "1.3.2",
     "minimist": "1.2.5",
     "mocha": "8.2.0",
     "rimraf": "3.0.2",
-    "sinon": "9.2.0",
-    "ts-loader": "8.0.6",
+    "sinon": "9.2.1",
+    "ts-loader": "8.0.7",
     "ts-node": "9.0.0",
     "tsconfig-paths": "3.9.0",
     "tsconfig-paths-webpack-plugin": "3.3.0",
     "tslint": "6.1.3",
-    "typescript": "4.0.3",
+    "typescript": "4.0.5",
     "vsce": "1.81.1",
-    "webpack": "^5.1.3",
+    "webpack": "^5.3.2",
     "webpack-cli": "4.1.0"
   },
   "dependencies": {

diff --git a/src/projects/extension/connection/api/index.ts b/src/projects/extension/connection/api/index.ts
@@ -10,6 +10,7 @@ export interface DisplaySettings {
     script: boolean;
     sheets: boolean;
     variables: boolean;
+    visualization: boolean;
 }
 
 /** connection settings */