Change matchesFilter to accept a FilterAndSortableResult

Author: robertbrignull

extensions/ql-vscode/src/pure/variant-analysis-filter-sort.ts

@@ -33,14 +33,14 @@ export const defaultFilterSortState: RepositoriesFilterSortState = {
 };
 
 export function matchesFilter(
-  repo: Pick<Repository, "fullName">,
+  item: FilterAndSortableResult,
   filterSortState: RepositoriesFilterSortState | undefined,
 ): boolean {
   if (!filterSortState) {
     return true;
   }
 
-  return repo.fullName
+  return item.repository.fullName
     .toLowerCase()
     .includes(filterSortState.searchValue.toLowerCase());
 }
@@ -117,7 +117,7 @@ export function filterAndSortRepositoriesWithResultsByName<
   }
 
   return repositories
-    .filter((repo) => matchesFilter(repo.repository, filterSortState))
+    .filter((repo) => matchesFilter(repo, filterSortState))
     .sort(compareWithResults(filterSortState));
 }
 

extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisSkippedRepositoriesTab.tsx

@@ -56,8 +56,8 @@ export const VariantAnalysisSkippedRepositoriesTab = ({
 }: VariantAnalysisSkippedRepositoriesTabProps) => {
   const repositories = useMemo(() => {
     return skippedRepositoryGroup.repositories
-      ?.filter((repo) => {
-        return matchesFilter(repo, filterSortState);
+      ?.filter((repository) => {
+        return matchesFilter({ repository }, filterSortState);
       })
       ?.sort(compareRepository(filterSortState));
   }, [filterSortState, skippedRepositoryGroup.repositories]);

extensions/ql-vscode/test/unit-tests/variant-analysis-filter-sort.test.ts

@@ -32,10 +32,13 @@ describe(matchesFilter.name, () => {
     "returns $matches if searching for $searchValue",
     ({ searchValue, matches }) => {
       expect(
-        matchesFilter(repository, {
-          ...defaultFilterSortState,
-          searchValue,
-        }),
+        matchesFilter(
+          { repository },
+          {
+            ...defaultFilterSortState,
+            searchValue,
+          },
+        ),
       ).toBe(matches);
     },
   );