From 05f676c58aaaaf73a7de9fa4153e17949780cc78 Mon Sep 17 00:00:00 2001
From: To-om <toom@thehive-project.org>
Date: Fri, 6 Mar 2020 16:02:19 +0100
Subject: [PATCH] #1250 Fix dashboard visibility

---
 ScalliGraph                                    |  2 +-
 .../thehive/controllers/v0/DashboardCtrl.scala | 18 +++++++++++++-----
 .../thehive/controllers/v0/Properties.scala    |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ScalliGraph b/ScalliGraph
index a93384d600..6cd2e8a6fc 160000
--- a/ScalliGraph
+++ b/ScalliGraph
@@ -1 +1 @@
-Subproject commit a93384d60034f829d6107ed2c1e95c488cf14a7b
+Subproject commit 6cd2e8a6fc21055d8db519fda2c14a6e7ece8fdb
diff --git a/thehive/app/org/thp/thehive/controllers/v0/DashboardCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/DashboardCtrl.scala
index cabbb73a4b..2f23c93ad2 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/DashboardCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/DashboardCtrl.scala
@@ -1,15 +1,16 @@
 package org.thp.thehive.controllers.v0
 
 import play.api.mvc.{Action, AnyContent, Results}
+
 import javax.inject.{Inject, Singleton}
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
-import org.thp.scalligraph.models.{Database, Entity}
+import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.query.{ParamQuery, PropertyUpdater, PublicProperty, Query}
 import org.thp.scalligraph.steps.PagedResult
 import org.thp.scalligraph.steps.StepsOps._
 import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.dto.v0.InputDashboard
-import org.thp.thehive.models.{Dashboard, RichDashboard}
+import org.thp.thehive.models.RichDashboard
 import org.thp.thehive.services.{DashboardSrv, DashboardSteps, OrganisationSrv, UserSrv}
 
 @Singleton
@@ -25,7 +26,14 @@ class DashboardCtrl @Inject() (
   val publicProperties: List[PublicProperty[_, _]] = properties.dashboard ::: metaProperties[DashboardSteps]
 
   val initialQuery: Query =
-    Query.init[DashboardSteps]("listDashboard", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).dashboards)
+    Query.init[DashboardSteps](
+      "listDashboard",
+      (graph, authContext) =>
+        union(dashboardSrv)(
+          t => organisationSrv.steps(db.labelFilter(organisationSrv.model)(t))(graph).get(authContext.organisation).dashboards,
+          t => userSrv.steps(db.labelFilter(userSrv.model)(t))(graph).current(authContext).dashboards
+        )(graph)
+    )
 
   override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, DashboardSteps](
     "getDashboard",
@@ -33,10 +41,10 @@ class DashboardCtrl @Inject() (
     (param, graph, authContext) => dashboardSrv.get(param.idOrName)(graph).visible(authContext)
   )
 
-  val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, DashboardSteps, PagedResult[Dashboard with Entity]](
+  val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, DashboardSteps, PagedResult[RichDashboard]](
     "page",
     FieldsParser[OutputParam],
-    (range, dashboardSteps, _) => dashboardSteps.page(range.from, range.to, withTotal = true)
+    (range, dashboardSteps, _) => dashboardSteps.richPage(range.from, range.to, withTotal = true)(_.richDashboard)
   )
   val outputQuery: Query = Query.output[RichDashboard]()
 
diff --git a/thehive/app/org/thp/thehive/controllers/v0/Properties.scala b/thehive/app/org/thp/thehive/controllers/v0/Properties.scala
index 503d4739e1..75685f9f4c 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/Properties.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/Properties.scala
@@ -283,7 +283,7 @@ class Properties @Inject() (
       .property("description", UniMapping.string)(_.field.updatable)
       .property("definition", UniMapping.string)(_.field.updatable)
       .property("status", UniMapping.string)(
-        _.select(_.richDashboard.map(d => if (d.organisationShares.nonEmpty) "Shared" else "Private")).custom { // TODO replace by choose step
+        _.select(_.organisation.fold.map(d => if (d.isEmpty) "Private" else "Shared")).custom { // TODO replace by choose step
           case (_, "Shared", vertex, _, graph, authContext) =>
             for {
               dashboard <- dashboardSrv.get(vertex)(graph).filter(_.user.current(authContext)).getOrFail()