Skip to content

A platform for community discussion. Free, open, simple.

DEV: reset loadingMore on pagination error in categories modal (#38634)

Isaac Janzenb05704b2395a
diff --git a/frontend/discourse/app/components/sidebar/edit-navigation-menu/categories-modal.gjs b/frontend/discourse/app/components/sidebar/edit-navigation-menu/categories-modal.gjs
index 1567c262e7e..3a794e31510 100644
--- a/frontend/discourse/app/components/sidebar/edit-navigation-menu/categories-modal.gjs
+++ b/frontend/discourse/app/components/sidebar/edit-navigation-menu/categories-modal.gjs
@@ -122,20 +122,23 @@ export default class SidebarEditNavigationMenuCategoriesModal extends Component
const requestedPage = this.loadedPage + 1;
const opts = { page: requestedPage, ...this.searchOpts() };
- const categories = await Category.asyncHierarchicalSearch(
- requestedFilter,
- opts
- );
-
- if (categories.length === 0) {
- this.lastPage = true;
- } else {
- this.concatFetchedCategories(categories);
+ try {
+ const categories = await Category.asyncHierarchicalSearch(
+ requestedFilter,
+ opts
+ );
+
+ if (categories.length === 0) {
+ this.lastPage = true;
+ } else {
+ this.concatFetchedCategories(categories);
+ }
+
+ this.loadAnotherPage = false;
+ this.loadedPage = requestedPage;
+ } finally {
+ this.loadingMore = false;
}
-
- this.loadAnotherPage = false;
- this.loadedPage = requestedPage;
- this.loadingMore = false;
}
} else {
// The shown categories are stale, refresh everything