IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Deleting tags via <TagInfo /> component (#24268)

Browse Source 
https://github.com/discourse/discourse/pull/22622 accidentally introduced an `@action` decorator inside the actions hash, which does not work. This commit modernizes the component by removing the actions hash altogether.
This commit is contained in:
David Taylor 2023-11-07 11:56:52 +00:00 committed by GitHub
parent 0889f22a3b
commit 39e1b97a5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 88 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

174
app/assets/javascripts/discourse/app/components/tag-info.js
View File

@ -114,95 +114,97 @@ export default Component.extend({
});
},
actions: {
toggleEditControls() {
this.toggleProperty("showEditControls");
},
@action
toggleEditControls() {
this.toggleProperty("showEditControls");
},
cancelEditing() {
this.set("editing", false);
},
@action
cancelEditing() {
this.set("editing", false);
},
finishedEditing() {
const oldTagName = this.tag.id;
this.tag
.update({ id: this.newTagName, description: this.newTagDescription })
.then((result) => {
this.set("editing", false);
this.tagInfo.set("description", this.newTagDescription);
if (
result.responseJson.tag &&
oldTagName !== result.responseJson.tag.id
) {
this.router.transitionTo("tag.show", result.responseJson.tag.id);
}
@action
finishedEditing() {
const oldTagName = this.tag.id;
this.tag
.update({ id: this.newTagName, description: this.newTagDescription })
.then((result) => {
this.set("editing", false);
this.tagInfo.set("description", this.newTagDescription);
if (
result.responseJson.tag &&
oldTagName !== result.responseJson.tag.id
) {
this.router.transitionTo("tag.show", result.responseJson.tag.id);
}
})
.catch(popupAjaxError);
},
@action
deleteTag() {
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 (this.tagInfo.synonyms.length > 0) {
confirmText +=
" " +
I18n.t("tagging.delete_confirm_synonyms", {
count: this.tagInfo.synonyms.length,
});
}
this.dialog.deleteConfirm({
message: confirmText,
didConfirm: async () => {
try {
await this.tag.destroyRecord();
this.router.transitionTo("tags.index");
} catch {
this.dialog.alert(I18n.t("generic_error"));
}
},
});
},
@action
addSynonyms() {
this.dialog.confirm({
message: htmlSafe(
I18n.t("tagging.add_synonyms_explanation", {
count: this.newSynonyms.length,
tag_name: this.tagInfo.name,
})
.catch(popupAjaxError);
},
@action
deleteTag() {
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 (this.tagInfo.synonyms.length > 0) {
confirmText +=
" " +
I18n.t("tagging.delete_confirm_synonyms", {
count: this.tagInfo.synonyms.length,
});
}
this.dialog.deleteConfirm({
message: confirmText,
didConfirm: async () => {
try {
await this.tag.destroyRecord();
this.router.transitionTo("tags.index");
} catch {
this.dialog.alert(I18n.t("generic_error"));
}
},
});
},
addSynonyms() {
this.dialog.confirm({
message: htmlSafe(
I18n.t("tagging.add_synonyms_explanation", {
count: this.newSynonyms.length,
tag_name: this.tagInfo.name,
),
didConfirm: () => {
return ajax(`/tag/${this.tagInfo.name}/synonyms`, {
type: "POST",
data: {
synonyms: this.newSynonyms,
},
})
.then((response) => {
if (response.success) {
this.set("newSynonyms", null);
this.loadTagInfo();
} else if (response.failed_tags) {
this.dialog.alert(
I18n.t("tagging.add_synonyms_failed", {
tag_names: Object.keys(response.failed_tags).join(", "),
})
);
} else {
this.dialog.alert(I18n.t("generic_error"));
}
})
),
didConfirm: () => {
return ajax(`/tag/${this.tagInfo.name}/synonyms`, {
type: "POST",
data: {
synonyms: this.newSynonyms,
},
})
.then((response) => {
if (response.success) {
this.set("newSynonyms", null);
this.loadTagInfo();
} else if (response.failed_tags) {
this.dialog.alert(
I18n.t("tagging.add_synonyms_failed", {
tag_names: Object.keys(response.failed_tags).join(", "),
})
);
} else {
this.dialog.alert(I18n.t("generic_error"));
}
})
.catch(popupAjaxError);
},
});
},
.catch(popupAjaxError);
},
});
},
});