undos, notes to self

Author: brrusselburg

app/serializers/assigned_topic_serializer.rb

@@ -8,6 +8,7 @@ class AssignedTopicSerializer < BasicTopicSerializer
   has_one :user, serializer: BasicUserSerializer, embed: :objects
 
   def assigned_to_user
+    # checkout out this basic user serializer
     BasicUserSerializer.new(object.assigned_to, scope: scope, root: false).as_json
   end
 

assets/javascripts/discourse/initializers/extend-for-assigns.js

@@ -478,12 +478,12 @@ function initialize(api) {
             assignedPath = `/t/${topic.id}`;
           }
           const icon = iconHTML(assignee.username ? "user-plus" : "group-plus");
+          const name = assignee.username || assignee.name;
           const tagName = params.tagName || "a";
           const href =
             tagName === "a"
               ? `href="${getURL(assignedPath)}" data-auto-route="true"`
               : "";
-
           return `<${tagName} class="assigned-to discourse-tag simple" ${href}>${icon}<span title="${escapeExpression(
             note
           )}">${name}</span></${tagName}>`;
@@ -520,10 +520,6 @@ function initialize(api) {
       ];
       const assigneeElements = [];
 
-      const nameOrUsername = siteSettings.prioritize_full_name_in_ux
-        ? assignedToUser.name
-        : assignedToUser.username;
-
       const assignedHtml = (username, path, type) => {
         return `<span class="assigned-to--${type}">${htmlSafe(
           i18n("discourse_assign.assigned_topic_to", {
@@ -539,7 +535,7 @@ function initialize(api) {
             "span.assignee",
             new RawHtml({
               html: assignedHtml(
-                nameOrUsername,
+                assignedToUser.username,
                 assignedToUserPath(assignedToUser),
                 "user"
               ),
@@ -685,6 +681,8 @@ function initialize(api) {
   api.decorateWidget("post-contents:after-cooked", (dec) => {
     const postModel = dec.getModel();
     if (postModel) {
+      console.log("!!!!!!!!!!!!!!!!!!!!!!", dec.attrs);
+      // need to make sure 'name' is not empty in the attrs ^
       let assignedToUser, assignedToGroup, postAssignment, href;
       if (dec.attrs.post_number === 1) {
         return dec.widget.attach("assigned-to-first-post", {

config/locales/client.en.yml

@@ -100,7 +100,7 @@ en:
               assignable_levels:
                 title: "Who can assign this group"
     user:
-      notification_level_when_assigned: 
+      notification_level_when_assigned:
         label: "When assigned"
         watch_topic: "Watch topic"
         track_topic: "Track topic"

spec/serializers/topic_view_serializer_spec.rb

@@ -19,6 +19,7 @@
   it "includes assigned user in serializer" do
     Assigner.new(topic, user).assign(user)
     serializer = TopicViewSerializer.new(TopicView.new(topic), scope: guardian)
+    expect(serializer.as_json[:topic_view][:assigned_to_user][:name]).to eq(user.name)
     expect(serializer.as_json[:topic_view][:assigned_to_user][:username]).to eq(user.username)
     expect(serializer.as_json[:topic_view][:assigned_to_group]).to be nil
   end