From c99faa6b25a7621a60262ca4897cf0bd53512930 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 23 Apr 2019 17:53:59 +0200
Subject: [PATCH] FIX: improves locale support in tag-drop (#7418)

---
 .../javascripts/select-kit/components/tag-drop.js.es6     | 6 ++++--
 .../select-kit/components/tag-drop/tag-drop-row.js.es6    | 8 --------
 .../templates/components/tag-drop/tag-drop-row.hbs        | 1 -
 test/javascripts/components/tag-drop-test.js.es6          | 4 ++--
 4 files changed, 6 insertions(+), 13 deletions(-)
 delete mode 100644 app/assets/javascripts/select-kit/components/tag-drop/tag-drop-row.js.es6
 delete mode 100644 app/assets/javascripts/select-kit/templates/components/tag-drop/tag-drop-row.hbs

diff --git a/app/assets/javascripts/select-kit/components/tag-drop.js.es6 b/app/assets/javascripts/select-kit/components/tag-drop.js.es6
index 9219a0bda08..f7a66a11a1e 100644
--- a/app/assets/javascripts/select-kit/components/tag-drop.js.es6
+++ b/app/assets/javascripts/select-kit/components/tag-drop.js.es6
@@ -11,7 +11,6 @@ export default ComboBoxComponent.extend(TagsMixin, {
   verticalOffset: 3,
   value: Ember.computed.alias("tagId"),
   headerComponent: "tag-drop/tag-drop-header",
-  rowComponent: "tag-drop/tag-drop-row",
   allowAutoSelectFirst: false,
   tagName: "li",
   showFilterByTag: Ember.computed.alias("siteSettings.show_filter_by_tag"),
@@ -136,7 +135,10 @@ export default ComboBoxComponent.extend(TagsMixin, {
   _transformJson(context, json) {
     let results = json.results;
     results = results.sort((a, b) => a.id > b.id);
-    return results;
+
+    return results.map(r => {
+      return { id: r.id, name: r.text };
+    });
   },
 
   actions: {
diff --git a/app/assets/javascripts/select-kit/components/tag-drop/tag-drop-row.js.es6 b/app/assets/javascripts/select-kit/components/tag-drop/tag-drop-row.js.es6
deleted file mode 100644
index cb87469d919..00000000000
--- a/app/assets/javascripts/select-kit/components/tag-drop/tag-drop-row.js.es6
+++ /dev/null
@@ -1,8 +0,0 @@
-import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
-
-export default SelectKitRowComponent.extend({
-  layoutName: "select-kit/templates/components/tag-drop/tag-drop-row",
-  classNames: "tag-drop-row",
-
-  tagId: Ember.computed.alias("computedContent.value")
-});
diff --git a/app/assets/javascripts/select-kit/templates/components/tag-drop/tag-drop-row.hbs b/app/assets/javascripts/select-kit/templates/components/tag-drop/tag-drop-row.hbs
deleted file mode 100644
index e8adb89fe43..00000000000
--- a/app/assets/javascripts/select-kit/templates/components/tag-drop/tag-drop-row.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{tagId}}
diff --git a/test/javascripts/components/tag-drop-test.js.es6 b/test/javascripts/components/tag-drop-test.js.es6
index ae1003a8a95..ea8b9d2fc19 100644
--- a/test/javascripts/components/tag-drop-test.js.es6
+++ b/test/javascripts/components/tag-drop-test.js.es6
@@ -24,13 +24,13 @@ componentTest("default", {
       if (params.queryParams.q === "rég") {
         return response({
           "results": [
-            { "id": "régis", "name": "régis", "count": 2, "pm_count": 0 }
+            { "id": "régis", "text": "régis", "count": 2, "pm_count": 0 }
           ]
         });
       }else if (params.queryParams.q === "dav") {
         return response({
           "results": [
-            { "id": "David", "name": "David", "count": 2, "pm_count": 0 }
+            { "id": "David", "text": "David", "count": 2, "pm_count": 0 }
           ]
         });
       }