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

package/dist/src/collection-browser.js

@@ -376,6 +376,34 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         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() {
         return html `
@@ -613,8 +641,10 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         // Determine the set of sortable fields that should be shown in the sort bar
         let sortFieldAvailability = defaultSortAvailability;
         // We adjust the available sort options for a couple of special cases...
-        if (this.withinCollection?.startsWith('fav-')) {
-            // When viewing a fav- collection, we include the Date Favorited option as the default
+        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;
         }
         else if (!this.withinCollection && this.searchType === SearchType.TV) {
@@ -1337,31 +1367,6 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
             changed.has('loggedIn')) {
             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();
         }