Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: removes persistedQueryParams as it should work out of the box (#10394) 

This hack is only attempting to hide something which should have been working in core and for which we should provide a fix soon. Also it's not working as it should.
This commit is contained in:
Joffrey JAFFEUX 2020-08-07 09:51:37 +02:00 committed by GitHub
parent 053cbe3112
commit b86198198f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,6 @@ import FilterModeMixin from "discourse/mixins/filter-mode";
export default Component.extend(FilterModeMixin, { export default Component.extend(FilterModeMixin, {
router: service(), router: service(),
persistedQueryParams: null,
tagName: "", tagName: "",
@ -62,25 +61,12 @@ export default Component.extend(FilterModeMixin, {
@discourseComputed("filterType", "category", "noSubcategories") @discourseComputed("filterType", "category", "noSubcategories")
navItems(filterType, category, noSubcategories) { navItems(filterType, category, noSubcategories) {
let params;
const currentRouteQueryParams = this.get("router.currentRoute.queryParams"); const currentRouteQueryParams = this.get("router.currentRoute.queryParams");
if (this.persistedQueryParams && currentRouteQueryParams) {
const currentKeys = Object.keys(currentRouteQueryParams);
const discoveryKeys = Object.keys(this.persistedQueryParams);
const supportedKeys = currentKeys.filter(
i => discoveryKeys.indexOf(i) > 0
);
params = supportedKeys.reduce((object, key) => {
object[key] = currentRouteQueryParams[key];
return object;
}, {});
}
return NavItem.buildList(category, { return NavItem.buildList(category, {
filterType, filterType,
noSubcategories, noSubcategories,
currentRouteQueryParams, currentRouteQueryParams,
persistedQueryParams: params,
siteSettings: this.siteSettings siteSettings: this.siteSettings
}); });
}, },

8
app/assets/javascripts/discourse/app/components/navigation-item.js
View File

@ -51,14 +51,6 @@ export default Component.extend(FilterModeMixin, {
} }
} }
// ensures we keep discovery query params added through plugin api
if (content.persistedQueryParams) {
Object.keys(content.persistedQueryParams).forEach(key => {
const value = content.persistedQueryParams[key];
queryParams.push(`${key}=${value}`);
});
}
// To reset the "filter" sticky param, at least one query param is needed. // To reset the "filter" sticky param, at least one query param is needed.
// If no query param is present, add an empty one to ensure a ? is // If no query param is present, add an empty one to ensure a ? is
// appended to the URL. // appended to the URL.

7
app/assets/javascripts/discourse/app/controllers/discovery-sortable.js
View File

@ -1,7 +1,6 @@
import { alias } from "@ember/object/computed"; import { alias } from "@ember/object/computed";
import { inject } from "@ember/controller"; import { inject } from "@ember/controller";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import DiscourseNavigation from "discourse/components/d-navigation";
// Just add query params here to have them automatically passed to topic list filters. // Just add query params here to have them automatically passed to topic list filters.
export const queryParams = { export const queryParams = {
@ -37,12 +36,6 @@ export const addDiscoveryQueryParam = function(p, opts) {
cOpts[p] = alias(`discoveryTopics.${p}`); cOpts[p] = alias(`discoveryTopics.${p}`);
cOpts["queryParams"] = Object.keys(queryParams); cOpts["queryParams"] = Object.keys(queryParams);
SortableController.reopen(cOpts); SortableController.reopen(cOpts);
if (opts && opts.persisted) {
DiscourseNavigation.reopen({
persistedQueryParams: queryParams
});
}
}; };
export default SortableController; export default SortableController;

3
app/assets/javascripts/discourse/app/models/nav-item.js
View File

@ -175,9 +175,6 @@ NavItem.reopenClass({
if (opts.currentRouteQueryParams) { if (opts.currentRouteQueryParams) {
args.currentRouteQueryParams = opts.currentRouteQueryParams; args.currentRouteQueryParams = opts.currentRouteQueryParams;
} }
if (opts.persistedQueryParams) {
args.persistedQueryParams = opts.persistedQueryParams;
}
if (opts.noSubcategories) { if (opts.noSubcategories) {
args.noSubcategories = true; args.noSubcategories = true;
} }