Remove showMultipleModels props

Author: koesie10

extensions/ql-vscode/src/stories/method-modeling/MethodModeling.stories.tsx

@@ -47,26 +47,16 @@ MethodSaved.args = {
   modelingStatus: "saved",
 };
 
-export const MultipleModelingsUnmodeled = Template.bind({});
-MultipleModelingsUnmodeled.args = {
-  language,
-  method,
-  modeledMethods: [],
-  modelingStatus: "saved",
-  showMultipleModels: true,
-};
-
-export const MultipleModelingsModeledSingle = Template.bind({});
-MultipleModelingsModeledSingle.args = {
+export const ModeledSingle = Template.bind({});
+ModeledSingle.args = {
   language,
   method,
   modeledMethods: [createSinkModeledMethod(method)],
   modelingStatus: "saved",
-  showMultipleModels: true,
 };
 
-export const MultipleModelingsModeledMultiple = Template.bind({});
-MultipleModelingsModeledMultiple.args = {
+export const ModeledMultiple = Template.bind({});
+ModeledMultiple.args = {
   language,
   method,
   modeledMethods: [
@@ -79,23 +69,21 @@ MultipleModelingsModeledMultiple.args = {
     }),
   ],
   modelingStatus: "saved",
-  showMultipleModels: true,
 };
 
-export const MultipleModelingsValidationFailedNeutral = Template.bind({});
-MultipleModelingsValidationFailedNeutral.args = {
+export const ValidationFailedNeutral = Template.bind({});
+ValidationFailedNeutral.args = {
   language,
   method,
   modeledMethods: [
     createSinkModeledMethod(method),
     createNeutralModeledMethod(method),
   ],
   modelingStatus: "unsaved",
-  showMultipleModels: true,
 };
 
-export const MultipleModelingsValidationFailedDuplicate = Template.bind({});
-MultipleModelingsValidationFailedDuplicate.args = {
+export const ValidationFailedDuplicate = Template.bind({});
+ValidationFailedDuplicate.args = {
   language,
   method,
   modeledMethods: [
@@ -108,5 +96,4 @@ MultipleModelingsValidationFailedDuplicate.args = {
     createSinkModeledMethod(method),
   ],
   modelingStatus: "unsaved",
-  showMultipleModels: true,
 };

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

@@ -55,7 +55,6 @@ export type MethodModelingProps = {
   method: Method;
   modeledMethods: ModeledMethod[];
   isModelingInProgress: boolean;
-  showMultipleModels?: boolean;
   onChange: (methodSignature: string, modeledMethods: ModeledMethod[]) => void;
 };
 
@@ -65,7 +64,6 @@ export const MethodModeling = ({
   modeledMethods,
   method,
   isModelingInProgress,
-  showMultipleModels = false,
   onChange,
 }: MethodModelingProps): JSX.Element => {
   return (
@@ -83,7 +81,6 @@ export const MethodModeling = ({
         language={language}
         method={method}
         modeledMethods={modeledMethods}
-        showMultipleModels={showMultipleModels}
         isModelingInProgress={isModelingInProgress}
         modelingStatus={modelingStatus}
         onChange={onChange}

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

@@ -110,7 +110,6 @@ export function MethodModelingView({ initialViewState }: Props): JSX.Element {
       method={method}
       modeledMethods={modeledMethods}
       isModelingInProgress={isModelingInProgress}
-      showMultipleModels={true}
       onChange={onChange}
     />
   );

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

@@ -1,11 +1,7 @@
 import * as React from "react";
-import { useCallback } from "react";
 import { ModeledMethod } from "../../model-editor/modeled-method";
-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";
 import { QueryLanguage } from "../../common/query-language";
 import { ModelingStatus } from "../../model-editor/shared/modeling-status";
 
@@ -15,43 +11,17 @@ export type ModeledMethodsPanelProps = {
   modeledMethods: ModeledMethod[];
   modelingStatus: ModelingStatus;
   isModelingInProgress: boolean;
-  showMultipleModels: boolean;
   onChange: (methodSignature: string, modeledMethods: ModeledMethod[]) => void;
 };
 
-const SingleMethodModelingInputs = styled(MethodModelingInputs)`
-  padding-bottom: 0.5rem;
-`;
-
 export const ModeledMethodsPanel = ({
   language,
   method,
   modeledMethods,
   modelingStatus,
   isModelingInProgress,
-  showMultipleModels,
   onChange,
 }: ModeledMethodsPanelProps) => {
-  const handleSingleChange = useCallback(
-    (modeledMethod: ModeledMethod) => {
-      onChange(modeledMethod.signature, [modeledMethod]);
-    },
-    [onChange],
-  );
-
-  if (!showMultipleModels) {
-    return (
-      <SingleMethodModelingInputs
-        language={language}
-        method={method}
-        modeledMethod={convertToLegacyModeledMethod(modeledMethods)}
-        modelingStatus={modelingStatus}
-        isModelingInProgress={isModelingInProgress}
-        onChange={handleSingleChange}
-      />
-    );
-  }
-
   return (
     <MultipleModeledMethodsPanel
       language={language}

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

@@ -19,72 +19,31 @@ describe(ModeledMethodsPanel.name, () => {
   const isModelingInProgress = false;
   const onChange = jest.fn();
 
-  describe("when show multiple models is disabled", () => {
-    const showMultipleModels = false;
-
-    it("renders the method modeling inputs", () => {
-      render({
-        language,
-        method,
-        modeledMethods,
-        isModelingInProgress,
-        modelingStatus,
-        onChange,
-        showMultipleModels,
-      });
-
-      expect(screen.getAllByRole("combobox")).toHaveLength(4);
+  it("renders the method modeling inputs once", () => {
+    render({
+      language,
+      method,
+      modeledMethods,
+      isModelingInProgress,
+      modelingStatus,
+      onChange,
     });
 
-    it("does not render the pagination", () => {
-      render({
-        language,
-        method,
-        modeledMethods,
-        isModelingInProgress,
-        modelingStatus,
-        onChange,
-        showMultipleModels,
-      });
-
-      expect(
-        screen.queryByLabelText("Previous modeling"),
-      ).not.toBeInTheDocument();
-      expect(screen.queryByLabelText("Next modeling")).not.toBeInTheDocument();
-    });
+    expect(screen.getAllByRole("combobox")).toHaveLength(4);
   });
 
-  describe("when show multiple models is enabled", () => {
-    const showMultipleModels = true;
-
-    it("renders the method modeling inputs once", () => {
-      render({
-        language,
-        method,
-        modeledMethods,
-        isModelingInProgress,
-        modelingStatus,
-        onChange,
-        showMultipleModels,
-      });
-
-      expect(screen.getAllByRole("combobox")).toHaveLength(4);
+  it("renders the pagination", () => {
+    render({
+      language,
+      method,
+      modeledMethods,
+      isModelingInProgress,
+      modelingStatus,
+      onChange,
     });
 
-    it("renders the pagination", () => {
-      render({
-        language,
-        method,
-        modeledMethods,
-        isModelingInProgress,
-        modelingStatus,
-        onChange,
-        showMultipleModels,
-      });
-
-      expect(screen.getByLabelText("Previous modeling")).toBeInTheDocument();
-      expect(screen.getByLabelText("Next modeling")).toBeInTheDocument();
-      expect(screen.getByText("1/2")).toBeInTheDocument();
-    });
+    expect(screen.getByLabelText("Previous modeling")).toBeInTheDocument();
+    expect(screen.getByLabelText("Next modeling")).toBeInTheDocument();
+    expect(screen.getByText("1/2")).toBeInTheDocument();
   });
 });