Merge pull request #2947 from github/koesie10/update-set-selected-method-message

Convert `SetSelectedMethodMessage` to include multiple modeled methods

Author: koesie10

extensions/ql-vscode/src/common/interface-types.ts

@@ -577,6 +577,12 @@ interface SetModeledMethodMessage {
   method: ModeledMethod;
 }
 
+interface SetMultipleModeledMethodsMessage {
+  t: "setMultipleModeledMethods";
+  methodSignature: string;
+  modeledMethods: ModeledMethod[];
+}
+
 interface SetInModelingModeMessage {
   t: "setInModelingMode";
   inModelingMode: boolean;
@@ -643,14 +649,14 @@ interface SetMethodModifiedMessage {
 interface SetSelectedMethodMessage {
   t: "setSelectedMethod";
   method: Method;
-  modeledMethod?: ModeledMethod;
+  modeledMethods: ModeledMethod[];
   isModified: boolean;
 }
 
 export type ToMethodModelingMessage =
   | SetMethodModelingPanelViewStateMessage
   | SetMethodMessage
-  | SetModeledMethodMessage
+  | SetMultipleModeledMethodsMessage
   | SetMethodModifiedMessage
   | SetSelectedMethodMessage
   | SetInModelingModeMessage;

extensions/ql-vscode/src/model-editor/method-modeling/method-modeling-view-provider.ts

@@ -14,10 +14,7 @@ import { assertNever } from "../../common/helpers-pure";
 import { ModelEditorViewTracker } from "../model-editor-view-tracker";
 import { ModelConfigListener } from "../../config";
 import { DatabaseItem } from "../../databases/local-databases";
-import {
-  convertFromLegacyModeledMethod,
-  convertToLegacyModeledMethod,
-} from "../shared/modeled-methods-legacy";
+import { convertFromLegacyModeledMethod } from "../shared/modeled-methods-legacy";
 
 export class MethodModelingViewProvider extends AbstractWebviewViewProvider<
   ToMethodModelingMessage,
@@ -77,9 +74,7 @@ export class MethodModelingViewProvider extends AbstractWebviewViewProvider<
         await this.postMessage({
           t: "setSelectedMethod",
           method: selectedMethod.method,
-          modeledMethod: convertToLegacyModeledMethod(
-            selectedMethod.modeledMethods,
-          ),
+          modeledMethods: selectedMethod.modeledMethods,
           isModified: selectedMethod.isModified,
         });
       }
@@ -162,16 +157,14 @@ export class MethodModelingViewProvider extends AbstractWebviewViewProvider<
   private registerToModelingStoreEvents(): void {
     this.push(
       this.modelingStore.onModeledMethodsChanged(async (e) => {
-        if (this.webviewView && e.isActiveDb) {
-          const modeledMethods = e.modeledMethods[this.method?.signature ?? ""];
+        if (this.webviewView && e.isActiveDb && this.method) {
+          const modeledMethods = e.modeledMethods[this.method.signature];
           if (modeledMethods) {
-            const modeledMethod = convertToLegacyModeledMethod(modeledMethods);
-            if (modeledMethod) {
-              await this.postMessage({
-                t: "setModeledMethod",
-                method: modeledMethod,
-              });
-            }
+            await this.postMessage({
+              t: "setMultipleModeledMethods",
+              methodSignature: this.method.signature,
+              modeledMethods,
+            });
           }
         }
       }),
@@ -198,7 +191,7 @@ export class MethodModelingViewProvider extends AbstractWebviewViewProvider<
           await this.postMessage({
             t: "setSelectedMethod",
             method: e.method,
-            modeledMethod: convertToLegacyModeledMethod(e.modeledMethods),
+            modeledMethods: e.modeledMethods,
             isModified: e.isModified,
           });
         }

extensions/ql-vscode/src/view/method-modeling/MethodModelingView.tsx

@@ -10,7 +10,6 @@ import { vscode } from "../vscode-api";
 import { NotInModelingMode } from "./NotInModelingMode";
 import { NoMethodSelected } from "./NoMethodSelected";
 import { MethodModelingPanelViewState } from "../../model-editor/shared/view-state";
-import { convertFromLegacyModeledMethod } from "../../model-editor/shared/modeled-methods-legacy";
 import { MethodAlreadyModeled } from "./MethodAlreadyModeled";
 
 type Props = {
@@ -25,19 +24,13 @@ export function MethodModelingView({ initialViewState }: Props): JSX.Element {
 
   const [method, setMethod] = useState<Method | undefined>(undefined);
 
-  const [modeledMethod, setModeledMethod] = React.useState<
-    ModeledMethod | undefined
-  >(undefined);
+  const [modeledMethods, setModeledMethods] = useState<ModeledMethod[]>([]);
 
   const [isMethodModified, setIsMethodModified] = useState<boolean>(false);
 
   const modelingStatus = useMemo(
-    () =>
-      getModelingStatus(
-        convertFromLegacyModeledMethod(modeledMethod),
-        isMethodModified,
-      ),
-    [modeledMethod, isMethodModified],
+    () => getModelingStatus(modeledMethods, isMethodModified),
+    [modeledMethods, isMethodModified],
   );
 
   useEffect(() => {
@@ -54,15 +47,15 @@ export function MethodModelingView({ initialViewState }: Props): JSX.Element {
           case "setMethod":
             setMethod(msg.method);
             break;
-          case "setModeledMethod":
-            setModeledMethod(msg.method);
+          case "setMultipleModeledMethods":
+            setModeledMethods(msg.modeledMethods);
             break;
           case "setMethodModified":
             setIsMethodModified(msg.isModified);
             break;
           case "setSelectedMethod":
             setMethod(msg.method);
-            setModeledMethod(msg.modeledMethod);
+            setModeledMethods(msg.modeledMethods);
             setIsMethodModified(msg.isModified);
             break;
           default:
@@ -89,13 +82,7 @@ export function MethodModelingView({ initialViewState }: Props): JSX.Element {
     return <NoMethodSelected />;
   }
 
-  if (
-    !canMethodBeModeled(
-      method,
-      convertFromLegacyModeledMethod(modeledMethod),
-      isMethodModified,
-    )
-  ) {
+  if (!canMethodBeModeled(method, modeledMethods, isMethodModified)) {
     return <MethodAlreadyModeled />;
   }
 
@@ -110,7 +97,7 @@ export function MethodModelingView({ initialViewState }: Props): JSX.Element {
     <MethodModeling
       modelingStatus={modelingStatus}
       method={method}
-      modeledMethods={convertFromLegacyModeledMethod(modeledMethod)}
+      modeledMethods={modeledMethods}
       showMultipleModels={viewState?.showMultipleModels}
       onChange={onChange}
     />