Implement correct filter method for typeahead

puzzle · May 24, 2024 · 4c6c28a · 4c6c28a
1 parent d5f0776
commit 4c6c28a
Showing 1 changed file with 22 additions and 8 deletions.
diff --git a/frontend/src/app/shared/dialog/objective-dialog/objective-form.component.ts b/frontend/src/app/shared/dialog/objective-dialog/objective-form.component.ts
@@ -311,14 +311,28 @@ export class ObjectiveFormComponent implements OnInit {
 
   filter() {
     let filterValue = this.input.nativeElement.value.toLowerCase();
-    this.alignmentPossibilities$.subscribe((value: AlignmentPossibility[]) => {
-      this.filteredOptions = value.filter((alignmentPossibility: AlignmentPossibility) => {
-        let teamMatch = alignmentPossibility.teamName.toLowerCase().includes(filterValue);
-        let objectMatch = alignmentPossibility.alignmentObjectDtos.some((obj) =>
-          obj.objectTitle.toLowerCase().includes(filterValue),
-        );
-        return teamMatch || objectMatch;
-      });
+    this.alignmentPossibilities$.subscribe((alignmentPossibilities: AlignmentPossibility[]) => {
+      let filteredObjects = alignmentPossibilities.flatMap(possibility =>
+        possibility.alignmentObjectDtos.filter(obj => obj.objectTitle.toLowerCase().includes(filterValue))
+      );
+
+      let matchingPossibilities = alignmentPossibilities.filter(possibility =>
+        filteredObjects.some(obj => possibility.alignmentObjectDtos.includes(obj))
+      );
+
+      let uniquePossibilities = [...new Set(matchingPossibilities)];
+
+      let finalList = uniquePossibilities.map(possibility => ({
+        ...possibility,
+        alignmentObjectDtos: possibility.alignmentObjectDtos.filter(obj => filteredObjects.includes(obj)),
+      }));
+
+      if (finalList.length == 0) {
+        this.filteredOptions = alignmentPossibilities.filter(possibility =>
+          possibility.teamName.toLowerCase().includes(filterValue));
+      } else {
+        this.filteredOptions = finalList;
+      }
     });
   }