Skip to content

Commit d81df59

Browse files
worksofliamworksofliam
committed
Remove legacy view
Signed-off-by: worksofliam <mrliamallan@live.co.uk>
1 parent 1bf06b0 commit d81df59

File tree

5 files changed

+48
-199
lines changed

5 files changed

+48
-199
lines changed

‎package.json

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -496,12 +496,6 @@
496496
"category": "Db2 for i",
497497
"icon": "$(gear)"
498498
},
499-
{
500-
"command": "vscode-db2i.dove.export",
501-
"title": "Export current VE data",
502-
"category": "Db2 for i",
503-
"icon": "$(file)"
504-
},
505499
{
506500
"command": "vscode-db2i.dove.node.copy",
507501
"title": "Copy value",
@@ -735,10 +729,6 @@
735729
"command": "vscode-db2i.dove.editSettings",
736730
"when": "vscode-db2i:explaining == true"
737731
},
738-
{
739-
"command": "vscode-db2i.dove.export",
740-
"when": "vscode-db2i:explaining == true"
741-
},
742732
{
743733
"command": "vscode-db2i.dove.node.copy",
744734
"when": "never"
@@ -835,11 +825,6 @@
835825
"group": "navigation@1",
836826
"when": "view == vscode-db2i.dove.nodes"
837827
},
838-
{
839-
"command": "vscode-db2i.dove.export",
840-
"group": "navigation@2",
841-
"when": "view == vscode-db2i.dove.nodes"
842-
},
843828
{
844829
"command": "vscode-db2i.dove.close",
845830
"group": "navigation@3",

‎src/views/results/explain/contributes.json

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,6 @@
106106
"category": "Db2 for i",
107107
"icon": "$(gear)"
108108
},
109-
{
110-
"command": "vscode-db2i.dove.export",
111-
"title": "Export current VE data",
112-
"category": "Db2 for i",
113-
"icon": "$(file)"
114-
},
115109
{
116110
"command": "vscode-db2i.dove.node.copy",
117111
"title": "Copy value",
@@ -133,10 +127,6 @@
133127
"command": "vscode-db2i.dove.editSettings",
134128
"when": "vscode-db2i:explaining == true"
135129
},
136-
{
137-
"command": "vscode-db2i.dove.export",
138-
"when": "vscode-db2i:explaining == true"
139-
},
140130
{
141131
"command": "vscode-db2i.dove.node.copy",
142132
"when": "never"
@@ -153,11 +143,6 @@
153143
"group": "navigation@1",
154144
"when": "view == vscode-db2i.dove.nodes"
155145
},
156-
{
157-
"command": "vscode-db2i.dove.export",
158-
"group": "navigation@2",
159-
"when": "view == vscode-db2i.dove.nodes"
160-
},
161146
{
162147
"command": "vscode-db2i.dove.close",
163148
"group": "navigation@3",

‎src/views/results/explain/doveResultsView.ts

Lines changed: 0 additions & 143 deletions
This file was deleted.

‎src/views/results/explain/icons.ts

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
2+
/**
3+
* Icon labels as defined by the API, along with the name of the icon to display.
4+
* Not surprisingly, the reference link does not provide a complete list of icons.
5+
* TODO: Add missing icons
6+
* @see https://www.ibm.com/docs/en/i/7.5?topic=ssw_ibm_i_75/apis/qqqvexpl.html#icon_labels
7+
* @see https://code.visualstudio.com/api/references/icons-in-labels
8+
*/
9+
const icons = {
10+
"Bitmap Merge": `merge`,
11+
"Cache": ``,
12+
"Cache Probe": ``,
13+
"Delete": `trash`,
14+
"Distinct": `list-flat`,
15+
"Dynamic Bitmap": `symbol-misc`,
16+
"Encoded Vector Index": `symbol-reference`,
17+
"Encoded Vector Index, Parallel": `symbol-reference`,
18+
"Final Select": `selection`,
19+
"Hash Grouping": `group-by-ref-type`,
20+
"Hash Join": `add`,
21+
"Hash Scan": `search`,
22+
"Index Grouping": `group-by-ref-type`,
23+
"Index Scan - Key Positioning": `key`,
24+
"Index Scan - Key Positioning, Parallel": `key`,
25+
"Index Scan - Key Selection": `key`,
26+
"Index Scan - Key Selection, Parallel": `key`,
27+
"Insert": `insert`,
28+
"Nested Loop Join": `add`,
29+
"Select": `selection`,
30+
"Skip Sequential Table Scan": `list-unordered`,
31+
"Skip Sequential Table Scan, Parallel": `list-unordered`,
32+
"Sort": `sort-precedence`,
33+
"Sorted List Scan": `list-ordered`,
34+
"Subquery Merge": `merge`,
35+
"Table Probe": `list-selection`,
36+
"Table Scan": `search`,
37+
"Table Scan, Parallel": `search`,
38+
"Temporary Distinct Hash Table": `new-file`,
39+
"Temporary Hash Table": `new-file`,
40+
"Temporary Index": `new-file`,
41+
"Temporary Sorted List": `list-ordered`,
42+
"Temporary Table": `new-file`,
43+
"Union Merge": `merge`,
44+
"User Defined Table Function": `symbol-function`,
45+
"Unknown": `question`,
46+
"Update": `replace`,
47+
"VALUES LIST": `list-flat`,
48+
}

‎src/views/results/index.ts

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import Document from "../../language/sql/document";
99
import { ObjectRef, ParsedEmbeddedStatement, StatementGroup, StatementType } from "../../language/sql/types";
1010
import Statement from "../../language/sql/statement";
1111
import { ExplainNode, ExplainTree } from "./explain/nodes";
12-
import { DoveResultsView, ExplainTreeItem } from "./explain/doveResultsView";
1312
import { DoveNodeView, PropertyNode } from "./explain/doveNodeView";
1413
import { DoveTreeDecorationProvider } from "./explain/doveTreeDecorationProvider";
1514
import { ResultSetPanelProvider } from "./resultSetPanelProvider";
@@ -42,8 +41,6 @@ export function setCancelButtonVisibility(visible: boolean) {
4241

4342
let resultSetProvider = new ResultSetPanelProvider();
4443
let explainTree: ExplainTree;
45-
let doveResultsView = new DoveResultsView();
46-
let doveResultsTreeView: TreeView<ExplainTreeItem> = doveResultsView.getTreeView();
4744
let doveNodeView = new DoveNodeView();
4845
let doveNodeTreeView: TreeView<PropertyNode> = doveNodeView.getTreeView();
4946
let doveTreeDecorationProvider = new DoveTreeDecorationProvider(); // Self-registers as a tree decoration providor
@@ -52,7 +49,6 @@ export function initialise(context: vscode.ExtensionContext) {
5249
setCancelButtonVisibility(false);
5350

5451
context.subscriptions.push(
55-
doveResultsTreeView,
5652
doveNodeTreeView,
5753

5854
vscode.window.registerWebviewViewProvider(`vscode-db2i.resultset`, resultSetProvider, {
@@ -91,17 +87,6 @@ export function initialise(context: vscode.ExtensionContext) {
9187
}
9288
}),
9389

94-
vscode.commands.registerCommand(`vscode-db2i.dove.close`, () => {
95-
doveResultsView.close();
96-
doveNodeView.close();
97-
}),
98-
99-
vscode.commands.registerCommand(`vscode-db2i.dove.displayDetails`, (explainTreeItem: ExplainTreeItem) => {
100-
// When the user clicks for details of a node in the tree, set the focus to that node as a visual indicator tying it to the details tree
101-
doveResultsTreeView.reveal(explainTreeItem, { select: false, focus: true, expand: true });
102-
doveNodeView.setNode(explainTreeItem.explainNode);
103-
}),
104-
10590
vscode.commands.registerCommand(`vscode-db2i.dove.node.copy`, (propertyNode: PropertyNode) => {
10691
if (propertyNode.description && typeof propertyNode.description === `string`) {
10792
vscode.env.clipboard.writeText(propertyNode.description);
@@ -117,15 +102,6 @@ export function initialise(context: vscode.ExtensionContext) {
117102
vscode.commands.executeCommand('workbench.action.openSettings', 'vscode-db2i.visualExplain');
118103
}),
119104

120-
vscode.commands.registerCommand(`vscode-db2i.dove.export`, () => {
121-
vscode.workspace.openTextDocument({
122-
language: `json`,
123-
content: JSON.stringify(doveResultsView.getRootExplainNode(), null, 2)
124-
}).then(doc => {
125-
vscode.window.showTextDocument(doc);
126-
});
127-
}),
128-
129105
vscode.commands.registerCommand(`vscode-db2i.dove.generateSqlForAdvisedIndexes`, () => {
130106
const scriptContent = generateSqlForAdvisedIndexes(explainTree);
131107

@@ -158,8 +134,6 @@ async function runHandler(options?: StatementInfo) {
158134
const optionsIsValid = (options?.content !== undefined);
159135
let editor = vscode.window.activeTextEditor;
160136

161-
vscode.commands.executeCommand('vscode-db2i.dove.close');
162-
163137
if (optionsIsValid || (editor && editor.document.languageId === `sql`)) {
164138
let chosenView = resultSetProvider;
165139

0 commit comments

Comments
 (0)