Filter deleted puzzles group to match search string.

See deathandmayhem#2278
jpd236 · Dec 21, 2024 · 795cdee · 795cdee
1 parent 6b7b04c
commit 795cdee
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/imports/client/components/PuzzleListPage.tsx b/imports/client/components/PuzzleListPage.tsx
@@ -373,6 +373,7 @@ const PuzzleListView = ({
   const renderList = useCallback(
     (
       retainedPuzzles: PuzzleType[],
+      retainedDeletedPuzzles: PuzzleType[] | undefined,
       solvedOverConstrains: boolean,
       allPuzzlesCount: number,
     ) => {
@@ -475,11 +476,11 @@ const PuzzleListView = ({
             </PuzzleGroupDiv>
           )}
           {listComponent}
-          {deletedPuzzles && deletedPuzzles.length > 0 && (
+          {retainedDeletedPuzzles && retainedDeletedPuzzles.length > 0 && (
             <RelatedPuzzleGroup
               key="deleted"
               huntId={huntId}
-              group={{ puzzles: deletedPuzzles, subgroups: [] }}
+              group={{ puzzles: retainedDeletedPuzzles, subgroups: [] }}
               noSharedTagLabel="Deleted puzzles (operator only)"
               bookmarked={bookmarked}
               allTags={allTags}
@@ -496,7 +497,6 @@ const PuzzleListView = ({
       huntId,
       displayMode,
       allPuzzles,
-      deletedPuzzles,
       allTags,
       canUpdate,
       searchString,
@@ -560,6 +560,8 @@ const PuzzleListView = ({
   const retainedPuzzles = solvedOverConstrains
     ? matchingSearch
     : matchingSearchAndSolved;
+  const retainedDeletedPuzzles =
+    deletedPuzzles && puzzlesMatchingSearchString(deletedPuzzles);
 
   return (
     <div>
@@ -637,7 +639,12 @@ const PuzzleListView = ({
           </InputGroup>
         </SearchFormGroup>
       </ViewControls>
-      {renderList(retainedPuzzles, solvedOverConstrains, allPuzzles.length)}
+      {renderList(
+        retainedPuzzles,
+        retainedDeletedPuzzles,
+        solvedOverConstrains,
+        allPuzzles.length,
+      )}
     </div>
   );
 };