Move calculation of hidden/modelable rows into ModeledMethodDataGrid

Author: robertbrignull

extensions/ql-vscode/src/view/model-editor/MethodRow.tsx

@@ -62,26 +62,17 @@ const modelTypeOptions: Array<{ value: ModeledMethodType; label: string }> = [
 
 type Props = {
   method: Method;
+  methodCanBeModeled: boolean;
   modeledMethod: ModeledMethod | undefined;
   methodIsUnsaved: boolean;
   modelingInProgress: boolean;
   mode: Mode;
-  hideModeledApis: boolean;
   onChange: (method: Method, modeledMethod: ModeledMethod) => void;
 };
 
 export const MethodRow = (props: Props) => {
-  const { method, modeledMethod, methodIsUnsaved, hideModeledApis } = props;
-
-  const methodCanBeModeled =
-    !method.supported ||
-    (modeledMethod && modeledMethod?.type !== "none") ||
-    methodIsUnsaved;
-
-  if (methodCanBeModeled) {
+  if (props.methodCanBeModeled) {
     return <ModelableMethodRow {...props} />;
-  } else if (hideModeledApis) {
-    return null;
   } else {
     return <UnmodelableMethodRow {...props} />;
   }

extensions/ql-vscode/src/view/model-editor/ModeledMethodDataGrid.tsx

@@ -35,7 +35,25 @@ export const ModeledMethodDataGrid = ({
   hideModeledApis,
   onChange,
 }: Props) => {
-  const sortedMethods = useMemo(() => sortMethods(methods), [methods]);
+  const methodsWithModelability: Array<{
+    method: Method;
+    methodCanBeModeled: boolean;
+  }> = useMemo(() => {
+    const methodsWithModelability = [];
+    for (const method of sortMethods(methods)) {
+      const modeledMethod = modeledMethods[method.signature];
+      const methodIsUnsaved = modifiedSignatures.has(method.signature);
+      const methodCanBeModeled =
+        !method.supported ||
+        (modeledMethod && modeledMethod?.type !== "none") ||
+        methodIsUnsaved;
+
+      if (methodCanBeModeled || !hideModeledApis) {
+        methodsWithModelability.push({ method, methodCanBeModeled });
+      }
+    }
+    return methodsWithModelability;
+  }, [hideModeledApis, methods, modeledMethods, modifiedSignatures]);
 
   return (
     <VSCodeDataGrid gridTemplateColumns={GRID_TEMPLATE_COLUMNS}>
@@ -56,18 +74,18 @@ export const ModeledMethodDataGrid = ({
           Kind
         </VSCodeDataGridCell>
       </VSCodeDataGridRow>
-      {sortedMethods.map((method) => (
+      {methodsWithModelability.map(({ method, methodCanBeModeled }) => (
         <MethodRow
           key={method.signature}
           method={method}
+          methodCanBeModeled={methodCanBeModeled}
           modeledMethod={modeledMethods[method.signature]}
           methodIsUnsaved={modifiedSignatures.has(method.signature)}
           modelingInProgress={inProgressMethods.hasMethod(
             packageName,
             method.signature,
           )}
           mode={mode}
-          hideModeledApis={hideModeledApis}
           onChange={onChange}
         />
       ))}