Skip to content

Update method modeling panel language when new db opened #3039

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
charisk merged 2 commits into from
Nov 1, 2023
Merged

Update method modeling panel language when new db opened #3039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9fb9f5
Update method modeling panel language when new db opened
charisk Nov 1, 2023
57fbb8e
Update method modeling panel database item when new db opened
charisk Nov 1, 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
7 changes: 6 additions & 1 deletion extensions/ql-vscode/src/model-editor/method-modeling/method-modeling-view-provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,11 +208,16 @@ export class MethodModelingViewProvider extends AbstractWebviewViewProvider<
);

this.push(
this.modelingEvents.onDbOpened(async () => {
this.modelingEvents.onDbOpened(async (databaseItem) => {
this.databaseItem = databaseItem;

await this.postMessage({
t: "setInModelingMode",
inModelingMode: true,
});

this.language = tryGetQueryLanguage(databaseItem.language);
await this.setViewState();
}),
);

Expand Down
12 changes: 7 additions & 5 deletions extensions/ql-vscode/src/model-editor/modeling-events.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ interface InProgressMethodsChangedEvent {

export class ModelingEvents extends DisposableObject {
public readonly onActiveDbChanged: AppEvent<void>;
public readonly onDbOpened: AppEvent<string>;
public readonly onDbOpened: AppEvent<DatabaseItem>;
public readonly onDbClosed: AppEvent<string>;
public readonly onMethodsChanged: AppEvent<MethodsChangedEvent>;
public readonly onHideModeledMethodsChanged: AppEvent<HideModeledMethodsChangedEvent>;
Expand All @@ -61,7 +61,7 @@ export class ModelingEvents extends DisposableObject {
public readonly onInProgressMethodsChanged: AppEvent<InProgressMethodsChangedEvent>;

private readonly onActiveDbChangedEventEmitter: AppEventEmitter<void>;
private readonly onDbOpenedEventEmitter: AppEventEmitter<string>;
private readonly onDbOpenedEventEmitter: AppEventEmitter<DatabaseItem>;
private readonly onDbClosedEventEmitter: AppEventEmitter<string>;
private readonly onMethodsChangedEventEmitter: AppEventEmitter<MethodsChangedEvent>;
private readonly onHideModeledMethodsChangedEventEmitter: AppEventEmitter<HideModeledMethodsChangedEvent>;
Expand All @@ -79,7 +79,9 @@ export class ModelingEvents extends DisposableObject {
);
this.onActiveDbChanged = this.onActiveDbChangedEventEmitter.event;

this.onDbOpenedEventEmitter = this.push(app.createEventEmitter<string>());
this.onDbOpenedEventEmitter = this.push(
app.createEventEmitter<DatabaseItem>(),
);
this.onDbOpened = this.onDbOpenedEventEmitter.event;

this.onDbClosedEventEmitter = this.push(app.createEventEmitter<string>());
Expand Down Expand Up @@ -130,8 +132,8 @@ export class ModelingEvents extends DisposableObject {
this.onActiveDbChangedEventEmitter.fire();
}

public fireDbOpenedEvent(dbUri: string) {
this.onDbOpenedEventEmitter.fire(dbUri);
public fireDbOpenedEvent(databaseItem: DatabaseItem) {
this.onDbOpenedEventEmitter.fire(databaseItem);
}

public fireDbClosedEvent(dbUri: string) {
Expand Down
2 changes: 1 addition & 1 deletion extensions/ql-vscode/src/model-editor/modeling-store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export class ModelingStore extends DisposableObject {
inProgressMethods: new Set(),
});

this.modelingEvents.fireDbOpenedEvent(dbUri);
this.modelingEvents.fireDbOpenedEvent(databaseItem);
}

public setActiveDb(databaseItem: DatabaseItem) {
Expand Down