Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DEV: Update modifyClass calls to native class syntax #613

Merged
merged 1 commit into from
Dec 2, 2024
Merged

DEV: Update modifyClass calls to native class syntax #613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
195 changes: 103 additions & 92 deletions assets/javascripts/discourse/initializers/extend-for-assigns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { getOwner } from "@ember/application";
import { action } from "@ember/object";
import { htmlSafe } from "@ember/template";
import { isEmpty } from "@ember/utils";
import { hbs } from "ember-cli-htmlbars";
Expand All @@ -24,8 +25,6 @@ import EditTopicAssignments from "../components/modal/edit-topic-assignments";
import TopicLevelAssignMenu from "../components/topic-level-assign-menu";
import { extendTopicModel } from "../models/topic";

const PLUGIN_ID = "discourse-assign";

const DEPENDENT_KEYS = [
"topic.assigned_to_user",
"topic.assigned_to_group",
Expand Down Expand Up @@ -361,18 +360,21 @@ function initialize(api) {
return getURL(`/g/${assignedToGroup.name}/assigned/everyone`);
}

api.modifyClass("model:bookmark", {
pluginId: PLUGIN_ID,
api.modifyClass(
"model:bookmark",
(Superclass) =>
class extends Superclass {
@discourseComputed("assigned_to_user")
assignedToUserPath(assignedToUser) {
return assignedToUserPath(assignedToUser);
}

@discourseComputed("assigned_to_user")
assignedToUserPath(assignedToUser) {
return assignedToUserPath(assignedToUser);
},
@discourseComputed("assigned_to_group")
assignedToGroupPath(assignedToGroup) {
return assignedToGroupPath(assignedToGroup);
},
});
@discourseComputed("assigned_to_group")
assignedToGroupPath(assignedToGroup) {
return assignedToGroupPath(assignedToGroup);
}
}
);

api.modifyClass(
"component:topic-notifications-button",
Expand Down Expand Up @@ -590,83 +592,91 @@ function initialize(api) {
},
});

api.modifyClass("model:group", {
pluginId: PLUGIN_ID,

asJSON() {
return Object.assign({}, this._super(...arguments), {
assignable_level: this.assignable_level,
});
},
});

api.modifyClass("controller:topic", {
pluginId: PLUGIN_ID,

subscribe() {
this._super(...arguments);

this.messageBus.subscribe("/staff/topic-assignment", (data) => {
const topic = this.model;
const topicId = topic.id;

if (data.topic_id === topicId) {
let post;
if (data.post_id) {
post = topic.postStream.posts.find((p) => p.id === data.post_id);
}
const target = post || topic;

target.set("assignment_note", data.assignment_note);
target.set("assignment_status", data.assignment_status);
if (data.assigned_type === "User") {
target.set(
"assigned_to_user_id",
data.type === "assigned" ? data.assigned_to.id : null
);
target.set("assigned_to_user", data.assigned_to);
}
if (data.assigned_type === "Group") {
target.set(
"assigned_to_group_id",
data.type === "assigned" ? data.assigned_to.id : null
);
target.set("assigned_to_group", data.assigned_to);
}
api.modifyClass(
"model:group",
(Superclass) =>
class extends Superclass {
asJSON() {
return Object.assign({}, super.asJSON(...arguments), {
assignable_level: this.assignable_level,
});
}
}
);

if (data.post_id) {
if (data.type === "unassigned") {
delete topic.indirectly_assigned_to[data.post_number];
api.modifyClass(
"controller:topic",
(Superclass) =>
class extends Superclass {
subscribe() {
super.subscribe(...arguments);

this.messageBus.subscribe("/staff/topic-assignment", (data) => {
const topic = this.model;
const topicId = topic.id;

if (data.topic_id === topicId) {
let post;
if (data.post_id) {
post = topic.postStream.posts.find(
(p) => p.id === data.post_id
);
}
const target = post || topic;

target.set("assignment_note", data.assignment_note);
target.set("assignment_status", data.assignment_status);
if (data.assigned_type === "User") {
target.set(
"assigned_to_user_id",
data.type === "assigned" ? data.assigned_to.id : null
);
target.set("assigned_to_user", data.assigned_to);
}
if (data.assigned_type === "Group") {
target.set(
"assigned_to_group_id",
data.type === "assigned" ? data.assigned_to.id : null
);
target.set("assigned_to_group", data.assigned_to);
}

if (data.post_id) {
if (data.type === "unassigned") {
delete topic.indirectly_assigned_to[data.post_number];
}

this.appEvents.trigger("post-stream:refresh", {
id: topic.postStream.posts[0].id,
});
this.appEvents.trigger("post-stream:refresh", {
id: data.post_id,
});
}
if (topic.closed) {
this.appEvents.trigger("post-stream:refresh", {
id: topic.postStream.posts[0].id,
});
}
}

this.appEvents.trigger("post-stream:refresh", {
id: topic.postStream.posts[0].id,
});
this.appEvents.trigger("post-stream:refresh", { id: data.post_id });
}
if (topic.closed) {
this.appEvents.trigger("header:update-topic", topic);
this.appEvents.trigger("post-stream:refresh", {
id: topic.postStream.posts[0].id,
});
}
});
}
this.appEvents.trigger("header:update-topic", topic);
this.appEvents.trigger("post-stream:refresh", {
id: topic.postStream.posts[0].id,
});
});
},

unsubscribe() {
this._super(...arguments);
unsubscribe() {
super.unsubscribe(...arguments);

if (!this.model?.id) {
return;
}
if (!this.model?.id) {
return;
}

this.messageBus.unsubscribe("/staff/topic-assignment");
},
});
this.messageBus.unsubscribe("/staff/topic-assignment");
}
}
);

api.decorateWidget("post-contents:after-cooked", (dec) => {
const postModel = dec.getModel();
Expand Down Expand Up @@ -710,16 +720,17 @@ function initialize(api) {
"group-plus"
);

api.modifyClass("controller:preferences/notifications", {
pluginId: PLUGIN_ID,

actions: {
save() {
this.saveAttrNames.push("custom_fields");
this._super(...arguments);
},
},
});
api.modifyClass(
"controller:preferences/notifications",
(Superclass) =>
class extends Superclass {
@action
save() {
this.saveAttrNames.push("custom_fields");
super.save(...arguments);
}
}
);

api.addKeyboardShortcut("g a", "", { path: "/my/activity/assigned" });
}
Expand Down Expand Up @@ -834,7 +845,7 @@ export default {
}

withPluginApi("1.34.0", (api) => {
extendTopicModel(api, PLUGIN_ID);
extendTopicModel(api);
initialize(api);
registerTopicFooterButtons(api);

Expand Down
110 changes: 58 additions & 52 deletions assets/javascripts/discourse/models/topic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,67 +1,73 @@
import { Assignment } from "./assignment";

export function extendTopicModel(api, pluginId) {
api.modifyClass("model:topic", {
pluginId,
export function extendTopicModel(api) {
api.modifyClass(
"model:topic",
(Superclass) =>
class extends Superclass {
assignees() {
const result = [];

assignees() {
const result = [];
if (this.assigned_to_user) {
result.push(this.assigned_to_user);
}

if (this.assigned_to_user) {
result.push(this.assigned_to_user);
}
const postAssignees = this.assignedPosts().map((p) => p.assigned_to);
result.push(...postAssignees);
return result;
}

const postAssignees = this.assignedPosts().map((p) => p.assigned_to);
result.push(...postAssignees);
return result;
},
uniqueAssignees() {
const map = new Map();
this.assignees().forEach((user) => map.set(user.username, user));
return [...map.values()];
}

uniqueAssignees() {
const map = new Map();
this.assignees().forEach((user) => map.set(user.username, user));
return [...map.values()];
},
assignedPosts() {
if (!this.indirectly_assigned_to) {
return [];
}

assignedPosts() {
if (!this.indirectly_assigned_to) {
return [];
}
return Object.entries(this.indirectly_assigned_to).map(
([key, value]) => {
value.postId = key;
return value;
}
);
}

return Object.entries(this.indirectly_assigned_to).map(([key, value]) => {
value.postId = key;
return value;
});
},
assignments() {
return [this.topicAssignment(), ...this.postAssignments()].compact();
}

assignments() {
return [this.topicAssignment(), ...this.postAssignments()].compact();
},
postAssignments() {
if (!this.indirectly_assigned_to) {
return [];
}

postAssignments() {
if (!this.indirectly_assigned_to) {
return [];
}
return Object.entries(this.indirectly_assigned_to).map(
([key, value]) => {
value.postId = key;
return Assignment.fromPost(value);
}
);
}

return Object.entries(this.indirectly_assigned_to).map(([key, value]) => {
value.postId = key;
return Assignment.fromPost(value);
});
},
topicAssignment() {
return Assignment.fromTopic(this);
}

topicAssignment() {
return Assignment.fromTopic(this);
},
isAssigned() {
return this.assigned_to_user || this.assigned_to_group;
}

isAssigned() {
return this.assigned_to_user || this.assigned_to_group;
},
isAssignedTo(user) {
return this.assigned_to_user?.username === user.username;
}

isAssignedTo(user) {
return this.assigned_to_user?.username === user.username;
},

hasAssignedPosts() {
return !!this.postAssignments().length;
},
});
hasAssignedPosts() {
return !!this.postAssignments().length;
}
}
);
}