mirror of
https://github.com/discourse/discourse.git
synced 2025-02-17 04:12:46 +08:00
DEV: Convert discovery-sortable and tag-show to native class syntax (#23123)
This commit is contained in:
David Taylor
GitHub
parent
e3c6d3c1cb
commit
712bbf9b88
|
|
@ -23,17 +23,6 @@ export const queryParams = {
|
|||
exclude_tag: { replace: true, refreshModel: true },
|
||||
};
|
||||
|
||||
// Basic controller options
|
||||
const controllerOpts = {
|
||||
discoveryTopics: controller("discovery/topics"),
|
||||
queryParams: Object.keys(queryParams),
|
||||
};
|
||||
|
||||
// Default to `undefined`
|
||||
controllerOpts.queryParams.forEach((p) => {
|
||||
controllerOpts[p] = queryParams[p].default;
|
||||
});
|
||||
|
||||
export function changeSort(sortBy) {
|
||||
let model = this.controllerFor("discovery.topics").model;
|
||||
|
||||
|
|
@ -47,21 +36,26 @@ export function changeSort(sortBy) {
|
|||
}
|
||||
|
||||
export function resetParams(skipParams = []) {
|
||||
controllerOpts.queryParams.forEach((p) => {
|
||||
Object.keys(queryParams).forEach((p) => {
|
||||
if (!skipParams.includes(p)) {
|
||||
this.controller.set(p, queryParams[p].default);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
const SortableController = Controller.extend(controllerOpts);
|
||||
|
||||
export const addDiscoveryQueryParam = function (p, opts) {
|
||||
export function addDiscoveryQueryParam(p, opts) {
|
||||
queryParams[p] = opts;
|
||||
const cOpts = {};
|
||||
cOpts[p] = null;
|
||||
cOpts["queryParams"] = Object.keys(queryParams);
|
||||
SortableController.reopen(cOpts);
|
||||
};
|
||||
}
|
||||
|
||||
export default SortableController;
|
||||
export default class DiscoverySortableController extends Controller {
|
||||
@controller("discovery/topics") discoveryTopics;
|
||||
|
||||
queryParams = Object.keys(queryParams);
|
||||
|
||||
constructor() {
|
||||
super(...arguments);
|
||||
this.queryParams.forEach((p) => {
|
||||
this[p] = queryParams[p].default;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
import { inject as service } from "@ember/service";
|
||||
import { readOnly } from "@ember/object/computed";
|
||||
import DiscoverySortableController from "discourse/controllers/discovery-sortable";
|
||||
import discourseComputed from "discourse-common/utils/decorators";
|
||||
import BulkTopicSelection from "discourse/mixins/bulk-topic-selection";
|
||||
|
|
@ -5,215 +7,214 @@ import DismissTopics from "discourse/mixins/dismiss-topics";
|
|||
import I18n from "I18n";
|
||||
import NavItem from "discourse/models/nav-item";
|
||||
import Topic from "discourse/models/topic";
|
||||
import { readOnly } from "@ember/object/computed";
|
||||
import { endWith } from "discourse/lib/computed";
|
||||
import { action } from "@ember/object";
|
||||
import { inject as service } from "@ember/service";
|
||||
import { calculateFilterMode } from "discourse/lib/filter-mode";
|
||||
import { dependentKeyCompat } from "@ember/object/compat";
|
||||
import { tracked } from "@glimmer/tracking";
|
||||
|
||||
export default DiscoverySortableController.extend(
|
||||
export default class TagShowController extends DiscoverySortableController.extend(
|
||||
BulkTopicSelection,
|
||||
DismissTopics,
|
||||
DismissTopics
|
||||
) {
|
||||
@service dialog;
|
||||
@service router;
|
||||
@service currentUser;
|
||||
@service siteSettings;
|
||||
|
||||
{
|
||||
dialog: service(),
|
||||
router: service(),
|
||||
currentUser: service(),
|
||||
siteSettings: service(),
|
||||
@tracked category;
|
||||
@tracked filterType;
|
||||
@tracked noSubcategories;
|
||||
|
||||
tag: null,
|
||||
additionalTags: null,
|
||||
list: null,
|
||||
canAdminTag: readOnly("currentUser.staff"),
|
||||
navMode: "latest",
|
||||
loading: false,
|
||||
canCreateTopic: false,
|
||||
showInfo: false,
|
||||
top: endWith("list.filter", "top"),
|
||||
tag = null;
|
||||
additionalTags = null;
|
||||
list = null;
|
||||
|
||||
category: tracked(),
|
||||
filterType: tracked(),
|
||||
noSubcategories: tracked(),
|
||||
@readOnly("currentUser.staff") canAdminTag;
|
||||
|
||||
@dependentKeyCompat
|
||||
get filterMode() {
|
||||
return calculateFilterMode({
|
||||
category: this.category,
|
||||
filterType: this.filterType,
|
||||
noSubcategories: this.noSubcategories,
|
||||
});
|
||||
},
|
||||
navMode = "latest";
|
||||
loading = false;
|
||||
canCreateTopic = false;
|
||||
showInfo = false;
|
||||
|
||||
@discourseComputed(
|
||||
"canCreateTopic",
|
||||
"category",
|
||||
"canCreateTopicOnCategory",
|
||||
"tag",
|
||||
"canCreateTopicOnTag"
|
||||
)
|
||||
createTopicDisabled(
|
||||
canCreateTopic,
|
||||
category,
|
||||
canCreateTopicOnCategory,
|
||||
tag,
|
||||
canCreateTopicOnTag
|
||||
) {
|
||||
return (
|
||||
!canCreateTopic ||
|
||||
(category && !canCreateTopicOnCategory) ||
|
||||
(tag && !canCreateTopicOnTag)
|
||||
);
|
||||
},
|
||||
@endWith("list.filter", "top") top;
|
||||
|
||||
@discourseComputed("category", "tag.id", "filterType", "noSubcategories")
|
||||
navItems(category, tagId, filterType, noSubcategories) {
|
||||
return NavItem.buildList(category, {
|
||||
tagId,
|
||||
filterType,
|
||||
noSubcategories,
|
||||
siteSettings: this.siteSettings,
|
||||
});
|
||||
},
|
||||
|
||||
@discourseComputed("navMode", "list.topics.length", "loading")
|
||||
footerMessage(navMode, listTopicsLength, loading) {
|
||||
if (loading) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (listTopicsLength === 0) {
|
||||
return I18n.t(`tagging.topics.none.${navMode}`, {
|
||||
tag: this.tag?.id,
|
||||
});
|
||||
} else {
|
||||
return I18n.t("topics.bottom.tag", {
|
||||
tag: this.tag?.id,
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
@discourseComputed("list.filter", "list.topics.length")
|
||||
showDismissRead(filter, topicsLength) {
|
||||
return this._isFilterPage(filter, "unread") && topicsLength > 0;
|
||||
},
|
||||
|
||||
@discourseComputed("list.filter", "list.topics.length")
|
||||
showResetNew(filter, topicsLength) {
|
||||
return this._isFilterPage(filter, "new") && topicsLength > 0;
|
||||
},
|
||||
|
||||
callResetNew(dismissPosts = false, dismissTopics = false, untrack = false) {
|
||||
const filterTracked =
|
||||
(this.router.currentRoute.queryParams["f"] ||
|
||||
this.router.currentRoute.queryParams["filter"]) === "tracked";
|
||||
|
||||
let topicIds = this.selected ? this.selected.mapBy("id") : null;
|
||||
|
||||
Topic.resetNew(this.category, !this.noSubcategories, {
|
||||
tracked: filterTracked,
|
||||
tag: this.tag,
|
||||
topicIds,
|
||||
dismissPosts,
|
||||
dismissTopics,
|
||||
untrack,
|
||||
}).then((result) => {
|
||||
if (result.topic_ids) {
|
||||
this.topicTrackingState.removeTopics(result.topic_ids);
|
||||
}
|
||||
this.refresh(
|
||||
filterTracked ? { skipResettingParams: ["filter", "f"] } : {}
|
||||
);
|
||||
});
|
||||
},
|
||||
|
||||
@action
|
||||
showInserted(event) {
|
||||
event?.preventDefault();
|
||||
const tracker = this.topicTrackingState;
|
||||
this.list.loadBefore(tracker.newIncoming, true);
|
||||
tracker.resetTracking();
|
||||
return false;
|
||||
},
|
||||
|
||||
@action
|
||||
changeSort(order) {
|
||||
if (order === this.order) {
|
||||
this.toggleProperty("ascending");
|
||||
} else {
|
||||
this.setProperties({ order, ascending: false });
|
||||
}
|
||||
},
|
||||
|
||||
@action
|
||||
changePeriod(p) {
|
||||
this.set("period", p);
|
||||
},
|
||||
|
||||
@action
|
||||
toggleInfo() {
|
||||
this.toggleProperty("showInfo");
|
||||
},
|
||||
|
||||
@action
|
||||
refresh() {
|
||||
return this.store
|
||||
.findFiltered("topicList", {
|
||||
filter: this.list?.filter,
|
||||
})
|
||||
.then((list) => {
|
||||
this.set("list", list);
|
||||
this.resetSelected();
|
||||
});
|
||||
},
|
||||
|
||||
@action
|
||||
deleteTag(tagInfo) {
|
||||
const numTopics =
|
||||
this.get("list.topic_list.tags.firstObject.topic_count") || 0;
|
||||
|
||||
let confirmText =
|
||||
numTopics === 0
|
||||
? I18n.t("tagging.delete_confirm_no_topics")
|
||||
: I18n.t("tagging.delete_confirm", { count: numTopics });
|
||||
|
||||
if (tagInfo.synonyms.length > 0) {
|
||||
confirmText +=
|
||||
" " +
|
||||
I18n.t("tagging.delete_confirm_synonyms", {
|
||||
count: tagInfo.synonyms.length,
|
||||
});
|
||||
}
|
||||
|
||||
this.dialog.deleteConfirm({
|
||||
message: confirmText,
|
||||
didConfirm: () => {
|
||||
return this.tag
|
||||
.destroyRecord()
|
||||
.then(() => this.router.transitionTo("tags.index"))
|
||||
.catch(() => this.dialog.alert(I18n.t("generic_error")));
|
||||
},
|
||||
});
|
||||
},
|
||||
|
||||
@action
|
||||
changeTagNotificationLevel(notificationLevel) {
|
||||
this.tagNotification
|
||||
.update({ notification_level: notificationLevel })
|
||||
.then((response) => {
|
||||
const payload = response.responseJson;
|
||||
|
||||
this.tagNotification.set("notification_level", notificationLevel);
|
||||
|
||||
this.currentUser.setProperties({
|
||||
watched_tags: payload.watched_tags,
|
||||
watching_first_post_tags: payload.watching_first_post_tags,
|
||||
tracked_tags: payload.tracked_tags,
|
||||
muted_tags: payload.muted_tags,
|
||||
regular_tags: payload.regular_tags,
|
||||
});
|
||||
});
|
||||
},
|
||||
@dependentKeyCompat
|
||||
get filterMode() {
|
||||
return calculateFilterMode({
|
||||
category: this.category,
|
||||
filterType: this.filterType,
|
||||
noSubcategories: this.noSubcategories,
|
||||
});
|
||||
}
|
||||
);
|
||||
|
||||
@discourseComputed(
|
||||
"canCreateTopic",
|
||||
"category",
|
||||
"canCreateTopicOnCategory",
|
||||
"tag",
|
||||
"canCreateTopicOnTag"
|
||||
)
|
||||
createTopicDisabled(
|
||||
canCreateTopic,
|
||||
category,
|
||||
canCreateTopicOnCategory,
|
||||
tag,
|
||||
canCreateTopicOnTag
|
||||
) {
|
||||
return (
|
||||
!canCreateTopic ||
|
||||
(category && !canCreateTopicOnCategory) ||
|
||||
(tag && !canCreateTopicOnTag)
|
||||
);
|
||||
}
|
||||
|
||||
@discourseComputed("category", "tag.id", "filterType", "noSubcategories")
|
||||
navItems(category, tagId, filterType, noSubcategories) {
|
||||
return NavItem.buildList(category, {
|
||||
tagId,
|
||||
filterType,
|
||||
noSubcategories,
|
||||
siteSettings: this.siteSettings,
|
||||
});
|
||||
}
|
||||
|
||||
@discourseComputed("navMode", "list.topics.length", "loading")
|
||||
footerMessage(navMode, listTopicsLength, loading) {
|
||||
if (loading) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (listTopicsLength === 0) {
|
||||
return I18n.t(`tagging.topics.none.${navMode}`, {
|
||||
tag: this.tag?.id,
|
||||
});
|
||||
} else {
|
||||
return I18n.t("topics.bottom.tag", {
|
||||
tag: this.tag?.id,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@discourseComputed("list.filter", "list.topics.length")
|
||||
showDismissRead(filter, topicsLength) {
|
||||
return this._isFilterPage(filter, "unread") && topicsLength > 0;
|
||||
}
|
||||
|
||||
@discourseComputed("list.filter", "list.topics.length")
|
||||
showResetNew(filter, topicsLength) {
|
||||
return this._isFilterPage(filter, "new") && topicsLength > 0;
|
||||
}
|
||||
|
||||
callResetNew(dismissPosts = false, dismissTopics = false, untrack = false) {
|
||||
const filterTracked =
|
||||
(this.router.currentRoute.queryParams["f"] ||
|
||||
this.router.currentRoute.queryParams["filter"]) === "tracked";
|
||||
|
||||
let topicIds = this.selected ? this.selected.mapBy("id") : null;
|
||||
|
||||
Topic.resetNew(this.category, !this.noSubcategories, {
|
||||
tracked: filterTracked,
|
||||
tag: this.tag,
|
||||
topicIds,
|
||||
dismissPosts,
|
||||
dismissTopics,
|
||||
untrack,
|
||||
}).then((result) => {
|
||||
if (result.topic_ids) {
|
||||
this.topicTrackingState.removeTopics(result.topic_ids);
|
||||
}
|
||||
this.refresh(
|
||||
filterTracked ? { skipResettingParams: ["filter", "f"] } : {}
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
@action
|
||||
showInserted(event) {
|
||||
event?.preventDefault();
|
||||
const tracker = this.topicTrackingState;
|
||||
this.list.loadBefore(tracker.newIncoming, true);
|
||||
tracker.resetTracking();
|
||||
return false;
|
||||
}
|
||||
|
||||
@action
|
||||
changeSort(order) {
|
||||
if (order === this.order) {
|
||||
this.toggleProperty("ascending");
|
||||
} else {
|
||||
this.setProperties({ order, ascending: false });
|
||||
}
|
||||
}
|
||||
|
||||
@action
|
||||
changePeriod(p) {
|
||||
this.set("period", p);
|
||||
}
|
||||
|
||||
@action
|
||||
toggleInfo() {
|
||||
this.toggleProperty("showInfo");
|
||||
}
|
||||
|
||||
@action
|
||||
refresh() {
|
||||
return this.store
|
||||
.findFiltered("topicList", {
|
||||
filter: this.list?.filter,
|
||||
})
|
||||
.then((list) => {
|
||||
this.set("list", list);
|
||||
this.resetSelected();
|
||||
});
|
||||
}
|
||||
|
||||
@action
|
||||
deleteTag(tagInfo) {
|
||||
const numTopics =
|
||||
this.get("list.topic_list.tags.firstObject.topic_count") || 0;
|
||||
|
||||
let confirmText =
|
||||
numTopics === 0
|
||||
? I18n.t("tagging.delete_confirm_no_topics")
|
||||
: I18n.t("tagging.delete_confirm", { count: numTopics });
|
||||
|
||||
if (tagInfo.synonyms.length > 0) {
|
||||
confirmText +=
|
||||
" " +
|
||||
I18n.t("tagging.delete_confirm_synonyms", {
|
||||
count: tagInfo.synonyms.length,
|
||||
});
|
||||
}
|
||||
|
||||
this.dialog.deleteConfirm({
|
||||
message: confirmText,
|
||||
didConfirm: () => {
|
||||
return this.tag
|
||||
.destroyRecord()
|
||||
.then(() => this.router.transitionTo("tags.index"))
|
||||
.catch(() => this.dialog.alert(I18n.t("generic_error")));
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
@action
|
||||
changeTagNotificationLevel(notificationLevel) {
|
||||
this.tagNotification
|
||||
.update({ notification_level: notificationLevel })
|
||||
.then((response) => {
|
||||
const payload = response.responseJson;
|
||||
|
||||
this.tagNotification.set("notification_level", notificationLevel);
|
||||
|
||||
this.currentUser.setProperties({
|
||||
watched_tags: payload.watched_tags,
|
||||
watching_first_post_tags: payload.watching_first_post_tags,
|
||||
tracked_tags: payload.tracked_tags,
|
||||
muted_tags: payload.muted_tags,
|
||||
regular_tags: payload.regular_tags,
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user