Use legacy modeled method conversions instead of custom conversions

Author: robertbrignull

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

@@ -10,6 +10,7 @@ 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";
 
 type Props = {
   initialViewState?: MethodModelingPanelViewState;
@@ -31,7 +32,10 @@ export function MethodModelingView({ initialViewState }: Props): JSX.Element {
 
   const modelingStatus = useMemo(
     () =>
-      getModelingStatus(modeledMethod ? [modeledMethod] : [], isMethodModified),
+      getModelingStatus(
+        convertFromLegacyModeledMethod(modeledMethod),
+        isMethodModified,
+      ),
     [modeledMethod, isMethodModified],
   );
 
@@ -95,7 +99,7 @@ export function MethodModelingView({ initialViewState }: Props): JSX.Element {
     <MethodModeling
       modelingStatus={modelingStatus}
       method={method}
-      modeledMethods={modeledMethod ? [modeledMethod] : []}
+      modeledMethods={convertFromLegacyModeledMethod(modeledMethod)}
       showMultipleModels={viewState?.showMultipleModels}
       onChange={onChange}
     />

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

@@ -4,6 +4,7 @@ import { MethodModelingInputs } from "./MethodModelingInputs";
 import { Method } from "../../model-editor/method";
 import { styled } from "styled-components";
 import { MultipleModeledMethodsPanel } from "./MultipleModeledMethodsPanel";
+import { convertToLegacyModeledMethod } from "../../model-editor/shared/modeled-methods-legacy";
 
 export type ModeledMethodsPanelProps = {
   method: Method;
@@ -26,9 +27,7 @@ export const ModeledMethodsPanel = ({
     return (
       <SingleMethodModelingInputs
         method={method}
-        modeledMethod={
-          modeledMethods.length > 0 ? modeledMethods[0] : undefined
-        }
+        modeledMethod={convertToLegacyModeledMethod(modeledMethods)}
         onChange={onChange}
       />
     );