Avoid passing in both viewState and mode at the same time

Author: robertbrignull

extensions/ql-vscode/src/view/data-extensions-editor/DataExtensionsEditor.tsx

@@ -304,7 +304,6 @@ export function DataExtensionsEditor({
               unsavedModels={unsavedModels}
               modeledMethods={modeledMethods}
               viewState={viewState}
-              mode={viewState.mode}
               onChange={onChange}
               onSaveModelClick={onSaveModelClick}
               onGenerateFromLlmClick={onGenerateFromLlmClick}

extensions/ql-vscode/src/view/data-extensions-editor/LibraryRow.tsx

@@ -71,7 +71,6 @@ type Props = {
   externalApiUsages: ExternalApiUsage[];
   modeledMethods: Record<string, ModeledMethod>;
   viewState: DataExtensionEditorViewState;
-  mode: Mode;
   hasUnsavedChanges: boolean;
   onChange: (
     modelName: string,
@@ -95,7 +94,6 @@ export const LibraryRow = ({
   externalApiUsages,
   modeledMethods,
   viewState,
-  mode,
   hasUnsavedChanges,
   onChange,
   onSaveModelClick,
@@ -190,7 +188,7 @@ export const LibraryRow = ({
           <ModeledMethodDataGrid
             externalApiUsages={externalApiUsages}
             modeledMethods={modeledMethods}
-            mode={mode}
+            mode={viewState.mode}
             onChange={onChangeWithModelName}
           />
           <SectionDivider />

extensions/ql-vscode/src/view/data-extensions-editor/ModeledMethodsList.tsx

@@ -3,7 +3,6 @@ import { useMemo } from "react";
 import { ExternalApiUsage } from "../../data-extensions-editor/external-api-usage";
 import { ModeledMethod } from "../../data-extensions-editor/modeled-method";
 import { LibraryRow } from "./LibraryRow";
-import { Mode } from "../../data-extensions-editor/shared/mode";
 import {
   groupMethods,
   sortGroupNames,
@@ -15,7 +14,6 @@ type Props = {
   unsavedModels: Set<string>;
   modeledMethods: Record<string, ModeledMethod>;
   viewState: DataExtensionEditorViewState;
-  mode: Mode;
   onChange: (
     modelName: string,
     externalApiUsage: ExternalApiUsage,
@@ -38,15 +36,14 @@ export const ModeledMethodsList = ({
   unsavedModels,
   modeledMethods,
   viewState,
-  mode,
   onChange,
   onSaveModelClick,
   onGenerateFromLlmClick,
   onGenerateFromSourceClick,
 }: Props) => {
   const grouped = useMemo(
-    () => groupMethods(externalApiUsages, mode),
-    [externalApiUsages, mode],
+    () => groupMethods(externalApiUsages, viewState.mode),
+    [externalApiUsages, viewState.mode],
   );
 
   const sortedGroupNames = useMemo(() => sortGroupNames(grouped), [grouped]);
@@ -61,7 +58,6 @@ export const ModeledMethodsList = ({
           hasUnsavedChanges={unsavedModels.has(libraryName)}
           modeledMethods={modeledMethods}
           viewState={viewState}
-          mode={mode}
           onChange={onChange}
           onSaveModelClick={onSaveModelClick}
           onGenerateFromLlmClick={onGenerateFromLlmClick}