@internetarchive/collection-browser 4.1.2-alpha9 → 4.1.3-alpha-webdev8108.0

package/src/app-root.ts

@@ -510,10 +510,7 @@ export class AppRoot extends LitElement {
           .loggedIn=${this.loggedIn}
           .modalManager=${this.modalManager}
           .analyticsHandler=${this.analyticsHandler}
-          .pageContext=${'profile'}
-          .pageType=${'account_details'}
-          .pageTarget=${'fav-neeraj_archive341'}
-          .profileElement=${'favorites'}
+          .pageContext=${'search'}
           @visiblePageChanged=${this.visiblePageChanged}
           @baseQueryChanged=${this.baseQueryChanged}
           @searchTypeChanged=${this.searchTypeChanged}

package/src/collection-browser.ts

@@ -605,6 +605,43 @@ export class CollectionBrowser
     if (changed.has('searchType') && this.searchType === SearchType.TV) {
       this.applyDefaultTVSearchSort();
     }
+
+    // If we need to clear filters due to a query change or other reset, we do so *before* any
+    // updates happen, to prevent unnecessary update cycles and ensure there's a clean slate
+    // for any search requests that fire.
+    if (
+      changed.has('baseQuery') ||
+      changed.has('identifiers') ||
+      changed.has('searchType') ||
+      changed.has('withinCollection')
+    ) {
+      // Unless this query/search type update is from the initial page load or the
+      // result of hitting the back button,
+      // we need to clear any existing filters since they may no longer be valid for
+      // the new set of search results.
+      if (!this.historyPopOccurred && this.initialQueryChangeHappened) {
+        // Ordinarily, we leave the sort param unchanged between searches.
+        // However, if we are changing the target collection itself, we want the sort cleared too,
+        // since different collections may have different sorting options available.
+        const shouldClearSort =
+          changed.has('withinCollection') &&
+          !changed.has('selectedSort') &&
+          !changed.has('sortDirection');
+
+        // Otherwise, only clear filters that haven't been simultaneously applied in this update
+        this.clearFilters({
+          sort: shouldClearSort,
+          facets: !changed.has('selectedFacets'),
+          dateRange: !(
+            changed.has('minSelectedDate') || changed.has('maxSelectedDate')
+          ),
+          letterFilters: !(
+            changed.has('selectedTitleFilter') ||
+            changed.has('selectedCreatorFilter')
+          ),
+        });
+      }
+    }
   }
 
   render() {
@@ -860,7 +897,10 @@ export class CollectionBrowser
     let sortFieldAvailability = defaultSortAvailability;
 
     // We adjust the available sort options for a couple of special cases...
-    if (this.withinCollection?.startsWith('fav-') || this.profileElement === 'favorites') {
+    if (
+      this.withinCollection?.startsWith('fav-') ||
+      this.profileElement === 'favorites'
+    ) {
       // When viewing a fav- collection or the favorites profile tab,
       // we include the Date Favorited option as the default
       sortFieldAvailability = favoritesSortAvailability;
@@ -1638,7 +1678,6 @@ export class CollectionBrowser
     this.addController(this.dataSource);
 
     this.baseQuery = queryState.baseQuery;
-    this.withinProfile = queryState.withinProfile;
     this.profileElement = queryState.profileElement;
     this.searchType = queryState.searchType;
     this.selectedFacets =
@@ -1651,14 +1690,6 @@ export class CollectionBrowser
     this.selectedTitleFilter = queryState.selectedTitleFilter;
     this.selectedCreatorFilter = queryState.selectedCreatorFilter;
 
-    // Apply the correct default sort for the new profile element immediately,
-    // so it is in place before hostUpdate() fires on the data source.
-    // Without this, a stale defaultSortField from a previously-active tab
-    // could be used in the first fetch for the incoming tab.
-    if (this.profileElement) {
-      this.applyDefaultProfileSort();
-    }
-
     this.pagesToRender = this.initialPageNumber;
 
     // We set this flag during the update to prevent the URL state persistence
@@ -1732,40 +1763,6 @@ export class CollectionBrowser
       this.infiniteScroller?.reload();
     }
 
-    if (
-      changed.has('baseQuery') ||
-      changed.has('identifiers') ||
-      changed.has('searchType') ||
-      changed.has('withinCollection')
-    ) {
-      // Unless this query/search type update is from the initial page load or the
-      // result of hitting the back button,
-      // we need to clear any existing filters since they may no longer be valid for
-      // the new set of search results.
-      if (!this.historyPopOccurred && this.initialQueryChangeHappened) {
-        // Ordinarily, we leave the sort param unchanged between searches.
-        // However, if we are changing the target collection itself, we want the sort cleared too,
-        // since different collections may have different sorting options available.
-        const shouldClearSort =
-          changed.has('withinCollection') &&
-          !changed.has('selectedSort') &&
-          !changed.has('sortDirection');
-
-        // Otherwise, only clear filters that haven't been simultaneously applied in this update
-        this.clearFilters({
-          sort: shouldClearSort,
-          facets: !changed.has('selectedFacets'),
-          dateRange: !(
-            changed.has('minSelectedDate') || changed.has('maxSelectedDate')
-          ),
-          letterFilters: !(
-            changed.has('selectedTitleFilter') ||
-            changed.has('selectedCreatorFilter')
-          ),
-        });
-      }
-    }
-
     if (changed.has('profileElement')) {
       this.applyDefaultProfileSort();
     }