osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

FIX: Nav items not recomputing on query param change (#12350)

Browse Source 
The recalculation of the `forceActive` function for the nav items was being run _before_ the querystring parameters are getting updated. For example for the Unassigned link:

```javascript
i.addNavigationBarItem({
  name: "unassigned",
  customFilter: (category) => {
    return category && category.enable_unassigned_filter;
  },
  customHref: (category) => {
    if (category) {
      return getURL(category.url) + "/l/latest?status=open&assigned=nobody";
    }
  },
  forceActive: (category, args, router) => {
    const queryParams = router.currentRoute.queryParams;

    return (
      queryParams &&
      Object.keys(queryParams).length === 2 &&
      queryParams["assigned"] === "nobody" &&
      queryParams["status"] === "open"
    );
  },
  before: "top",
});
```

When forceActive is hit going from e.g.`http://localhost:3000/c/some-category/5/l/top` to `http://localhost:3000/c/some-category/5/l/latest?assigned=nobody&status=open` the `queryParams` are empty and the URL does not seem to change until after the transition and so `active` ends up being false in this `navigation-item` function which controls whether or not to do the highlight:

```javascript
@discourseComputed("content.filterType", "filterType", "content.active")
active(contentFilterType, filterType, active) {
  if (active !== undefined) {
    return active;
  }
  return contentFilterType === filterType;
},
```

Also sometimes this is not even recalculated, for example going from `http://localhost:3000/c/some-category/5/l/latest?status=open` to `http://localhost:3000/c/some-category/5/l/latest?assigned=nobody&status=open`. This PR fixes the issue where the query parameters changing was not forcing this recalculation. This was especially noticable in conjunction with https://github.com/discourse/discourse-loading-slider.
This commit is contained in:
Martin Brennan 2021-03-11 11:50:05 +10:00 committed by GitHub
parent 10780d2448
commit b81bb2f93b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/assets/javascripts/discourse/app/components/d-navigation.js
View File

@ -79,10 +79,20 @@ export default Component.extend(FilterModeMixin, {
return !additionalTags && !category && tagId !== "none";
},
@discourseComputed("filterType", "category", "noSubcategories", "tag.id")
navItems(filterType, category, noSubcategories, tagId) {
const currentRouteQueryParams = this.get("router.currentRoute.queryParams");
@discourseComputed(
"filterType",
"category",
"noSubcategories",
"tag.id",
"router.currentRoute.queryParams"
)
navItems(
filterType,
category,
noSubcategories,
tagId,
currentRouteQueryParams
) {
return NavItem.buildList(category, {
filterType,
noSubcategories,