mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Remove root 'remote' node

Browse Source
This commit is contained in:
Charis Kyriakou
2023-01-20 09:44:32 +00:00
parent 65623c07a2
commit 526c4f3ab7
3 changed files with 16 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/ql-vscode/src/databases/db-manager.ts
View File

@@ -58,9 +58,8 @@ export class DbManager {
const expandedItems = this.getExpandedItems();
return ValueResult.ok([
createRemoteTree(configResult.value, expandedItems),
]);
const remoteTree = createRemoteTree(configResult.value, expandedItems);
return ValueResult.ok(remoteTree.children);
}
public getConfigPath(): string {

67
extensions/ql-vscode/test/vscode-tests/minimal-workspace/databases/db-panel-rendering.test.ts
View File

@@ -57,26 +57,11 @@ describe("db panel rendering nodes", () => {
expect(dbTreeItems).toBeTruthy();
const items = dbTreeItems!;
expect(items.length).toBe(1);
expect(items.length).toBe(3);
const remoteRootNode = items[0];
expect(remoteRootNode.dbItem).toBeTruthy();
expect(remoteRootNode.dbItem?.kind).toBe(DbItemKind.RootRemote);
expect(remoteRootNode.label).toBe("remote");
expect(remoteRootNode.tooltip).toBe("Remote databases");
expect(remoteRootNode.collapsibleState).toBe(
TreeItemCollapsibleState.Collapsed,
);
expect(remoteRootNode.children).toBeTruthy();
expect(remoteRootNode.children.length).toBe(3);
const systemDefinedListItems = remoteRootNode.children.filter(
(item) => item.dbItem?.kind === DbItemKind.RemoteSystemDefinedList,
);
expect(systemDefinedListItems.length).toBe(3);
checkRemoteSystemDefinedListItem(systemDefinedListItems[0], 10);
checkRemoteSystemDefinedListItem(systemDefinedListItems[1], 100);
checkRemoteSystemDefinedListItem(systemDefinedListItems[2], 1000);
checkRemoteSystemDefinedListItem(items[0], 10);
checkRemoteSystemDefinedListItem(items[1], 100);
checkRemoteSystemDefinedListItem(items[2], 1000);
});
it("should render remote repository list nodes", async () => {
@@ -98,22 +83,12 @@ describe("db panel rendering nodes", () => {
const dbTreeItems = await dbTreeDataProvider.getChildren();
expect(dbTreeItems).toBeTruthy();
const remoteRootNode = dbTreeItems?.find(
(i) => i.dbItem?.kind === DbItemKind.RootRemote,
);
expect(remoteRootNode).toBeTruthy();
expect(remoteRootNode!.collapsibleState).toBe(
TreeItemCollapsibleState.Collapsed,
);
expect(remoteRootNode!.children).toBeTruthy();
expect(remoteRootNode!.children.length).toBe(5);
const systemDefinedListItems = remoteRootNode!.children.filter(
const systemDefinedListItems = dbTreeItems!.filter(
(item) => item.dbItem?.kind === DbItemKind.RemoteSystemDefinedList,
);
expect(systemDefinedListItems.length).toBe(3);
const userDefinedListItems = remoteRootNode!.children.filter(
const userDefinedListItems = dbTreeItems!.filter(
(item) => item.dbItem?.kind === DbItemKind.RemoteUserDefinedList,
);
expect(userDefinedListItems.length).toBe(2);
@@ -137,20 +112,9 @@ describe("db panel rendering nodes", () => {
const dbTreeItems = await dbTreeDataProvider.getChildren();
expect(dbTreeItems).toBeTruthy();
expect(dbTreeItems?.length).toBe(5);
const remoteRootNode = dbTreeItems?.find(
(i) => i.dbItem?.kind === DbItemKind.RootRemote,
);
expect(remoteRootNode).toBeTruthy();
expect(remoteRootNode!.dbItem).toBeTruthy();
expect(remoteRootNode!.collapsibleState).toBe(
TreeItemCollapsibleState.Collapsed,
);
expect(remoteRootNode!.children).toBeTruthy();
expect(remoteRootNode!.children.length).toBe(5);
const ownerListItems = remoteRootNode!.children.filter(
const ownerListItems = dbTreeItems!.filter(
(item) => item.dbItem?.kind === DbItemKind.RemoteOwner,
);
expect(ownerListItems.length).toBe(2);
@@ -167,20 +131,9 @@ describe("db panel rendering nodes", () => {
const dbTreeItems = await dbTreeDataProvider.getChildren();
expect(dbTreeItems).toBeTruthy();
expect(dbTreeItems!.length).toBe(5);
const remoteRootNode = dbTreeItems?.find(
(i) => i.dbItem?.kind === DbItemKind.RootRemote,
);
expect(remoteRootNode).toBeTruthy();
expect(remoteRootNode!.dbItem).toBeTruthy();
expect(remoteRootNode!.collapsibleState).toBe(
TreeItemCollapsibleState.Collapsed,
);
expect(remoteRootNode!.children).toBeTruthy();
expect(remoteRootNode!.children.length).toBe(5);
const repoItems = remoteRootNode!.children.filter(
const repoItems = dbTreeItems!.filter(
(item) => item.dbItem?.kind === DbItemKind.RemoteRepo,
);
expect(repoItems.length).toBe(2);

16
extensions/ql-vscode/test/vscode-tests/no-workspace/databases/db-panel-selection.test.ts
View File

@@ -75,16 +75,12 @@ describe("db panel selection", () => {
expect(dbTreeItems).toBeTruthy();
const items = dbTreeItems!;
const remoteRootNode = items[0];
expect(remoteRootNode.dbItem).toBeTruthy();
expect(remoteRootNode.dbItem?.kind).toEqual(DbItemKind.RootRemote);
const list1 = remoteRootNode.children.find(
const list1 = items.find(
(c) =>
c.dbItem?.kind === DbItemKind.RemoteUserDefinedList &&
c.dbItem?.listName === "my-list-1",
);
const list2 = remoteRootNode.children.find(
const list2 = items.find(
(c) =>
c.dbItem?.kind === DbItemKind.RemoteUserDefinedList &&
c.dbItem?.listName === "my-list-2",
@@ -123,11 +119,7 @@ describe("db panel selection", () => {
expect(dbTreeItems).toBeTruthy();
const items = dbTreeItems!;
const remoteRootNode = items[0];
expect(remoteRootNode.dbItem).toBeTruthy();
expect(remoteRootNode.dbItem?.kind).toEqual(DbItemKind.RootRemote);
const list2 = remoteRootNode.children.find(
const list2 = items.find(
(c) =>
c.dbItem?.kind === DbItemKind.RemoteUserDefinedList &&
c.dbItem?.listName === "my-list-2",
@@ -150,7 +142,7 @@ describe("db panel selection", () => {
expect(repo2Node).toBeTruthy();
expect(isTreeViewItemSelectable(repo2Node!)).toBeTruthy();
for (const item of remoteRootNode.children) {
for (const item of items) {
expect(isTreeViewItemSelectable(item)).toBeTruthy();
}
});