From b0eab8b9fed827a565abb1b4985d3a8a2db24df2 Mon Sep 17 00:00:00 2001 From: Koen Vlaswinkel Date: Fri, 8 Sep 2023 13:34:08 +0200 Subject: [PATCH 1/2] Set loading state when switching between modes --- extensions/ql-vscode/src/view/model-editor/ModelEditor.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/ql-vscode/src/view/model-editor/ModelEditor.tsx b/extensions/ql-vscode/src/view/model-editor/ModelEditor.tsx index 93ae469f117..02579e4cacf 100644 --- a/extensions/ql-vscode/src/view/model-editor/ModelEditor.tsx +++ b/extensions/ql-vscode/src/view/model-editor/ModelEditor.tsx @@ -281,6 +281,7 @@ export function ModelEditor({ t: "switchMode", mode: newMode, }); + setMethods([]); }, [viewState?.mode]); const onHideModeledApis = useCallback(() => { From 3157ffab88fe6c2f8c65fc5da6220da42ae51eb5 Mon Sep 17 00:00:00 2001 From: Koen Vlaswinkel Date: Fri, 8 Sep 2023 14:20:45 +0200 Subject: [PATCH 2/2] Set empty array in ModelEditorView --- extensions/ql-vscode/src/model-editor/model-editor-view.ts | 5 +++++ extensions/ql-vscode/src/view/model-editor/ModelEditor.tsx | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/extensions/ql-vscode/src/model-editor/model-editor-view.ts b/extensions/ql-vscode/src/model-editor/model-editor-view.ts index 477ec30e585..7767cc9007a 100644 --- a/extensions/ql-vscode/src/model-editor/model-editor-view.ts +++ b/extensions/ql-vscode/src/model-editor/model-editor-view.ts @@ -277,7 +277,12 @@ export class ModelEditorView extends AbstractWebview< break; case "switchMode": this.mode = msg.mode; + this.methods = []; await Promise.all([ + this.postMessage({ + t: "setMethods", + methods: this.methods, + }), this.setViewState(), withProgress((progress) => this.loadExternalApiUsages(progress), { cancellable: false, diff --git a/extensions/ql-vscode/src/view/model-editor/ModelEditor.tsx b/extensions/ql-vscode/src/view/model-editor/ModelEditor.tsx index 02579e4cacf..93ae469f117 100644 --- a/extensions/ql-vscode/src/view/model-editor/ModelEditor.tsx +++ b/extensions/ql-vscode/src/view/model-editor/ModelEditor.tsx @@ -281,7 +281,6 @@ export function ModelEditor({ t: "switchMode", mode: newMode, }); - setMethods([]); }, [viewState?.mode]); const onHideModeledApis = useCallback(() => {