From a37185beda800ccb326c2f91685fca8a73acbf8a Mon Sep 17 00:00:00 2001
From: To-om <toom@thehive-project.org>
Date: Thu, 4 Mar 2021 11:48:19 +0100
Subject: [PATCH] #1670 Rename tagAutoComplete query and sort freetags

---
 thehive/app/org/thp/thehive/controllers/v0/TagCtrl.scala | 5 +++--
 thehive/app/org/thp/thehive/controllers/v1/TagCtrl.scala | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/thehive/app/org/thp/thehive/controllers/v0/TagCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/TagCtrl.scala
index 17a44965ef..2f0cff7889 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/TagCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/TagCtrl.scala
@@ -1,5 +1,6 @@
 package org.thp.thehive.controllers.v0
 
+import org.apache.tinkerpop.gremlin.process.traversal.Order
 import org.apache.tinkerpop.gremlin.structure.Vertex
 import org.thp.scalligraph.EntityIdOrName
 import org.thp.scalligraph.controllers.{Entrypoint, Renderer}
@@ -57,12 +58,12 @@ class PublicTag @Inject() (tagSrv: TagSrv, organisationSrv: OrganisationSrv) ext
     Query[Traversal.V[Tag], Traversal.V[Tag]]("fromObservable", (tagSteps, _) => tagSteps.fromObservable),
     Query[Traversal.V[Tag], Traversal.V[Tag]]("fromAlert", (tagSteps, _) => tagSteps.fromAlert),
     Query.initWithParam[TagHint, Traversal[String, Vertex, Converter[String, Vertex]]](
-      "TagAutoComplete",
+      "tagAutoComplete",
       (tagHint, graph, authContext) =>
         tagHint
           .freeTag
           .fold(tagSrv.startTraversal(graph).autoComplete(tagHint.namespace, tagHint.predicate, tagHint.value)(authContext).visible(authContext))(
-            tagSrv.startTraversal(graph).autoComplete(organisationSrv, _)(authContext)
+            tagSrv.startTraversal(graph).autoComplete(organisationSrv, _)(authContext).sort(_.by("predicate", Order.asc))
           )
           .merge(tagHint.limit)(_.limit(_))
           .displayName
diff --git a/thehive/app/org/thp/thehive/controllers/v1/TagCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/TagCtrl.scala
index a9e8736fdb..f474b03b07 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/TagCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/TagCtrl.scala
@@ -1,5 +1,6 @@
 package org.thp.thehive.controllers.v1
 
+import org.apache.tinkerpop.gremlin.process.traversal.Order
 import org.apache.tinkerpop.gremlin.structure.Vertex
 import org.thp.scalligraph.EntityIdOrName
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
@@ -41,12 +42,12 @@ class TagCtrl @Inject() (
   override val extraQueries: Seq[ParamQuery[_]] = Seq(
     Query[Traversal.V[Tag], Traversal.V[Tag]]("freetags", (tagSteps, authContext) => tagSteps.freetags(organisationSrv)(authContext)),
     Query.initWithParam[TagHint, Traversal[String, Vertex, Converter[String, Vertex]]](
-      "TagAutoComplete",
+      "tagAutoComplete",
       (tagHint, graph, authContext) =>
         tagHint
           .freeTag
           .fold(tagSrv.startTraversal(graph).autoComplete(tagHint.namespace, tagHint.predicate, tagHint.value)(authContext).visible(authContext))(
-            tagSrv.startTraversal(graph).autoComplete(organisationSrv, _)(authContext)
+            tagSrv.startTraversal(graph).autoComplete(organisationSrv, _)(authContext).sort(_.by("predicate", Order.asc))
           )
           .merge(tagHint.limit)(_.limit(_))
           .displayName