fix: filters issues when toggling external products on and off

Author: shiftmed

angular/src/app/search/filters/filters.component.ts

@@ -130,6 +130,7 @@ export class FiltersComponent implements OnInit, AfterViewInit, OnDestroy {
   fullFacetCountsComplete: boolean = false; // made public for template gating
   private fullFacetCountsSubscription: any = null;
   private searchResponseSub: any = null;
+  private externalToggleSubscription: any = null;
 
   filterStyle = {
     width: "100%",
@@ -211,13 +212,8 @@ export class FiltersComponent implements OnInit, AfterViewInit, OnDestroy {
       ) {
         //Clear filters when we conduct a new search
         this.clearFilters();
-  // Reset facet aggregation state so new query can trigger fresh expanded fetch
-  this.fullFacetCountsInFlight = false;
-  this.fullFacetCountsComplete = false;
-  // Show skeletons again for all facet groups until rebuilt
-  this.recordHasLoading = true;
-  this.themeLoading = true;
-  this.resourceTypeLoading = true;
+        // Reset facet aggregation state so new query can trigger fresh expanded fetch
+        this.resetFacetAggregationState();
         this.onSearchValueChanged();
       }
     }
@@ -239,12 +235,20 @@ export class FiltersComponent implements OnInit, AfterViewInit, OnDestroy {
       if(this.lastOutboundFilterString === str) return; // ignore self echo
       this.applyFilterStringToSelections(str);
     });
+
+    // External toggle changes should reset facet aggregation to avoid stale filters
+    this.externalToggleSubscription = this.searchService
+      .watchExternalProducts()
+      .subscribe(() => {
+        this.resetFacetAggregationState();
+      });
   }
 
   ngOnDestroy(): void {
     if(this.searchResponseSub) { try { this.searchResponseSub.unsubscribe(); } catch {} }
     if(this.fullFacetCountsSubscription) { try { this.fullFacetCountsSubscription.unsubscribe(); } catch {} }
     if(this.filterWatcherSub) { try { this.filterWatcherSub.unsubscribe(); } catch {} }
+    if(this.externalToggleSubscription) { try { this.externalToggleSubscription.unsubscribe(); } catch {} }
   }
 
   toggleMoreOptions() {
@@ -394,7 +398,7 @@ export class FiltersComponent implements OnInit, AfterViewInit, OnDestroy {
     const q = this.searchQueryService.buildQueryFromString(lSearchValue, null, this.fields);
     // Mark loading for possible UI skeletons
     this.recordHasLoading = true; this.themeLoading = true; this.resourceTypeLoading = true;
-    this.searchService.fetchAllForFacetCounts(q, this.searchTaxonomyKey, targetSize, this.searchService['filterString']?.getValue?.()).subscribe(expanded => {
+    this.fullFacetCountsSubscription = this.searchService.fetchAllForFacetCounts(q, this.searchTaxonomyKey, targetSize, this.searchService['filterString']?.getValue?.()).subscribe(expanded => {
       if (expanded && expanded.ResultData && expanded.ResultData.length) {
         this.buildFacetCounts(expanded.ResultData, true); // final pass
       } else {
@@ -411,6 +415,21 @@ export class FiltersComponent implements OnInit, AfterViewInit, OnDestroy {
     });
   }
 
+  private resetFacetAggregationState() {
+    if (this.fullFacetCountsSubscription) {
+      try {
+        this.fullFacetCountsSubscription.unsubscribe();
+      } catch {}
+      this.fullFacetCountsSubscription = null;
+    }
+    this.fullFacetCountsInFlight = false;
+    this.fullFacetCountsComplete = false;
+    // Show skeletons again for all facet groups until rebuilt
+    this.recordHasLoading = true;
+    this.themeLoading = true;
+    this.resourceTypeLoading = true;
+  }
+
   private buildFacetCounts(data: any[], finalPass: boolean = true) {
     this.themesWithCount = [];
     this.componentsWithCount = [];

angular/src/app/search/results/results.component.ts

@@ -248,8 +248,15 @@ export class ResultsComponent implements OnInit {
 
     this.externalToggleSubscription = this.searchService
       .watchExternalProducts()
-      .subscribe(() => {
+      .subscribe((enabled) => {
         if (!this.inited || this.startupGuard) return;
+        if (!enabled) {
+          const cleaned = this.stripExternalOnlyTypes(this.currentFilter);
+          if (cleaned.changed) {
+            this.searchService.setFilterString(cleaned.filter);
+            return;
+          }
+        }
         this.search(
           null,
           this.currentPage || 1,
@@ -488,6 +495,57 @@ export class ResultsComponent implements OnInit {
     });
   }
 
+  private stripExternalOnlyTypes(filterQuery: string): {
+    filter: string;
+    changed: boolean;
+  } {
+    if (!filterQuery || filterQuery === "NoFilter") {
+      return { filter: filterQuery, changed: false };
+    }
+    const segments = filterQuery.split("&").filter((seg) => !!seg);
+    let changed = false;
+    const nextSegments: string[] = [];
+    segments.forEach((seg) => {
+      const [key, value] = seg.split("=");
+      if (!value) {
+        nextSegments.push(seg);
+        return;
+      }
+      if (key === "@type") {
+        const values = value.split(",").filter((v) => !!v);
+        const kept = values.filter(
+          (v) => !this.isExternalOnlyTypeToken(v)
+        );
+        if (kept.length === values.length) {
+          nextSegments.push(seg);
+          return;
+        }
+        changed = true;
+        if (kept.length) {
+          nextSegments.push(`${key}=${kept.join(",")}`);
+        }
+        return;
+      }
+      nextSegments.push(seg);
+    });
+    if (!changed) {
+      return { filter: filterQuery, changed: false };
+    }
+    return {
+      filter: nextSegments.length ? nextSegments.join("&") : "NoFilter",
+      changed: true,
+    };
+  }
+
+  private isExternalOnlyTypeToken(token: string): boolean {
+    const normalized = String(token || "")
+      .replace(/\s/g, "")
+      .toLowerCase();
+    if (!normalized) return false;
+    if (normalized === "coderepository") return true;
+    return normalized.startsWith("vcs:");
+  }
+
   /** Remove a single filter segment and re-run search without full reset */
   removeFilterTag(index: number) {
     if (index < 0 || index >= this.activeFilterTags.length) return;

angular/src/app/shared/search-service/search-service.service.mock.ts

@@ -156,6 +156,8 @@ export class MockSearchService implements SearchService {
    * Start search
    */
   public search(searchValue: string, url?: string): void {
+    // Reset filters when starting a new search (avoid stale filters in SPA navigation).
+    this.setFilterString("NoFilter");
     let params: NavigationExtras = {
       queryParams: {
         q: searchValue,

angular/src/app/shared/search-service/search-service.service.real.ts

@@ -342,6 +342,8 @@ export class RealSearchService implements SearchService {
    * @param url
    */
   public search(searchValue: string, url?: string): void {
+    // Reset filters when starting a new search (avoids stale filters across navigation).
+    this.setFilterString("NoFilter");
     const queryParams: any = {
       q: searchValue,
     };