From a7cc7053d3da3fdc6e7e4b4b952a035a10ebe548 Mon Sep 17 00:00:00 2001
From: Juan David Martinez <juan@discourse.org>
Date: Fri, 7 Mar 2025 20:35:36 -0500
Subject: [PATCH] fix merge

---
 .../initializers/extend-for-assigns.js        | 112 +++++++-----------
 1 file changed, 46 insertions(+), 66 deletions(-)

diff --git a/assets/javascripts/discourse/initializers/extend-for-assigns.js b/assets/javascripts/discourse/initializers/extend-for-assigns.js
index a4300e1..5c6ab7a 100644
--- a/assets/javascripts/discourse/initializers/extend-for-assigns.js
+++ b/assets/javascripts/discourse/initializers/extend-for-assigns.js
@@ -469,77 +469,57 @@ function initialize(api) {
       .filter(({ assignee }) => assignee)
       .flat();
 
-    if (assignedTo) {
-      return assignedTo
-        .map(({ assignee, note }) => {
-          let assignedPath;
-          if (assignee.assignedToPostId) {
-            assignedPath = `/p/${assignee.assignedToPostId}`;
-          } else {
-            assignedPath = `/t/${topic.id}`;
-          }
-          const icon = iconHTML(assignee.username ? "user-plus" : "group-plus");
-          let name;
-
-          name =
+      if (!assignedTo) {
+        return "";
+      }
+  
+      const createTagHtml = ({ assignee, note }) => {
+        let assignedPath;
+        if (assignee.assignedToPostId) {
+          assignedPath = `/p/${assignee.assignedToPostId}`;
+        } else {
+          assignedPath = `/t/${topic.id}`;
+        }
+  
+        const icon = iconHTML(assignee.username ? "user-plus" : "group-plus");
+        let name;
+        name =
             siteSettings.prioritize_full_name_in_ux || !assignee.username
               ? assignee.name || assignee.username
               : assignee.username;
 
-          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}>`;
-        })
-        .join("");
-    }
-
-    const createTagHtml = ({ assignee, note }) => {
-      let assignedPath;
-      if (assignee.assignedToPostId) {
-        assignedPath = `/p/${assignee.assignedToPostId}`;
-      } else {
-        assignedPath = `/t/${topic.id}`;
+        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}>`;
+      };
+  
+      // is there's one assignment just return the tag
+      if (assignedTo.length === 1) {
+        return createTagHtml(assignedTo[0]);
       }
-
-      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}>`;
-    };
-
-    // is there's one assignment just return the tag
-    if (assignedTo.length === 1) {
-      return createTagHtml(assignedTo[0]);
-    }
-
-    // join multiple assignments with a separator
-    let result = "";
-    assignedTo.forEach((assignment, index) => {
-      result += createTagHtml(assignment);
-
-      // add separator if not the last tag
-      if (index < assignedTo.length - 1) {
-        const separator = applyValueTransformer("tag-separator", ",", {
-          topic,
-          index,
-        });
-        result += `<span class="discourse-tags__tag-separator">${separator}</span>`;
-      }
-    });
-
-    return result;
+  
+      // join multiple assignments with a separator
+      let result = "";
+      assignedTo.forEach((assignment, index) => {
+        result += createTagHtml(assignment);
+  
+        // add separator if not the last tag
+        if (index < assignedTo.length - 1) {
+          const separator = applyValueTransformer("tag-separator", ",", {
+            topic,
+            index,
+          });
+          result += `<span class="discourse-tags__tag-separator">${separator}</span>`;
+        }
+      });
+  
+      return result;
   });
 
   api.createWidget("assigned-to-post", {