#1731 Rename waitingTask query to waitingTasks

TheHive-Project · Jan 21, 2021 · 4e2ce32 · 4e2ce32
1 parent 21bba42
commit 4e2ce32
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 5 deletions.
diff --git a/ScalliGraph b/ScalliGraph
diff --git a/frontend/app/scripts/controllers/MainPageCtrl.js b/frontend/app/scripts/controllers/MainPageCtrl.js
@@ -19,7 +19,7 @@
                     {_name: 'currentUser'},
                     {_name: 'tasks'}
                 ] : [
-                    {_name: 'waitingTask'}
+                    {_name: 'waitingTasks'}
                 ];
 
                 if ($stateParams.viewId === 'mytasks') {

diff --git a/frontend/app/scripts/controllers/RootCtrl.js b/frontend/app/scripts/controllers/RootCtrl.js
@@ -79,7 +79,7 @@ angular.module('theHiveControllers').controller('RootCtrl',
         });
 
         StreamQuerySrv('v1', [
-            {_name: 'waitingTask'},
+            {_name: 'waitingTasks'},
             {_name: 'count'}
         ], {
             scope: $scope,

diff --git a/thehive/app/org/thp/thehive/controllers/v0/TaskCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/TaskCtrl.scala
@@ -125,8 +125,22 @@ class PublicTask @Inject() (taskSrv: TaskSrv, organisationSrv: OrganisationSrv,
     Query.output[(RichTask, Option[RichCase])],
     Query[Traversal.V[Task], Traversal.V[User]]("assignableUsers", (taskSteps, authContext) => taskSteps.assignableUsers(authContext)),
     Query.init[Traversal.V[Task]](
+      "waitingTasks",
+      (graph, authContext) =>
+        taskSrv.startTraversal(graph).has(_.status, TaskStatus.Waiting).inOrganisation(organisationSrv.currentId(graph, authContext))
+    ),
+    Query.init[Traversal.V[Task]]( // DEPRECATED
       "waitingTask",
-      (graph, authContext) => taskSrv.startTraversal(graph).has(_.status, TaskStatus.Waiting).visible(authContext)
+      (graph, authContext) =>
+        taskSrv.startTraversal(graph).has(_.status, TaskStatus.Waiting).inOrganisation(organisationSrv.currentId(graph, authContext))
+    ),
+    Query.init[Traversal.V[Task]](
+      "myTasks",
+      (graph, authContext) =>
+        taskSrv
+          .startTraversal(graph)
+          .assignTo(authContext.userId)
+          .inOrganisation(organisationSrv.currentId(graph, authContext))
     ),
     Query[Traversal.V[Task], Traversal.V[Log]]("logs", (taskSteps, _) => taskSteps.logs),
     Query[Traversal.V[Task], Traversal.V[Case]]("case", (taskSteps, _) => taskSteps.`case`),

diff --git a/thehive/app/org/thp/thehive/controllers/v1/TaskCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/TaskCtrl.scala
@@ -52,8 +52,20 @@ class TaskCtrl @Inject() (
     Query.outputWithContext[RichTask, Traversal.V[Task]]((taskSteps, _) => taskSteps.richTask)
   override val extraQueries: Seq[ParamQuery[_]] = Seq(
     Query.init[Traversal.V[Task]](
+      "waitingTasks",
+      (graph, authContext) => taskSrv.startTraversal(graph).has(_.status, TaskStatus.Waiting).visible(organisationSrv)(authContext)
+    ),
+    Query.init[Traversal.V[Task]]( // DEPRECATED
       "waitingTask",
-      (graph, authContext) => taskSrv.startTraversal(graph).has(_.status, TaskStatus.Waiting).visible(authContext)
+      (graph, authContext) => taskSrv.startTraversal(graph).has(_.status, TaskStatus.Waiting).visible(organisationSrv)(authContext)
+    ),
+    Query.init[Traversal.V[Task]](
+      "myTasks",
+      (graph, authContext) =>
+        taskSrv
+          .startTraversal(graph)
+          .assignTo(authContext.userId)
+          .visible(organisationSrv)(authContext)
     ),
     Query[Traversal.V[Task], Traversal.V[User]]("assignableUsers", (taskSteps, authContext) => taskSteps.assignableUsers(authContext)),
     Query[Traversal.V[Task], Traversal.V[Log]]("logs", (taskSteps, _) => taskSteps.logs),
+1 −1		core/src/main/resources/reference.conf
+22 −20		core/src/main/scala/org/thp/scalligraph/AccessLogFilter.scala
+2 −4		core/src/main/scala/org/thp/scalligraph/ErrorHandler.scala
+2 −2		core/src/main/scala/org/thp/scalligraph/auth/SessionAuthSrv.scala
+6 −51		core/src/main/scala/org/thp/scalligraph/models/Database.scala
+1 −2		core/src/main/scala/org/thp/scalligraph/models/Mapping.scala
+3 −5		core/src/main/scala/org/thp/scalligraph/query/Aggregation.scala
+1 −1		core/src/main/scala/org/thp/scalligraph/query/Filter.scala
+1 −3		core/src/main/scala/org/thp/scalligraph/query/InputSort.scala
+1 −2		core/src/main/scala/org/thp/scalligraph/query/PublicProperty.scala
+1 −1		core/src/main/scala/org/thp/scalligraph/services/EdgeSrv.scala
+2 −2		core/src/main/scala/org/thp/scalligraph/services/ElementSrv.scala
+4 −1		core/src/main/scala/org/thp/scalligraph/services/StorageSrv.scala
+2 −2		core/src/main/scala/org/thp/scalligraph/services/VertexSrv.scala
+7 −5		core/src/main/scala/org/thp/scalligraph/services/config/ApplicationConfig.scala
+0 −1		core/src/main/scala/org/thp/scalligraph/traversal/Graph.scala
+5 −2		core/src/main/scala/org/thp/scalligraph/traversal/OptimizeIndexStrategy.scala
+2 −2		core/src/main/scala/org/thp/scalligraph/traversal/Traversal.scala
+30 −16		core/src/main/scala/org/thp/scalligraph/traversal/TraversalOps.scala
+15 −3		core/src/main/scala/org/thp/scalligraph/traversal/TraversalPrinter.scala
+12 −19		database/janusgraph/src/main/java/org/thp/scalligraph/janus/strategies/JanusGraphStepAcceptNull.java
+2 −2		database/janusgraph/src/main/java/org/thp/scalligraph/janus/strategies/LimitedIterator.java
+39 −10		database/janusgraph/src/main/scala/org/thp/scalligraph/janus/JanusDatabase.scala