From e25398d1fa688cbb0d9353b2755651723c63b57f Mon Sep 17 00:00:00 2001 From: Koen Vlaswinkel Date: Wed, 1 Nov 2023 15:51:25 +0100 Subject: [PATCH] Use createEmptyModeledMethod in more places --- .../src/view/model-editor/MethodRow.tsx | 26 +++++-------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/extensions/ql-vscode/src/view/model-editor/MethodRow.tsx b/extensions/ql-vscode/src/view/model-editor/MethodRow.tsx index 15eb8caf0..1a7dfe1ac 100644 --- a/extensions/ql-vscode/src/view/model-editor/MethodRow.tsx +++ b/extensions/ql-vscode/src/view/model-editor/MethodRow.tsx @@ -33,6 +33,7 @@ import { canAddNewModeledMethod } from "../../model-editor/shared/multiple-model import { DataGridCell, DataGridRow } from "../common/DataGrid"; import { validateModeledMethods } from "../../model-editor/shared/validation"; import { ModeledMethodAlert } from "../method-modeling/ModeledMethodAlert"; +import { createEmptyModeledMethod } from "../../model-editor/modeled-method-empty"; const ApiOrMethodRow = styled.div` min-height: calc(var(--input-height) * 1px); @@ -165,15 +166,10 @@ const ModelableMethodRow = forwardRef( ); const handleAddModelClick = useCallback(() => { - const newModeledMethod: ModeledMethod = { - type: "none", - provenance: "manual", - signature: method.signature, - packageName: method.packageName, - typeName: method.typeName, - methodName: method.methodName, - methodParameters: method.methodParameters, - }; + const newModeledMethod: ModeledMethod = createEmptyModeledMethod( + "none", + method, + ); const newModeledMethods = [...modeledMethods, newModeledMethod]; onChange(method.signature, newModeledMethods); }, [method, modeledMethods, onChange]); @@ -356,17 +352,7 @@ function modeledMethodsToDisplay( viewState: ModelEditorViewState, ): ModeledMethod[] { if (modeledMethods.length === 0) { - return [ - { - type: "none", - provenance: "manual", - signature: method.signature, - packageName: method.packageName, - typeName: method.typeName, - methodName: method.methodName, - methodParameters: method.methodParameters, - }, - ]; + return [createEmptyModeledMethod("none", method)]; } if (viewState.showMultipleModels) {