Skip to content

Minor refactoring for expanded things #1949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
norascheuch merged 4 commits into from
Jan 12, 2023
Merged

Minor refactoring for expanded things #1949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b9740fe
Use individual functions for add and remove from expanded state
norascheuch Jan 11, 2023
c36da4b
Rename arguments
norascheuch Jan 11, 2023
ba830dd
Fix expanded bug when renaming lists
norascheuch Jan 11, 2023
5c40293
Revert "Rename arguments"
norascheuch Jan 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 27 additions & 15 deletions extensions/ql-vscode/src/databases/db-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,24 +78,21 @@ export class DbManager {
public async removeDbItem(dbItem: DbItem): Promise<void> {
await this.dbConfigStore.removeDbItem(dbItem);

// Updating the expanded items takes care of cleaning up
// any non-existent items.
await this.updateExpandedItems(this.getExpandedItems());
await this.removeDbItemFromExpandedState(dbItem);
}

public async updateDbItemExpandedState(
dbItem: DbItem,
itemExpanded: boolean,
): Promise<void> {
const currentExpandedItems = this.getExpandedItems();
public async removeDbItemFromExpandedState(dbItem: DbItem): Promise<void> {
// When collapsing or expanding a list we clean up the expanded state and remove
// all items that don't exist anymore.

const newExpandedItems = updateExpandedItem(
currentExpandedItems,
dbItem,
itemExpanded,
);
await this.updateDbItemExpandedState(dbItem, false);
}

await this.updateExpandedItems(newExpandedItems);
public async addDbItemToExpandedState(dbItem: DbItem): Promise<void> {
// When collapsing or expanding a list we clean up the expanded state and remove
// all items that don't exist anymore.

await this.updateDbItemExpandedState(dbItem, true);
}

public async addNewRemoteRepo(
Expand Down Expand Up @@ -142,7 +139,7 @@ export class DbManager {
newDbItem,
);

await this.updateExpandedItems(newExpandedItems);
await this.setExpandedItems(newExpandedItems);
}

public async renameLocalDb(
Expand Down Expand Up @@ -214,4 +211,19 @@ export class DbManager {

await this.setExpandedItems(itemsToStore);
}

private async updateDbItemExpandedState(
dbItem: DbItem,
itemExpanded: boolean,
): Promise<void> {
const currentExpandedItems = this.getExpandedItems();

const newExpandedItems = updateExpandedItem(
currentExpandedItems,
dbItem,
itemExpanded,
);

await this.updateExpandedItems(newExpandedItems);
}
}
4 changes: 2 additions & 2 deletions extensions/ql-vscode/src/databases/ui/db-panel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ export class DbPanel extends DisposableObject {
throw Error("Expected a database item.");
}

await this.dbManager.updateDbItemExpandedState(event.element.dbItem, false);
await this.dbManager.removeDbItemFromExpandedState(event.element.dbItem);
}

private async onDidExpandElement(
Expand All @@ -397,7 +397,7 @@ export class DbPanel extends DisposableObject {
throw Error("Expected a database item.");
}

await this.dbManager.updateDbItemExpandedState(event.element.dbItem, true);
await this.dbManager.addDbItemToExpandedState(event.element.dbItem);
}

/**
Expand Down